Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,205 Commits 64 Branches 1,256 Tags
5cc847857f1706e0c5e164ad5c7de9a2e51d052d
Commit Graph

9205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sabe Jones 3ae1ad92a1 Merge pull request #4856 from SabreCat/pi-day 
Pi day
 2015-03-14 11:20:29 -05:00
Sabe Jones 6aedfa7209 chore(grunt): compile sprites 2015-03-14 11:18:36 -05:00
Sabe Jones 1120d334c3 feat(pie): Add pie 2015-03-14 11:11:20 -05:00
Alice Harris 3fcb74bc80 replace ☰ with glyphicon-align-justify for visibility on Android browsers 2015-03-15 00:57:30 +10:00
Alice Harris 21a7e6193f add whitespace between delete and opt-out 2015-03-14 23:27:26 +10:00
Alice Harris f82469eba7 remove trailing whitespace 2015-03-14 22:40:26 +10:00
Alys 94f9cff279 Merge pull request #4850 from stillsnowedin/develop 
Added confirmation before deleting messages and moved buttons to top of ...
 2015-03-14 22:32:46 +10:00
Alys 59f64830b1 Merge pull request #4799 from TheHollidayInn/add-dequip-button 
Added dequip ability per ticket: 3730
 2015-03-14 21:36:57 +10:00
Alice Harris 0ceceaac1f compile javascript 2015-03-14 19:38:58 +10:00
Alice Harris 2f072d8e96 Merge branch 'StealthMod' of https://github.com/Verabird/habitrpg into rebalancing-2015-03-2 
Conflicts:
	common/script/index.coffee
 2015-03-14 18:54:18 +10:00
Verabird 627b07ef86 Rebalance stealth diminishing returns again 2015-03-13 16:45:00 -04:00
Matteo Pagliazzi 5752f75c46 always allow reset password emails 2015-03-13 18:42:23 +01:00
Matteo Pagliazzi dba7d3b522 chore(i18n): update locales 2015-03-13 18:40:11 +01:00
Verabird fbeb83e836 Rescale stealth to strengthen 2015-03-13 11:38:34 -04:00
Tyler Renelle f993a5868f fix(robots): fix robots.txt per 
http://stackoverflow.com/a/7609187/362790 #4746
 2015-03-13 09:01:04 -06:00
Verabird 180d87e9c7 removed commented out old stealth code 2015-03-13 10:53:29 -04:00
Verabird 4a0f165af8 Modify daily checklists to stay checked at cron if inactive and Stealth to only apply to active dailys 2015-03-13 10:53:29 -04:00
Bill Parrott df0bf3136f move max level tweaks to rebalancing branch 2015-03-13 07:48:14 -05:00
Kathryn Norris 9d92bd384c Removed popover from delete messages button. (for #4848) 2015-03-13 05:05:54 -07:00
Kathryn Norris 47a05338e5 Added confirmation before deleting messages and moved buttons to top of Inbox. (fixes #4848) 2015-03-13 04:11:35 -07:00
Alice Harris f58e7ef931 compile habitrpg-shared.js 2015-03-13 20:58:43 +10:00
Alice Harris 6cf815ba22 Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03 
Conflicts:
	common/dist/scripts/habitrpg-shared.js
 2015-03-13 20:23:28 +10:00
Alys 881f70997b Merge pull request #4815 from Alys/debug-options-2015-03-07 
new local install Debug options in footer: +2 Missed days, +MP
 2015-03-13 14:06:12 +10:00
Alice Harris cd8c0956f8 add debug button to footer for increasing mana points (MP) 2015-03-13 13:53:21 +10:00
kholliday dd49b12bdb Added link to challenge creator on challenges. 2015-03-12 20:19:03 -05:00
Tyler Renelle 8b04773b2e feat(auth): update manual_password_reset so can pull creds from 
config.json, and email from CLI. Much easier when updating en-masse
 2015-03-12 13:47:37 -06:00
Tyler Renelle 6ed0ff289f feat(auth): add manual_password_reset migration 2015-03-12 12:22:33 -06:00
Matteo Pagliazzi 8bc5ed83cb chore(i18n): update locales 2015-03-12 16:26:45 +01:00
Tyler Renelle 1687d9aeda feat(auth): 404 on "can't find email" 2015-03-11 18:12:30 -06:00
Alice Harris 9ac0ef0202 explain when survey participants will get their badge 2015-03-12 07:34:01 +10:00
kholliday 8a121a5dc3 Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems 2015-03-10 22:15:24 -05:00
Sabe Jones 676562cfad Revert "fix(emoji): move back to main jsemoji repo, fixes #4265" 
This reverts commit 89b1242e53.
 2015-03-10 22:05:24 -05:00
Tyler Renelle de67f44e1f Merge pull request #4713 from HabitRPG/lefnire/interactive-tour 
Interactive Tour
 2015-03-10 19:23:01 -06:00
Sabe Jones c86257b585 Merge pull request #4834 from SabreCat/surveys 
Survey achievement update
 2015-03-10 19:12:06 -05:00
Sabe Jones 3a9e2a5123 fix(surveys): Visibility tweaks 2015-03-10 19:08:10 -05:00
Sabe Jones 53df85e01b fix(surveys): Fix malformed Angular 2015-03-10 18:47:21 -05:00
Sabe Jones 9cfa27f089 feat(surveys): Survey achievement 
Updates the "Helped Habit Grow" achievement to be stackable. Also includes miscellaneous Bailey announcements for 3/10.
 2015-03-10 18:39:00 -05:00
Alice Harris 3bd0b57efa add semi-colon at end of line; remove apostrophe from comment 2015-03-11 09:29:44 +10:00
Alys 63c57cce5d Merge pull request #4785 from AAorris/develop 
Allow for client notifications to user settings
 2015-03-11 08:20:51 +10:00
Tyler Renelle 962bb65608 tmp(interactive-tour): temporarily remove Hide button 2015-03-10 15:40:19 -06:00
Tyler Renelle 16e996c971 fix(interactive-tour): "Buy the Training Sword" 2015-03-10 15:40:19 -06:00
Tyler Renelle bbbec78bff tmp(interactive-tour): hide "Show Tour" temporarily #4726 2015-03-10 15:40:19 -06:00
Tyler Renelle 63a6af6e0a fix(interactive-tour): small updates per 
https://github.com/HabitRPG/habitrpg/issues/4726#issuecomment-77643235
 2015-03-10 15:40:19 -06:00
Tyler Renelle aee1a3cd6f fix(interactive-tour): just set everyone to "off" for tour on initial migration 2015-03-10 15:40:19 -06:00
Tyler Renelle 98f50374c9 fix(interactive-tour): "hide" on the left, nav on the right 2015-03-10 15:40:19 -06:00
Tyler Renelle a7232b5abe fix(interactive-tour): cleanup steps when navigating chapters, don't use tour.restart() 2015-03-10 15:40:19 -06:00
Tyler Renelle 232224c497 fix(interactive-tour): don't automatically show guide when on mobile devices 2015-03-10 15:40:19 -06:00
Tyler Renelle 62739346c7 tmp(interactive-tour): add "ok" to each step, see #4726 2015-03-10 15:40:18 -06:00
Tyler Renelle d84549e239 feat(interactive-tour): disable ads till lvl 2 2015-03-10 15:40:18 -06:00
Tyler Renelle 812493fec5 feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides 2015-03-10 15:40:18 -06:00