Commit graph

4094 commits

Author SHA1 Message Date
Cole Gleason
b10c29f02f Fixed bug where user wasn't really removed. Changed popup depending on if user was in challenges. Fixed selectedChal typo 2014-01-06 23:06:14 -06:00
Tyler Renelle
295815d1a3 typo fix 2014-01-06 21:54:01 -07:00
Tyler Renelle
44280c4a0e Merge pull request #2272 from Sinza-/envt/tasks
Replace hard-coded strings for env.t on folder views/shared/tasks/
2014-01-06 20:44:33 -08:00
Tyler Renelle
53aa0bba59 #2245 fix tour wording from 1.5% => 50% class stat bonus 2014-01-06 21:26:55 -07:00
Tyler Renelle
3b3b0e6915 #2245 don't show class-tour button unless the class system is enabled 2014-01-06 21:20:27 -07:00
Tyler Renelle
f539108b39 Merge pull request #2275 from colegleason/streak-modal
Don't show Streak achievement modal on Fix Character Values if it was undefined
2014-01-06 19:59:14 -08:00
Tyler Renelle
39fbfe3f2f Merge pull request #2278 from speg/checklist_width_resize
work on #2183 resize checklist items
2014-01-06 19:56:34 -08:00
Tyler Renelle
c0f8aea339 Merge pull request #2279 from HabitRPG/sabe/fix
Fix #2277: make Automatic Allocation checkbox set "task activity" mode
2014-01-06 19:50:42 -08:00
Sabe Jones
459af67fcd Fix #2277: make Automatic Allocation checkbox set "task activity" mode 2014-01-06 21:20:54 -06:00
steve hiemstra
fd56c17518 work on #2183 resize checklist items
such that they resize dynamically; however the text will still not wrap
due to the fact that it is an input.
2014-01-06 21:21:01 -05:00
Tyler Renelle
ac1bcd4791 winter: disable gold in restore-values during the WWE event 2014-01-06 18:44:53 -07:00
Tyler Renelle
b3dd1e0a68 bailey: WWE pt 4 (class gear) 2014-01-06 17:44:17 -07:00
Tyler Renelle
6601953629 grunt: add spritesmith.png to hashres. @paglias is this all that's
necessary to cache-bust the image so users won't get the jumple on reload?
2014-01-06 17:12:34 -07:00
Cole Gleason
eb9db5b612 Don't show Streak achievement modal on Fix Character Values if it was previously undefined 2014-01-06 16:43:56 -06:00
Marcelo Sizer
73e9730fe7 Fix replacing typo 2014-01-06 17:47:16 -02:00
Marcelo Sizer
255acd79d2 Replace hard-coded strings for env.t on views/shared/tasks/ folder 2014-01-06 17:36:33 -02:00
Tyler Renelle
bc8da096f4 chat: a few view cleanups 2014-01-05 22:17:21 -07:00
Tyler Renelle
f6e6d115ac chat: add +1 (like) to messages. @snicker does views/options/social/chat-message.jade flag you for any performance issues which should be optimized with bindonce? (I'm still a bit of a bo-noob) 2014-01-05 22:12:02 -07:00
Tyler Renelle
95516f709c hall: one white star for GMs (yeah, GMs are admins). remove sleepy-eye. @sabrecat 2014-01-05 21:04:56 -07:00
Tyler Renelle
5ccd8c4b85 hall: fixed load-more, sort contribs by lvl 2014-01-05 19:58:19 -07:00
Tyler Renelle
eb5a9150ab hall: use infinite-scroll to load patrons, since there are so many 2014-01-05 19:51:33 -07:00
Tyler Renelle
a5db8628e2 hall: start moving admin stuff to hall-of-heroes / hall-of-patrons, so everyone can see contribs / backers 2014-01-05 19:19:34 -07:00
Tyler Renelle
eeaeb5c006 Merge remote-tracking branch 'DanielHeath/develop' into develop
Conflicts:
	views/static/front.jade
2014-01-05 16:37:05 -07:00
Tyler Renelle
eda79a73df admin: use {$ne:null} instead of {$exists:true} for listing contributors
in admin. Who knew $exists had such poor performance!
https://groups.google.com/forum/#!topic/mongodb-user/FKJWoi3lb9I
@sabrecat @wc8, admin page should be snappier now
2014-01-05 16:17:26 -07:00
Tyler Renelle
6c6f364499 challenges: sort first by official (in tavern) 2014-01-05 16:15:08 -07:00
Tyler Renelle
e23b42f300 #2186 hide task attrs unless allocationMode == 'taskbased' 2014-01-05 15:16:55 -07:00
Tyler Renelle
a6f096d730 #2186 hide task attributes if auto-allocate not enabled 2014-01-05 15:08:10 -07:00
Tyler Renelle
a326072858 start adding quests tests 2014-01-05 15:08:10 -07:00
Tyler Renelle
e474278ab3 groups: upon group-creation, creator is automatically assigned as leader
and only member. Remove sending up leader & members from the client,
should all be handled on the server
2014-01-05 15:08:10 -07:00
Tyler Renelle
8c319b6079 Merge pull request #2186 from HabitRPG/sabe/tweak3
Advanced Options default to being shown
2014-01-05 14:06:42 -08:00
Tyler Renelle
273f9b4a34 Merge pull request #2256 from HabitRPG/sabe/tweak
Clear up some confusion caused by AngularJS number filter
2014-01-05 08:45:46 -08:00
Sabe Jones
7904b8e4db Clear up some confusion caused by AngularJS number filter 2014-01-05 09:32:20 -06:00
Matteo Pagliazzi
7cfca80e2f remove unnecessary text tags 2014-01-05 13:23:45 +01:00
Matteo Pagliazzi
ce64affa92 fix gems styling 2014-01-05 12:59:00 +01:00
Cole Gleason
744d8a6780 When a user leaves a group, remove them from all group challenges 2014-01-04 20:05:48 -06:00
Dušan Juretić
aa0a515e5e Tests for filtersCtrl 2014-01-04 22:40:57 -03:00
Tyler Renelle
3a5eda1e98 Merge remote-tracking branch 'origin/sabe/attributes' into develop
Conflicts:
	views/shared/footer.jade
2014-01-04 16:02:22 -07:00
Dušan Juretić
4777a693ba Test refactoring: user.user -> user 2014-01-04 17:35:45 -03:00
Dušan Juretić
a74e99a78f Minor style changes to inventoryCtrlSpec.js 2014-01-04 17:32:30 -03:00
Dušan Juretić
a4c7775d51 Tests for choosing a pet and buying an egg 2014-01-04 17:28:13 -03:00
Tyler Renelle
68ad68e74d Merge pull request #2253 from djuretic/inventory_tests
More InventoryCtrl tests
2014-01-04 10:48:26 -08:00
Tyler Renelle
c6ab84721f fix #2205 hide checklist button from challenges 2014-01-04 10:58:12 -07:00
Dušan Juretić
24815af9c1 Added inventoryCtrl tests for hatching and selling 2014-01-04 00:02:51 -03:00
Dušan Juretić
f854d2d022 Use $window on inventoryCtrl, so it can be mocked on tests 2014-01-04 00:01:29 -03:00
Dušan Juretić
d58568c9d8 Fix AuthCtrl tests with proper asserts 2014-01-03 23:28:43 -03:00
Tyler Renelle
d9779d8e51 challenges: but provide default notes 2014-01-03 14:34:47 -07:00
Tyler Renelle
9a6f0c0339 challenges: don't remove To-Dos that are part of a challenge when
clearing completed
2014-01-03 14:18:53 -07:00
Tyler Renelle
c9e083b602 challenges: add "official habitrpg challenge" option 2014-01-03 13:36:13 -07:00
Tyler Renelle
45b543c1ed challenges: don't disable notes field when challenge-task 2014-01-03 13:14:56 -07:00
Tyler Renelle
abd300199a challenges: allow members to override challenge.tasks.notes, and sycning
challenge won't update those notes.
2014-01-03 13:10:56 -07:00