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

9758 Commits

Author SHA1 Message Date
Sphinx b9490d39b8 Update gems.jade 
https://github.com/HabitRPG/habitrpg/issues/2932
 2015-04-09 07:53:53 -05:00
Alys 882827c105 Merge pull request #5000 from gisikw/sort-dated-todos 
Put list back into removeTask fn, update removal logic within challegeCtrl
 2015-04-09 16:37:57 +10:00
Kevin Gisi 860ca9fc16 Put list back into removeTask function, update removal logic within challengeCtrl 2015-04-08 23:03:45 -04:00
Blade Barringer a3cbca2089 Merge pull request #4991 from TheHollidayInn/filters-sort-adjustments 
Removed axis resrtiction to ease reordering of large number of tags
 2015-04-08 20:57:40 -05:00
Blade Barringer cdd0b29924 Merge branch 'develop' into gisikw-sort-dated-todos 2015-04-08 20:47:38 -05:00
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
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
Kevin Gisi f12d56e456 Revert "Merge pull request #4995 from HabitRPG/revert-4980-sort-dated-todos" 
This reverts commit 33f928b6d8, reversing
changes made to 76ef1fdd92.
 2015-04-07 22:38:43 -04:00
Kevin Gisi 9bb2f46264 Modify removeTask to accept a task object. Update task view to reflect new method signature. 2015-04-07 22:38:20 -04:00
Blade Barringer cc674f57cd Revert "Sorted dated todos by date." 2015-04-07 19:51:27 -05:00
TheHollidayInn 9619c46df2 Removed extra console.log 2015-04-07 18:49:25 -05:00
TheHollidayInn 09761c5c53 Corrected ordering that tasks appear in when user enters multiple tasks 2015-04-07 14:51:26 -05:00
TheHollidayInn 8826ae8c41 Removed axis resrtiction to ease reordering of large number of tags 2015-04-07 09:47:52 -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
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
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
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 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 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 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
Sabe Jones 3c07a8ee6b fix(frontpage): Wording tweak 2015-04-04 13:03:57 -05:00
Alys baf38acc07 Merge pull request #4871 from TheHollidayInn/default-group-based-on-filter 
Made default group for a challenge the selected group filter if there is only one filter selected
 2015-04-04 17:01:35 +10:00
Tyler Renelle e3626f6113 fix(static): use different intro image 2015-04-03 20:08:00 -06:00
Alys 8033b129ff Merge pull request #4915 from gisikw/free_100_key_to_the_kennels 
Make Key to the Kennels free for Triad Bingoers.
 2015-04-04 10:48:15 +10:00
Tyler Renelle 7336d5bc23 fix(auth): hacky fix to get around tabset hiding the surrounding 
authctrl scope (due to isolate scope)
 2015-04-03 15:48:32 -06:00