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

9121 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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 b0bf033c54 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
Kevin Gisi
52bb575f5f Updated .travis.yml 2015-04-04 21:45:36 -04:00
Kevin Gisi
205e26883e Provisional commit of revised test manager and protractor version, pending a Travis run 2015-04-04 21:35:16 -04:00
Alys
e134c36ca2 prevent user.stats.points from being negative e.g., after dropping level with Fix Character Values (still need to remove allocated points then) 2015-04-05 09:04:59 +10:00
Sabe Jones
3c07a8ee6b fix(frontpage): Wording tweak 2015-04-04 13:03:57 -05:00
Kevin Gisi
12ef81424f Upgrade protractor version 2015-04-04 11:05:25 -04:00
Matteo Pagliazzi
9a76552072 chore(i18n): update locales 2015-04-04 12:36:55 +02: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
Alys
a02c957c59 ignore habitrpg-shared.js (add to .gitignore, delete from repo) 2015-04-04 13:53:36 +10:00
Tyler Renelle
e3626f6113 fix(static): use different intro image 2015-04-03 20:08:00 -06:00
Kevin Gisi
35866568da Repair broken e2e test by changes in copy and IDs 
* Switch the "Play" button to check for "Play HabitRPG"

* Change "#register-tab" selector to use "#registrationForm"

* Increase delay when only running protractor specs, to ensure the server has
  time to spin up
 2015-04-03 21:14:22 -04: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