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
10,429 Commits 63 Branches 1,225 Tags
078ea4768a747b13f8f77aabbb88cdda40b4a7f0
Commit Graph

727 Commits

Author SHA1 Message Date
Sabe Jones
ab91a6fba9 Merge pull request #5781 from HabitRPG/sabrecat/greeting-cards 
Greeting and Thank-You Cards
 2015-08-13 22:35:25 -05:00
Sabe Jones
00a212660a feat(greeting-cards): Thank-You & Greets 2015-08-13 16:58:31 -05:00
Sabe Jones
f57e3e69a1 WIP(greeting-cards): Working send + modals 2015-08-13 15:43:51 -05:00
Sabe Jones
b2100c2c54 WIP(greeting-cards): Abandon spell refactor 2015-08-13 14:31:34 -05:00
Alys
619b33795a remove mention of ads from locale strings, delete ads strings that are no longer used - fixes https://github.com/HabitRPG/habitrpg/issues/5765 2015-08-13 16:46:02 +10:00
Blade Barringer
3f941c3534 chore(i18n): update locales 2015-08-12 22:37:52 -05:00
Blade Barringer
bf4d690a7c Merge pull request #5775 from HabitRPG/item_store_fix 
Split out potion and armoire out of the itemStore object
 2015-08-12 22:35:54 -05:00
Blade Barringer
39ead02d6c Remove comment 2015-08-12 19:09:11 -05:00
Blade Barringer
bcf7c9712e Split out potion and armoire out of the itemStore object 
Fixes #5743
 2015-08-12 18:53:49 -05:00
Sabe Jones
3c8424a83e Merge branch 'crookedneighbor/refactor_cards' into sabrecat/greeting-cards 2015-08-12 11:53:28 -05:00
Blade Barringer
203a26b6df Refactor how cards are recieved 2015-08-12 08:36:57 -05:00
Alys
665c32ee54 change Fortify Potion description for blue tasks making the game too easy - fixes https://github.com/HabitRPG/habitrpg/issues/5758 2015-08-12 11:25:08 +10:00
Blade Barringer
60f92a8997 chore(i18n): update locales 2015-08-11 20:02:59 -05:00
Blade Barringer
869b27d786 Correct markdown 2015-08-11 20:01:45 -05:00
Blade Barringer
6861f1460a chore(i18n): update locales 2015-08-11 18:50:51 -05:00
Blade Barringer
0dc10b5f8e Convert valentines to markdown 2015-08-11 18:47:12 -05:00
Alys
8360aa93fb Merge pull request #5756 from Alys/cron-missed-days-ignore-multiple-2015-07-21 
make cron count multiple missed days as one missed day (part 2)
 2015-08-12 08:35:37 +10:00
Blade Barringer
455dae1032 chore(i18n): update locales 2015-08-11 08:15:34 -05:00
Blade Barringer
5750da4a13 chore(i18n): update locales 2015-08-11 08:13:41 -05:00
Blade Barringer
e31138fb76 chore(i18n): update locales 2015-08-11 07:54:42 -05:00
Blade Barringer
01e2c30795 chore(i18n): update locales 2015-08-11 07:38:42 -05:00
Matteo Pagliazzi
0a340de9c8 chore(i18n): update locales 2015-08-11 14:32:00 +02:00
Blade Barringer
2ec7e631e9 Update locales 2015-08-10 07:52:07 -05:00
Blade Barringer
7aa67e68d8 Revert emdash changes 2015-08-09 09:19:46 -05:00
Garrison Taylor
df98a28d4c Fix typo 
"successully" to "successfully"
 2015-08-09 10:06:00 -04:00
Garrison Taylor
f2503d0d41 Replace a hyphen with an emdash 2015-08-09 09:45:04 -04:00
Garrison Taylor
36aef28f72 Replace a hyphen with an emdash 2015-08-09 09:44:25 -04:00
Garrison Taylor
a261840fb3 Rewrite the maximum gems sentence 
It is not in plainer English
 2015-08-09 09:40:38 -04:00
Garrison Taylor
028b5ed825 Fix grammar typo 
Replace a comma with a semicolon.
 2015-08-09 09:38:45 -04:00
Garrison Taylor
969d121b80 Fix grammar typo 
Change "you get one point to allocate to particular stat" to "you get one point to allocate to a particular stat"
 2015-08-09 09:37:16 -04:00
Garrison Taylor
f5890131c7 Fix grammar typo 
Change "but knight shows no signs of stopping" to "but the knight shows no signs of stopping"
 2015-08-09 09:35:38 -04:00
Garrison Taylor
b8d13413b8 Fix type with "Successully" 
"Successully" to "Successfully" in detachedFacebook
 2015-08-09 09:31:54 -04:00
Alys
fd0176f4fc fix an outdated comment 2015-08-09 14:09:10 +10:00
Alys
262340147d remove code that was added purely for testing and development 2015-08-09 14:08:28 +10:00
Alys
06fd9c7a67 replace _.times with for loop to allow break 2015-08-09 13:58:18 +10:00
Alys
c3d65f0bcf initial changes to cause cron to count multiple missed days as one missed day 2015-08-09 13:58:18 +10:00
Blade Barringer
2069936603 Correct spelling of increases 
Fixes #5744
 2015-08-08 16:34:22 -05:00
Blade Barringer
e1ecb9d29b Part 3 of translation fixes 2015-08-08 09:58:20 -05:00
Blade Barringer
e05426ecae Part 2 of translation fix 2015-08-08 08:14:48 -05:00
Blade Barringer
6c6e22f9e6 Part 1 of translation fixes 2015-08-07 23:43:37 -05:00
Blade Barringer
f378fdf860 chore(i18n): update locales 2015-08-07 23:02:00 -05:00
Blade Barringer
28046ba3a3 chore(i18n): update locales 2015-08-07 07:38:14 -05:00
Blade Barringer
1f6cad7baf Revert change that made death.json executable :/ 2015-08-06 08:53:08 -05:00
Blade Barringer
4bdb2a8b84 chore(i18n): update locales 2015-08-06 08:50:06 -05:00
Blade Barringer
46156601ff Add death files for other languages 2015-08-06 08:10:46 -05:00
Blade Barringer
0ca2339d87 chore(i18n): update locales 2015-08-06 08:03:11 -05:00
Blade Barringer
cf507df375 chore(i18n): update locales 2015-08-06 07:38:20 -05:00
Blade Barringer
ac7ee80c27 Merge branch 'sgabler-add-hints-to-repeat-every-x-days-functionality' into develop 2015-08-05 18:28:09 -05:00
Blade Barringer
787cb6cabb Final adjustments to PR 
- Rename strings to make them easier to expand upon in the future
- adjust line break formatting
- remove terniary operator
 2015-08-05 18:27:24 -05:00
Blade Barringer
383ae3be55 Merge pull request #5746 from crookedneighbor/enchanted_armoire_test_improvements 
Enchanted armoire test improvements
 2015-08-05 18:13:12 -05:00