sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9376 commits 3 branches 0 tags 1.6 GiB
Commit graph

9376 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sabe Jones
c94f6d1c2c Merge pull request #5325 from HabitRPG/mystery-presents 
Mystery presents
 2015-06-01 11:42:26 -07: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
950c0da7ff Merge pull request #5319 from HabitRPG/announce 
May 31 Bailey
 2015-05-31 14:11:40 -07:00
Sabe Jones
829ed8a161 chore(news): May 31 Bailey 2015-05-31 16:04:42 -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
05962c6a0f Merge pull request #5306 from HabitRPG/mixpanel 
Mixpanel trial implementation
 2015-05-31 13:46:24 -07:00
Sabe Jones
91f93df7cc Merge branch 'develop' into mixpanel 
Conflicts:
	config.json.example
 2015-05-31 15:40:21 -05:00
Blade Barringer
d28ed6badf Correct format of directive creation to work in un-minified state 
Fixes #4606
 2015-05-31 15:25:32 -05:00
Matteo Pagliazzi
995721e0da chore(i18n): update locales 2015-05-31 15:36:54 +02:00
Matteo Pagliazzi
8a6c49f002 feat(weekly-recap): track last date of weekly recap email 2015-05-31 12:10:03 +02:00
Blade Barringer
6fb100874c Added mixpanel mock to make karma tests happy 2015-05-30 23:29:52 -05:00
Blade Barringer
719ae1c89d Add missing ?; common tests pass 2015-05-30 23:10:44 -05:00
Blade Barringer
6bced5d9ee Set default flag report email variable to array 2015-05-30 12:09:28 -05:00
Alys
467f725ef8 Merge pull request #5302 from agentx999/text-improvements 
Various text improvements
 2015-05-30 15:24:29 +10:00
Sabe Jones
a2f9e0579d chore(npm): install mixpanel 2015-05-29 16:24:03 -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
39cb9bfb99 downcase beffymaroo 2015-05-26 22:42:17 -05:00
Blade Barringer
9793df87d1 Merge branch 'reyrodrigez-develop' into develop 2015-05-26 22:26:48 -05:00
Blade Barringer
0e2f0596f6 Remove explicit divs 2015-05-26 22:26:24 -05: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
Laszlo Heves
eb3f7829cf Update date 2015-05-27 02:22:35 +02:00
Laszlo Heves
e0eab880a4 Define semantic classes with shorthand syntax 2015-05-27 02:21:48 +02:00
Laszlo Heves
72c1e9e137 Using shorthand id definitions 2015-05-27 02:07:13 +02:00
Laszlo Heves
020f7f1f5d Adding semantic ids to community guidelines 2015-05-27 01:39:40 +02:00
Laszlo Heves
17842d2103 Adding Beffymaroo to moderators 2015-05-27 01:25:40 +02:00
Blade Barringer
fce9d39f19 Added in one-time-bindings 2015-05-26 09:02:25 -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
844c1ed178 Merge pull request #5288 from SabreCat/develop 
May Mystery Items
 2015-05-25 19:21:07 -07: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
a298393e04 Merge pull request #5275 from GitHubSphinx/Sphinx-entry1 
Swap faq and overview in the top menu
 2015-05-24 22:15:24 -05:00
Blade Barringer
466221f848 Correct test syntax 2015-05-24 22:13:51 -05:00
Blade Barringer
30ef563534 Merge branch 'negue-anonymizedUser' into develop 2015-05-24 22:04:18 -05:00
Blade Barringer
0afd56e8ad Refine anonymous user test 2015-05-24 22:03:40 -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
GihHubSphinx
fac855898f Swap faq and overview in the top menu 
Addressing request by lemoness
https://github.com/HabitRPG/habitrpg/issues/5261
 2015-05-25 02:25:51 +05:00