Commit graph

5257 commits

Author SHA1 Message Date
Alice Harris
d9661cf089 hide Plain Egg mounts and remove them from the totalMounts count 2014-09-11 17:59:37 +10:00
Tyler Renelle
29d1cf460c bailey() 2014-09-09 23:10:05 -06:00
Negue
62361b6c3b set sticky header height to auto - fix #3011 2014-09-09 20:10:08 +02:00
Tyler Renelle
f59bba598e Merge pull request #4003 from Lamecarlate/develop
Update inventory.styl
2014-09-08 17:53:58 -06:00
Chaopale Lamecarlate
716fb9b111 Update inventory.styl 2014-09-08 23:10:27 +02:00
Matteo Pagliazzi
c90c8f9a5f Revert "ngRepeat with track by"
This reverts commit 397ef5e72c.
2014-09-08 12:30:30 +02:00
Tyler Renelle
6253404677 tests(api.mocha): move bac to coffeescript from javascript 2014-09-07 17:06:24 -06:00
Tyler Renelle
aa0c365326 wip(indexes): starter code for handling duplicate accounts #3986 2014-09-07 14:34:43 -06:00
Tyler Renelle
7e91fa4524 Merge pull request #3987 from Alys/soundOff404-Sep05
prevent harmless but annoying 404 errors for sound files when sound is off
2014-09-05 16:08:14 -06:00
Tyler Renelle
1dc141b1ec Merge pull request #3993 from negue/performance_trackBy
ngRepeat with track by
2014-09-05 16:04:14 -06:00
Tyler Renelle
9dda82ac1c Merge pull request #3988 from Alys/helpMenu_0827
add Help menu - fixes UI Trello card: Help/FAQs
2014-09-05 13:47:08 -06:00
Negue
397ef5e72c ngRepeat with track by 2014-09-05 20:10:13 +02:00
Alice Harris
9cf76f0deb fix whitespace 2014-09-05 21:07:57 +10:00
Alice Harris
c731753e33 add Help menu 2014-09-05 20:57:44 +10:00
Alice Harris
2350989dfb prevent harmless but annoying 404 errors for sound files when sound is off 2014-09-05 18:45:52 +10:00
Tyler Renelle
8961ac6198 Merge pull request #3984 from negue/checklist_markdown
Markdown for Checklist Items
2014-09-04 18:56:36 -06:00
Negue
042dabcae9 Markdown for Checklist Items 2014-09-04 22:32:54 +02:00
Alice Harris
371bae31b1 Merge pull request #3952 from negue/tooltip_fix_part2
2nd Try to fix Avatar tooltips
2014-09-03 12:03:55 +10:00
Alice Harris
73ed5e0292 Merge pull request #3972 from Alys/reportCountOwnedGear
stop database_reports/count_users_who_own_specified_gear.js crashing when user doesn't have expected object
2014-09-03 11:47:34 +10:00
Alice Harris
8192888af2 stop crashing when user doesn't have expected object 2014-09-03 11:45:07 +10:00
Tyler Renelle
6229b2c79e perf(auth): exclude unecessary auth fields 2014-09-02 15:54:56 -06:00
Tyler Renelle
12a93c8fe3 Merge pull request #3960 from Alys/reportCountOwnedGear
count how many users own wondercon Unconventional Armor and Halloween Spooky Skins
2014-09-02 15:53:08 -06:00
Tyler Renelle
5cc4bf8aca Merge pull request #3966 from Alys/questLeaderAndNotifications
mark Quest Owner in quest participants box on party page
2014-09-02 15:50:58 -06:00
Tyler Renelle
46aec7ef95 Merge pull request #3970 from Alys/tags-Sep-02
allow new tag to have same UUID on client and server - fixes https://github.com/HabitRPG/habitrpg/issues/2856 , fixes https://github.com/HabitRPG/habitrpg/issues/2370
2014-09-02 15:50:09 -06:00
Alice Harris
28505c139f allow newly created tag to have the same UUID on client and server - fixes https://github.com/HabitRPG/habitrpg/issues/2856 2014-09-03 06:16:46 +10:00
Tyler Renelle
772ea500a3 feat(auth): allow logging in with either username or email address 2014-09-02 12:23:29 -06:00
Tyler Renelle
2fc0f24c19 bailey(backgrounds): september 2014 backgrounds 2014-09-02 12:03:03 -06:00
Alice Harris
fa96717175 mark quest owner in quest participants box on party page (in invitation stage and after quest started) 2014-09-02 17:33:26 +10:00
deilann
a36b2e17ba Merge pull request #3965 from Alys/enableClassSystem
add Enable Class System button to User -> Stats when user has opted out
2014-09-01 22:55:35 -07:00
Alice Harris
679a120053 add Enable Class System button to User -> Stats ("Stats and Achievements") page when user has opted out 2014-09-02 14:56:14 +10:00
Tyler Renelle
72c6fd720a bailey(mystery): september mystery reminder 2014-09-01 12:25:01 -06:00
Alice Harris
c47d81e4eb sort output alphabetically by item name; improve readable data so it is actually readable 2014-09-01 19:33:23 +10:00
Alice Harris
5b333a29ab add Spooky Skins; improve report to use node.js stream-based code 2014-09-01 15:54:44 +10:00
Alice Harris
34e2f23361 modify report to use better code 2014-09-01 07:47:59 +10:00
Tyler Renelle
ff0b8ad88b bailey(subscriptions): last day reminder @lemoness 2014-08-31 12:09:30 -06:00
Tyler Renelle
b73da19487 Revert "chore(packages): test upgrade to mongoose 3.8.15"
This reverts commit cbcd0728b5.
2014-08-29 19:55:53 -06:00
Tyler Renelle
cbcd0728b5 chore(packages): test upgrade to mongoose 3.8.15 (see
https://github.com/LearnBoost/mongoose/issues/1920 for concern)
2014-08-29 18:23:13 -06:00
Tyler Renelle
4c6090220f chore(packages): upgrade newrelic 2014-08-29 17:48:09 -06:00
Negue
f7d0c91471 fix tooltip .. again 2014-08-29 20:51:12 +02:00
Tyler Renelle
f981223153 fix(sortable): revert back to jqueryUI, fixes #3946 2014-08-28 16:32:05 -06:00
Tyler Renelle
8bfcb84fe9 Merge pull request #3944 from kumarei/develop
Completed tasks no longer display past dates in red
2014-08-28 11:36:17 -06:00
Nathaniel E Skiba
b9321807ca Completed tasks no longer display past dates in red 2014-08-28 11:21:58 -04:00
Tyler Renelle
3a4e9b135f chore(packages): upgrade newrelic 2014-08-27 19:10:04 -06:00
Tyler Renelle
4ba860ea8c fix(sortable): don't trigger sort when dragging in place, fixes #3926 2014-08-26 14:32:21 -06:00
Tyler Renelle
a98b49a461 Merge pull request #3884 from Alys/reportCountOwnedGear
count how many users own specified gear with mongodb JavaScript
2014-08-26 14:11:26 -06:00
Tyler Renelle
6960a2ddad Merge pull request #3924 from breiste/develop
Fix Play-Button width on frontpage
2014-08-26 14:02:35 -06:00
Tyler Renelle
96532ed6bd Merge pull request #3925 from ebiagogo/develop
Fixed bug #3007 where using wrong "old password" when changing password ...
2014-08-26 14:00:18 -06:00
Tyler Renelle
76206e32d6 Merge pull request #3930 from ebiagogo/3477
Fix for issue #3477, 'No "Contact Us" at Bottom of the page. Added the n...
2014-08-26 13:48:26 -06:00
Michael Looby
34aec9ea82 Merge branch 'develop' of https://github.com/ebiagogo/habitrpg into develop 2014-08-26 15:35:45 -04:00
Michael Looby
1fd27b0302 Fix for issue #3477, 'No "Contact Us" at Bottom of the page. Added the new link and used the existing env.t('contactUs') string so all the translations are correct. Also added the link to layout.jade because that was stubbed out there in comments. Both links go to a new page with other links as described in the issue. 2014-08-26 15:33:36 -04:00