Commit graph

10625 commits

Author SHA1 Message Date
Sabe Jones
5e8894a0a6 fix(groups): Show specific invite modal 2015-08-28 16:48:39 -04:00
Blade Barringer
15a6929b44 Merge branch 'develop' into sabrecat/party-page 2015-08-28 08:41:57 -05:00
Sabe Jones
f88c536836 chore(news): Back to School Bailey 2015-08-27 16:20:15 -05:00
Alys
049f9280a2 Merge pull request #5798 from Alys/rebirth-keeps-free-gear-2015-08-12
prevent Orb of Rebirth from removing free gear (equipment that has zero gold cost) - partial fix for https://github.com/HabitRPG/habitrpg/issues/5750
2015-08-26 22:01:29 +10:00
Sabe Jones
6564cb52dc fix(news): wording tweak 2015-08-25 13:10:33 -04:00
Alys
bbcb9e6063 fix problem of Cheetah Costume Set mystery items not staying put -- code is ugly, improve later 2015-08-25 19:23:25 +10:00
Sabe Jones
9ed1e2ba6d fix(mystery): Force coffee compile 2015-08-24 23:37:54 -05:00
Sabe Jones
d70aa46ec1 fix(mystery): Adjust date range 2015-08-24 21:33:02 -05:00
Blade Barringer
5b583f43d6 Fix api and karma test 2015-08-24 18:07:21 -05:00
Blade Barringer
484609c634 Stub Q 2015-08-24 17:55:20 -05:00
Blade Barringer
ce7d0039f8 Q-ify save functions 2015-08-24 17:36:06 -05:00
Sabe Jones
99a9647c46 Merge pull request #5837 from HabitRPG/sabrecat/august-mystery
August Mystery Items
2015-08-24 16:29:09 -05:00
Sabe Jones
c23312f771 feat(mystery): 2015 August items 2015-08-24 17:19:12 -04:00
Sabe Jones
a0e1d50bd6 feat(mystery): 2015 August sprites 2015-08-24 15:38:09 -05:00
Blade Barringer
f584b173c8 Add user scrub quest data back in 2015-08-24 12:58:31 -05:00
Blade Barringer
66d16fefc3 Send back 204 from questLeave route 2015-08-24 12:38:43 -05:00
Blade Barringer
af20986fbc Simplify qroup service quest functions 2015-08-24 08:06:34 -05:00
Blade Barringer
928a54911a Return promises in groups service 2015-08-24 07:47:01 -05:00
Blade Barringer
fbd4490dbc Fix sinon assertions 2015-08-24 07:46:37 -05:00
Blade Barringer
bc24fa8130 Add front end button to leave quest 2015-08-23 22:38:55 -05:00
Blade Barringer
0b7e43f156 Add route for leaving active quest 2015-08-23 20:29:57 -05:00
Blade Barringer
6955add15d Use locale string 2015-08-23 15:05:49 -05:00
Blade Barringer
427fbb959b Add join existing party button 2015-08-23 14:59:06 -05:00
Blade Barringer
3098c7d460 Refactor invite 2015-08-23 14:47:10 -05:00
Blade Barringer
63315ce281 Remove extra ng-if 2015-08-23 10:23:41 -05:00
Blade Barringer
a685828226 remove unused classes 2015-08-23 10:21:21 -05:00
Blade Barringer
12137428e9 Show loading new party message when creating a solo party 2015-08-23 10:17:48 -05:00
Blade Barringer
1144defbca Restructure party page 2015-08-23 10:15:00 -05:00
Blade Barringer
74bef58537 Simplify text-centering 2015-08-23 09:32:59 -05:00
Blade Barringer
08edcb6743 Move loading new party to own partial 2015-08-23 09:31:46 -05:00
Blade Barringer
963b136a91 Reorg party views 2015-08-23 09:28:45 -05:00
Blade Barringer
a36c08930e Separate out party sections 2015-08-23 09:24:55 -05:00
Blade Barringer
3f874e25a4 Fix bug where booting a member makes them appear in the other members list 2015-08-23 09:07:18 -05:00
Blade Barringer
ccff3998bd Hide quest button if quest is pending or active 2015-08-23 08:42:15 -05:00
Blade Barringer
e6fb8f34bb Add user id to solo party page 2015-08-23 08:34:33 -05:00
Blade Barringer
fd35f58ccd Display invite party to quest only if party has more than one member 2015-08-23 08:29:45 -05:00
Blade Barringer
59a2d2b2f0 Improve quest modal appearance 2015-08-23 08:22:34 -05:00
Blade Barringer
e4f2a1a699 Adjust text 2015-08-23 07:59:40 -05:00
Alys
3d47f3f835 remove "as if you had created a new account" from Orb of Rebirth description 2015-08-23 17:43:33 +10:00
Blade Barringer
fefcbd1d2f Merge branch 'develop' into sabrecat/party-page 2015-08-22 21:42:05 -05:00
Blade Barringer
8b75de56b6 Correct tabbing on server side specs reporting 2015-08-22 21:41:13 -05:00
Blade Barringer
a07d0cde85 Fixed karma reporting 2015-08-22 21:41:13 -05:00
Blade Barringer
37859e51b7 Move gulp task 2015-08-22 21:41:13 -05:00
Blade Barringer
f4bc208226 Reorganize karma.conf 2015-08-22 21:41:13 -05:00
Blade Barringer
9fde84f3d0 Remove directive 2015-08-22 21:41:12 -05:00
Blade Barringer
7a43e7f90a Remove mocks 2015-08-22 21:41:12 -05:00
Blade Barringer
7a9cbe2cc5 Glob files in karma.conf 2015-08-22 21:41:12 -05:00
Alys
5b8c161932 changed habitrpg.wikia.com to habitica.wikia.com 2015-08-23 12:31:10 +10:00
Alys
fd446fc5e5 convert habitica.com to BASE_URL 2015-08-23 12:23:35 +10:00
Blade Barringer
699ce83ee9 Merge branch 'develop' into sabrecat/party-page 2015-08-22 19:18:44 -05:00