sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-02 04:00:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9464 commits 1 branch 0 tags 1.6 GiB
Commit graph

404 commits

Author SHA1 Message Date
Bill Parrott
05286d1e8f use correct http status code 2015-06-09 08:55:06 -05:00
Bill Parrott
9cbc21d798 check for duplicate task ID when adding a new task 2015-06-09 08:55:06 -05:00
Matteo Pagliazzi
4ee3e711d1 chore(i18n): update locales 2015-06-08 18:57:38 +02:00
Alys
e5b8c5c4e0 use a different random seed for starting Armoire randomness than for sub-choices within it to prevent bug that gives only some foods 2015-06-08 21:15:51 +10:00
Sabe Jones
804cced3ff chore(various): News and sprites 
Also tweaks the drop probability of equipment from 70% to 60%.
 2015-06-05 10:22:22 -05:00
Sabe Jones
95bb5be22a Merge branch 'develop' into armoire 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith2.css
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	common/dist/sprites/spritesmith5.css
	common/dist/sprites/spritesmith5.png
	common/dist/sprites/spritesmith6.css
	common/dist/sprites/spritesmith6.png
 2015-06-04 15:49:06 -05:00
Sabe Jones
20859b83ef feat(Armoire): Improved counter 
The popover counter of remaining Equipment in the Armoire now counts down immediately instead of requiring a browser refresh. A modal announces when the last item has been found. Also includes several fixes to the Ultimate Gear migration.
 2015-06-04 15:45:55 -05:00
Sabe Jones
6074774e14 feat(backgrounds): June BGs 2015-06-04 11:30:25 -05:00
Sabe Jones
c8f4e6209a Merge pull request #5343 from HabitRPG/sabrecat/mounts 
Readjusted lion
 2015-06-04 09:24:21 -07:00
Sabe Jones
4f6f0220ad fix(mounts): Readjusted lion 2015-06-04 11:02:58 -05:00
Blade Barringer
865f7651a9 Merge branch 'TheHollidayInn-invite-friends-in-header' into develop 2015-06-04 08:54:04 -05:00
Sabe Jones
09d32390f9 feat(Armoire): Item counter 
Implements a counter for how many pieces of equipment remain to be found in the Armoire, including tests for same.
 2015-06-03 16:48:11 -05:00
Sabe Jones
97ae243c40 fix(Armoire): Fixes 
Armoire items are now breakable on character death, and can be purchased back directly from Rewards after death or Rebirth. Corrected string token on Costume area. Images show up correctly on Armoire drop notifications.
 2015-06-03 12:50:57 -05:00
Sabe Jones
af3ee8cfcd feat(Armoire): Updates from feedback 
Adds images to Armoire drop notifications, refreshes the Rewards column when the Armoire is enabled, adds Armoire items to Costume customization, and introduces a migration for granting the new style Ultimate Gear achievement to those who have already earned it.
 2015-06-03 11:58:30 -05:00
Sabe Jones
c90f7e2c34 feat(Armoire): WIP 2015-06-02 17:42:14 -05:00
Blade Barringer
af94236a01 Add wiki link to reward help string. 
Fixes #5333
 2015-06-02 08:15:16 -05:00
TheHollidayInn
e3f5c22fe8 Added start party option, locales, and plus button 2015-06-01 21:07:53 -05:00
TheHollidayInn
5513061d80 Added invite to friends in header, added setting to hide the invite friends, and localized the invite friends string 2015-06-01 21:07:09 -05:00
Sabe Jones
5cf6127382 fix(mounts): Reposition mounts 
Changes the remaining mounts revised by Kiwibot re: #4449.
 2015-06-01 18:37:01 -05:00
Sabe Jones
3de9aed2c4 fix(sprites): Recanvas wolf mounts 
See #4449
 2015-06-01 12:33:13 -05:00
Sabe Jones
d76ca1c04d feat(mystery): Programmatic presents 
Shows the appropriately colored subscription giftwrap for the user's current month. Also includes the Bailey notification for this month's upcoming subscriber item.
 2015-06-01 12:06:35 -05:00
Sabe Jones
766f3b6057 Merge pull request #5307 from HabitRPG/tutorial 
Tutorial overhaul
 2015-05-31 13:58:12 -07:00
Sabe Jones
8074648c70 Merge branch 'develop' into tutorial 
Conflicts:
	common/locales/en/npc.json
 2015-05-31 15:52:12 -05:00
Sabe Jones
91f93df7cc Merge branch 'develop' into mixpanel 
Conflicts:
	config.json.example
 2015-05-31 15:40:21 -05:00
Matteo Pagliazzi
995721e0da chore(i18n): update locales 2015-05-31 15:36:54 +02:00
Blade Barringer
719ae1c89d Add missing ?; common tests pass 2015-05-30 23:10:44 -05:00
Sabe Jones
726a8f1acb feat(analytics): Mixpanel implementation WIP 2015-05-29 16:22:35 -05:00
Sabe Jones
5127814f9e chore(grunt): compile sprites 2015-05-29 15:19:51 -05:00
Sabe Jones
7a8046317d feat(tour): Iteration 5/29 2015-05-29 15:14:19 -05:00
Sabe Jones
6af7342693 feat(tour): Revised intro tutorial 2015-05-29 14:03:42 -05:00
agentx999
d172d1548c challenge task text 2015-05-27 16:14:24 -07:00
agentx999
2843d1d278 boss damage text 2015-05-27 16:12:37 -07:00
agentx999
5d37eb3c5f tavern and challenge pop-ups, pet and mount pages 2015-05-27 16:09:25 -07:00
agentx999
47134a7094 checklist hover text, difficulty hover text 2015-05-27 16:02:00 -07:00
Blade Barringer
85993d25cf Merge branch 'hairlessbear-move_flower_to_accessories' into develop 2015-05-26 22:20:21 -05:00
Blade Barringer
615c3f18a5 Adjust gruntfile regex and recompile 2015-05-26 22:19:45 -05:00
GihHubSphinx
a788d51aa5 Made gift dialog translatable 
Addressing a bit beyond _#10 in the opening post of
https://github.com/HabitRPG/habitrpg/issues/4522

Screenshot of before-after-proof: http://oi57.tinypic.com/11c9ldi.jpg
 2015-05-26 17:18:18 +05:00
hairlessbear
958068c2b0 Rebased to resolve merge conflicts 2015-05-26 00:19:35 -04:00
Sabe Jones
ed25cffaf7 chore(grunt): compile sprites 2015-05-25 21:10:37 -05:00
Sabe Jones
3098cacf03 feat(subscriber): May Mystery Items 2015-05-25 21:03:13 -05:00
Blade Barringer
5d93f364c1 Merge branch 'blade-hairlessbear_markdown_help_table' into develop 2015-05-24 22:47:02 -05:00
Blade Barringer
9b2798ee71 Refine markdown help 2015-05-24 22:45:09 -05:00
Blade Barringer
690321baca Merge pull request #5270 from GitHubSphinx/Sphinx-i18n-db2 
Made text on static/contact translatable
 2015-05-24 22:17:10 -05:00
Blade Barringer
abbfdaeda5 Adjust NotGonnaGitUs's PR 
* move challenge test to separate file
* adjust wording of popover text
* prevent refunding gems for tavern challenges
* adjust ui of challenge creation page
* fix bug in cancel function
* adjust wording of delete confirmation message
 2015-05-24 21:22:40 -05:00
Blade Barringer
681668f131 Tweak @hairlessbear's pr 
* Simplify chat button stylings
* Add formatting help to send gift modal
* Clean up formatting of table
* Add example for unordered lists
* Remove ! from `env.t` that do not have html characters
* Use https instead of http in link
* Format markdown blurb
* Use ng-if instead of ng-show
* Collapse show help link into single element
 2015-05-24 09:20:12 -05:00
Matteo Pagliazzi
047ce0141f chore(i18n): update locales 2015-05-24 11:27:17 +02:00
GihHubSphinx
dc51c6e478 Made text on static/contact translatable 
Addressing _#12 in the OP of
https://github.com/HabitRPG/habitrpg/issues/4522

Before/after screenshot: http://i.snag.gy/b00FV.jpg

"Report a Bug" string is used from generic.json as already translated
before
 2015-05-24 13:31:29 +05:00
hairlessbear
337a727390 Added hidable markdown help menu and adding to private messages 2015-05-23 22:51:40 -04:00
Blade Barringer
1f0dbef3c7 Merge pull request #5234 from hairlessbear/ethereal_surge_split_fix 
Fixed Ethereal Surge notification split
 2015-05-22 23:23:34 -05:00
GihHubSphinx
fe2e0618b8 Make Invite-friends-to-group dialog translatable 
UI strings of the dialog of invitation to the group made translatable
 2015-05-23 02:44:32 +05:00