Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,860 Commits 64 Branches 1,256 Tags
8a33de219c066cde378d46cbfd0cf014b3d31b75
Commit Graph

8860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Renelle 8a33de219c feat(analytics): updated cron experiment ID 2015-04-08 17:37:40 -06:00
Tyler Renelle fee002b289 feat(analytics): better events organization via category>label>action>value 2015-04-08 17:29:55 -06:00
Blade Barringer 3df45a8cb0 Merge branch 'TheHollidayInn-error-message-rewrite' into develop 2015-04-08 18:11:51 -05:00
Blade Barringer 553bd0d90b Updated console message 2015-04-08 18:11:34 -05:00
Blade Barringer a24383c1a2 Removed lingering shared file 2015-04-08 13:58:45 -05:00
Blade Barringer 0f9ce179df Merge branch 'develop' into Alys-ignore-compiled-js-2015-04-04 
Conflicts:
	common/dist/scripts/habitrpg-shared.js
 2015-04-08 13:57:49 -05:00
Matteo Pagliazzi 820909dd9b chore(i18n): update locales 2015-04-08 19:15:03 +02:00
Matteo Pagliazzi e58521f416 Merge pull request #4968 from HabitRPG/paglias/emails-unsubscription-page 
WIP Emails unsubscription page
 2015-04-08 19:12:28 +02:00
Matteo Pagliazzi 804b7b20c7 fix email sending for non registered users 2015-04-08 19:07:36 +02:00
TheHollidayInn a317bc2920 Updated seeConsole message to be more helpful to the average user 2015-04-08 08:20:10 -05:00
Blade Barringer 33f928b6d8 Merge pull request #4995 from HabitRPG/revert-4980-sort-dated-todos 
Revert "Sorted dated todos by date."
 2015-04-07 19:55:52 -05:00
Blade Barringer cc674f57cd Revert "Sorted dated todos by date." 2015-04-07 19:51:27 -05:00
Sabe Jones 76ef1fdd92 Merge pull request #4988 from SabreCat/shiny-seed 
April backgrounds
 2015-04-07 19:12:34 -05:00
Sabe Jones 9d3a14b734 chore(grunt): compile sprites 2015-04-07 19:08:00 -05:00
Matteo Pagliazzi f12f2b201a typos 2015-04-07 16:07:52 +02:00
Matteo Pagliazzi d21fb41aef when signing up, delete previous email preferences 2015-04-07 16:04:33 +02:00
Matteo Pagliazzi b2ffbf4113 password resets back to nodemailer... 2015-04-07 15:53:26 +02:00
Matteo Pagliazzi 16e67ab7d4 put password resets back to email server, check for non registered users unsubscriptions 2015-04-07 14:04:03 +02:00
Matteo Pagliazzi e6c1a72c39 use callback itself as context 2015-04-07 14:04:03 +02:00
Matteo Pagliazzi 9e95f9c17d pass entire unsubscription url to email server 2015-04-07 14:04:03 +02:00
Matteo Pagliazzi ab1b75b655 finalize unsubscription page 2015-04-07 14:04:03 +02:00
Matteo Pagliazzi a7c789746a fix error when signing up 2015-04-07 14:04:03 +02:00
Matteo Pagliazzi 71108ee935 feat(email): WIP start implementing unsubscription page and related features 2015-04-07 14:04:03 +02:00
Matteo Pagliazzi 7d735519ec feat(email-unsubscription-page): create model to hold unsubscriptions 2015-04-07 14:04:03 +02:00
Matteo Pagliazzi e470764b06 chore(i18n): update locales 2015-04-07 14:03:48 +02:00
Sabe Jones 66d5b38dad fix(news): Move pic 2015-04-06 19:26:14 -05:00
Sabe Jones 38bbf63a22 fix(news): Add heading 2015-04-06 19:24:48 -05:00
Sabe Jones 616a7d9650 feat(backgrounds): April BGs 2015-04-06 19:03:24 -05:00
Sabe Jones 1590d050f5 fix(sprite): Seed 32x32 
Fixes #4966.
 2015-04-06 18:38:30 -05:00
Alys 32a71bfc74 Merge pull request #4980 from gisikw/sort-dated-todos 
Sorted dated todos by date.
 2015-04-06 18:22:51 +10:00
Kevin Gisi ac01d9ad8b Sorted dated todos by date. 2015-04-06 03:47:00 -04:00
Alys 6bbd7d611b Merge pull request #4934 from gisikw/single-challenge-view-updated 
Single challenge view updated
 2015-04-06 17:39:03 +10:00
Kevin Gisi 6cfdfc5225 Added group type to challenge API, link to guild/party on challenges 2015-04-06 02:44:43 -04:00
Kevin Gisi 145f4c0fa7 Check leader._id, rather than just leader for checking challenge ownership 2015-04-06 02:32:24 -04:00
Kevin Gisi eef3e293e2 Populate group and challenge leader on challenge GET request 2015-04-06 02:18:29 -04:00
Kevin Gisi da81241ebe Transition Challenge -> Edit to the Singleton challenge view, to address issues associated with #4814 2015-04-06 02:18:29 -04:00
Kevin Gisi 6fb95ec27b Unset .cid for challenge on challenge delete 2015-04-06 02:18:29 -04:00
Kevin Gisi 79fe0b53c5 Added _isMember to APIv2 challenges/:cid endpoint (requires user auth) 2015-04-06 02:18:29 -04:00
Kevin Gisi 3e653c9282 Reimplemented single challenge view code from #3319 2015-04-06 02:18:29 -04:00
Alys 934fd13042 update More Info challenges link to point to wiki instead of old trello card 2015-04-06 15:35:41 +10:00
Alys 7f5c1e5c2c Merge pull request #4978 from Alys/develop 
revert b0bf033 to see if Travis build then stops failing
 2015-04-06 00:55:13 +10:00
Alys 5405dbe085 revert https://github.com/HabitRPG/habitrpg/commit/b0bf033c54ff685546f4a75307ece3ff63a28416 to see if Travis build then stops failing 2015-04-06 00:43:27 +10:00
Alys 83407e0463 Merge branch 'rdhammond-CancelSendOnBlankPM' into develop 2015-04-05 23:35:32 +10:00
Alys 7d579ea08a Merge branch 'CancelSendOnBlankPM' of https://github.com/rdhammond/habitrpg into rdhammond-CancelSendOnBlankPM 
Conflicts:
	website/views/shared/modals/members.jade
 2015-04-05 23:24:46 +10:00
Alys b0bf033c54 Merge pull request #4861 from TheHollidayInn/retain-guild-filters-challenges 
Added previous state tracker and a filter for challenges by a guild if the user has clicked that guilds challenge link.
 2015-04-05 23:11:36 +10:00
Alys def7ff906f Merge pull request #4866 from TheHollidayInn/edit-plusminus-habit-challenge 
Removed css style hack for IE6 and IE7 that was interfering with habit plus/minus button behavior
 2015-04-05 22:47:20 +10:00
Alys eef290009d Merge branch 'TheHollidayInn-remove-interactivity-challenge-tasks' into develop 2015-04-05 22:29:28 +10:00
Alys 6199e1d843 Merge branch 'remove-interactivity-challenge-tasks' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-remove-interactivity-challenge-tasks 
Conflicts:
	website/public/css/tasks.styl
	website/views/shared/tasks/task.jade
 2015-04-05 22:01:10 +10:00
Alys efb4773c27 Merge pull request #4958 from TheHollidayInn/groups-clear-notifs-fetch-messages 
Marked group messages as seen when user syncs new messages
 2015-04-05 20:19:51 +10:00
Alys 7aba0475fe Merge pull request #4967 from Alys/API-wording-changes-2015-04-03 
API wording adjustments (specify task types, describe when authentication is not required)
 2015-04-05 19:01:09 +10:00