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

1120 Commits

Author SHA1 Message Date
Matteo Pagliazzi
0834f8eeea disable api v2 and related tests to enable changes to models 2015-11-07 15:51:26 +01:00
Sabe Jones
56fbc33d1c Merge branch 'develop' into Move-Overview-To-Website 
Conflicts:
	website/src/routes/pages.js
 2015-11-05 14:31:00 -05:00
Sabe Jones
18c2279be4 fix(overview): Wording and layout tweaks 2015-11-05 14:18:51 -05:00
Sabe Jones
bb55a74f48 chore(news): iOS update Bailey 
Also fixes the color of the iOS app icon and codes it more intelligently.
 2015-11-05 11:48:51 -05:00
Blade Barringer
3726f48ff2 chore(i18n): update locales 2015-11-04 21:57:16 -06:00
Sabe Jones
3a1862ecef fix(static): Non-widgety App Store links 2015-11-04 22:42:10 -05:00
Sabe Jones
de5d2df94c fix(i18n): Add missing string 2015-11-04 16:04:51 -05:00
Sabe Jones
8c4ecb8f6c feat(static): Apps page 2015-11-04 13:35:31 -05:00
Amin Arria
8611c00201 Added links 2015-11-03 22:38:55 -04:30
Amin Arria
f79110d6d2 Changed to be more like the FAQ 2015-11-03 22:03:24 -04:30
Sabe Jones
3691a59ddb fix(front-page): Update registered user count 2015-11-03 12:30:54 -06:00
Amin Arria
167af1afd4 New static page: overview 2015-11-03 13:35:14 -04:30
Sabe Jones
1fa15ba24a Merge pull request #6167 from HabitRPG/sabrecat/content-201511 
November backgrounds and Armoire
 2015-11-03 11:58:51 -06:00
Blade Barringer
2713b0f26f chore(i18n): update locales 2015-11-02 22:08:28 -06:00
Sabe Jones
6b3fcd3d11 fix(content): Correct stats for Royal Robes 
...in newtype content file
 2015-11-02 17:34:59 -05:00
Sabe Jones
510080325d fix(content): Correct missing Armoire items 
...in newstyle content files
 2015-11-02 17:33:03 -05:00
Sabe Jones
e74c83be2e feat(content): November backgrounds and Armoire 2015-11-02 17:28:20 -05:00
Sabe Jones
2cb4e80019 chore(event): End Fall Festival 2015-11-02 12:55:48 -05:00
Sabe Jones
9227dd89be fix(event): Extend festival one day 2015-11-01 13:27:36 -06:00
Alys
fa060bf6cd revert a commit that went live prematurely when I was distracted - sorry for commit spam 2015-10-31 19:26:05 +09:00
Alys
8f21fb2419 set lastCron to current moment if the user's timezone has changed when they authenticate 2015-10-31 18:34:35 +09:00
Blade Barringer
c419ca8839 Merge pull request #6068 from AminArria/Wrong-max-level-messages 
Wrong max level messages
 2015-10-30 23:21:29 -05:00
Blade Barringer
4a9b0f1d12 Merge branch 'Thrashmandicoot-merchant-button-fix' into develop 2015-10-30 22:50:26 -05:00
Blade Barringer
898850fd6e Adjust wording of market message. 2015-10-30 22:50:04 -05:00
Thrashmandicoot
76de8af848 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix 2015-10-30 20:02:16 -07:00
Alys
154fcb4f8c make daysMissed have a negative value for a lastCron in the future so that setting your PC time backwards doesn't trigger cron 2015-10-31 13:00:42 +10:00
Alys
34c51fc710 revert recent cron change (better code incoming; what WAS I thinking) 2015-10-31 10:59:41 +10:00
Blade Barringer
ad6fbef85c Move chat tests to new infrastructure 2015-10-30 14:47:14 -05:00
Sabe Jones
68660b3043 Merge pull request #6140 from HabitRPG/sabrecat/habitoween 
WIP: Habitoween
 2015-10-30 14:46:44 -05:00
Sabe Jones
dca0d7c3f3 fix(event): Keep NPCs burnt out 2015-10-30 15:36:17 -04:00
Alys
161069cfec prevent cron running if the lastCron date is in the future 2015-10-31 04:12:43 +10:00
Blade Barringer
724bc6e861 Compiled css for sprites 2015-10-30 10:10:12 -05:00
Blade Barringer
e8fa22bf93 chore(i18n): update locales 2015-10-30 09:25:43 -05:00
Blade Barringer
aa111b3c1a Update tests to assert against translation strings 2015-10-30 09:01:57 -05:00
Thrashmandicoot
64ea4e42e7 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix 2015-10-30 03:43:35 -07:00
Thrashmandicoot
ebbc72e9c2 Refactor sellForGold, add displayPotion/item 2015-10-30 02:26:41 -07:00
Alys
1923a3a467 change on-hover text for Mystery Item gift box to just mention wiki page 2015-10-30 06:59:54 +10:00
Alys
11ae4a9b87 change on-hover text for Mystery Item gift box to link to wiki page and remove statement about finding exact date on wiki 2015-10-30 06:30:11 +10:00
Sabe Jones
27d1e9c788 feat(event): Habitoween 
Swaps out basic fall costume NPCs for their Halloween versions. Removes "broken" NPC sprites not needed after World Boss.
 2015-10-29 14:15:18 -04:00
Blade Barringer
dd09633d31 Merge branch 'locks-auto-equip' into develop 2015-10-29 12:25:18 -05:00
Blade Barringer
6ff904bd5a Merge branch 'develop' into czan-develop 2015-10-29 08:40:03 -05:00
Amin Arria
bd230df0d3 Added rebirthLevel var to remove need of extra translation string 2015-10-28 14:33:45 -04:30
Matteo Pagliazzi
01373882c6 make error notification persistent, change text and make it translatable 2015-10-28 19:42:26 +01:00
Blade Barringer
5754b4f72a chore(i18n): update locales 2015-10-27 21:38:23 -05:00
Blade Barringer
1a6b1f2a1c Update string 2015-10-27 21:36:52 -05:00
Blade Barringer
b82054128d chore(i18n): update locales 2015-10-27 21:36:51 -05:00
Blade Barringer
711413f832 Update string 2015-10-27 21:28:33 -05:00
Blade Barringer
cdc58c78fd Merge branch 'nicolevonvon-develop' into develop 2015-10-27 20:19:09 -05:00
Blade Barringer
c812c0ae90 Add popover to no owner label 2015-10-27 20:18:39 -05:00
nicolevonvon
47ec2e1f93 Challenges now display'no owner' if original owner deletes account 2015-10-27 22:15:19 +02:00