krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,055 Commits 63 Branches 1,225 Tags
0199dcadf3642d806fdf58a477b137e9fb416de6
Commit Graph

1453 Commits

Author SHA1 Message Date
Blade Barringer
c21802e7e7 Merge branch 'develop' into refactor-content 2015-09-25 12:22:11 -05:00
Matteo Pagliazzi
a0f84bcf48 fix a few eslint rules 2015-09-25 15:58:39 +02:00
Sabe Jones
35068481c4 chore(news): Fall plotline Bailey 2015-09-23 15:58:13 -04:00
Sabe Jones
009c92b532 feat(content): September sub items and customizations 2015-09-23 15:23:42 -04:00
Blade Barringer
955c163544 Merge branch 'develop' into refactor-content 2015-09-23 07:52:36 -05:00
Sabe Jones
6a6b67b9c1 Merge pull request #5909 from HabitRPG/sabrecat/social-buttons 
Front page Tweet button
 2015-09-22 17:38:47 -05:00
Sabe Jones
b3297383d3 Merge pull request #5954 from HabitRPG/sabrecat/fall-2015 
Fall Festival 2015
 2015-09-21 12:06:40 -05:00
Blade Barringer
2a530a207d Rename translation key 2015-09-19 10:41:21 -05:00
LuneFox
ec336c4f88 added link to the newbies guild 2015-09-19 01:11:27 +03:00
Sabe Jones
aed39a206d fix(services): Remove accidental WIP inclusion 2015-09-18 15:24:56 -04:00
Sabe Jones
3e8a3ee5f4 feat(event): Fall Festival 2015 2015-09-18 15:19:59 -04:00
Kevin Gisi
4525ee5358 Revert "Revert "Removed user's party invites when last user leaves party"" 2015-09-17 23:27:21 -04:00
Kevin Gisi
c26cd1fe5b Revert "Removed user's party invites when last user leaves party" 2015-09-17 04:00:07 -04:00
Sabe Jones
347d028af7 fix(API): Fix inaccessible route 
Mystic Hourglass routes aren't yet used by live code.
 2015-09-17 01:57:28 -04:00
Blade Barringer
8881dbc034 Remove uneeded blank spaces 2015-09-16 20:01:42 -05:00
Sabe Jones
9be0990217 chore(news): Bailey 2015-09-16 2015-09-16 18:34:20 -04:00
Sabe Jones
eb0dd636c1 feat(hourglass): Confirm before buy 2015-09-16 17:40:25 -04:00
Sabe Jones
fb50f27fa7 fix(hourglass): Use method on $scope 2015-09-16 16:46:12 -04:00
Sabe Jones
98cd8364c6 feat(hourglass): Individual filter functions 2015-09-16 16:35:04 -04:00
Sabe Jones
c8cc01fc44 feat(hourglass): Buy pets/mounts 
Functionally complete as of this commit. Further commits will provide more polish and refactoring.
 2015-09-16 14:35:43 -04:00
Sabe Jones
25b133c562 Merge branch 'develop' into sabrecat/timetravel-stable 2015-09-16 12:48:12 -04:00
Blade Barringer
c9c169a0fb Merge pull request #5912 from TheHollidayInn/group-remove-party-invites-when-last-member-leaves 
Removed user's party invites when last user leaves party
 2015-09-16 07:59:32 -05:00
Blade Barringer
f71e3e20eb Merge pull request #5934 from HabitRPG/adjustments_to_group_front_end_only 
Adjustments to group quest behavior
 2015-09-15 18:57:32 -05:00
Blade Barringer
4c84728873 Removes quest from group if quest leader is booted 2015-09-15 18:10:31 -05:00
Blade Barringer
a655242c49 Correct test assertion 2015-09-15 17:38:22 -05:00
Blade Barringer
9abe67b0ad Prevent quest leaders from leaving party 
(cherry picked from commit dc43aa5902)
 2015-09-15 16:41:50 -05:00
Blade Barringer
f8850755d0 Correct leave call to prevent leaving if quest is in progress 
(cherry picked from commit eddea562f4)
 2015-09-15 16:41:25 -05:00
Blade Barringer
78fe1073d4 Add user sync to sendAction 2015-09-15 16:39:08 -05:00
Sabe Jones
6e4cc4b35b fix(API): Missing colons 2015-09-15 15:47:19 -04:00
Sabe Jones
ce764ca28e WIP(hourglass): Mystery sets API route 2015-09-15 15:41:57 -04:00
Sabe Jones
66a8be526b WIP(hourglass): Error catches 2015-09-15 12:40:01 -05:00
Blade Barringer
0fe6054b76 Add missing client code 2015-09-15 10:53:56 -05:00
Blade Barringer
b32e521c56 Pull in client side changes for quest routes 2015-09-15 09:35:17 -05:00
Sabe Jones
580a9871b9 chore(news): Bailey 2015/09/14 2015-09-14 21:21:22 -05:00
Blade Barringer
d573f3c53d Merge branch 'melarish-Mystery_items_already_owned' into develop 2015-09-13 18:28:18 -05:00
Blade Barringer
5974c7e079 Simplify time travelers page 2015-09-13 18:27:57 -05:00
Blade Barringer
d5eaaefa72 Adjust positioning of alert message 2015-09-13 16:56:39 -05:00
Blade Barringer
5553d74334 Create method to calculate whether or not user has attained all mystery equipment 2015-09-13 16:26:29 -05:00
Blade Barringer
b6f02d388f Correct method to correctly add an hourglass in debug menu 2015-09-13 16:25:57 -05:00
Blade Barringer
e554309822 Add route to add a hourglass 2015-09-13 15:09:41 -05:00
Blade Barringer
7c8a46b178 Move message into alert box 2015-09-13 09:34:54 -05:00
Blade Barringer
cd4ec5bd12 Adjust formatting in footer controller 2015-09-13 02:19:34 -05:00
Blade Barringer
14fabfbe40 Remove excess white space 2015-09-12 22:34:58 -05:00
Alys
fbaa5d4321 add new audi theme from LuneFox, moved themes to alphabetical order, adjusted file permissions for Watts Theme 2015-09-12 11:05:31 +10:00
TheHollidayInn
26e6126a25 Removed redundant code when removing group invitations 2015-09-11 12:14:01 -05:00
TheHollidayInn
5c8c5a9ed3 Removed user's party invites when last user leaves party 2015-09-10 23:29:32 -05:00
Sabe Jones
6396b064d2 fix(social): Localize Tweet button 2015-09-10 18:51:19 -04:00
Sabe Jones
45c8bb06e2 Revert "feat(modals): Simplified scroll drop" 
This reverts commit 8b4d34da00.
 2015-09-10 18:08:51 -04:00
Sabe Jones
c03107b54b feat(social): Twitter share main page 2015-09-10 17:54:40 -04:00
Sabe Jones
9d5f9328da WIP(social): Twitter widget script 2015-09-10 17:44:52 -04:00