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

63 Commits

Author SHA1 Message Date
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
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 eef3e293e2 Populate group and challenge leader on challenge GET request 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
Alys ec66bfb0cd Specify which API routes need no authentication. Specify task types for full scoring route. For simple scoring, state that it's only Habits and explain that other tasks can use full scoring. 2015-04-03 21:24:48 +10:00
Matteo Pagliazzi 06ffd4db44 fix(i18n): when no lanaguage is passed in the request 2015-04-02 20:06:17 +02:00
Sabe Jones f0e7f0464c fix(seasonal): NO FLOWERS 
We do not say the F word here. Strange things happen in Habitica when someone uses that word. We speak only of "the smelly things with the petals."
 2015-04-01 23:07:36 -05:00
Sabe Jones b6a4d65d8c feat(seasonal): Shiny Seed 2015-04-01 22:36:07 -05:00
Matteo Pagliazzi 507c1dd69a feat(i18n): add support for different chinese versions 2015-04-01 18:43:21 +02:00
Tyler Renelle e46789c303 feat(analytics): track cron count 2015-03-26 17:11:33 -04:00
Alys e9baafcbc8 Revert "Added Conditional Semantics to group member query to always include the user." 2015-03-26 19:54:51 +10:00
Alys ecaa1d31ac Merge pull request #4908 from TheHollidayInn/join-button-fix 
Added Conditional Semantics to group member query to always include the user.
 2015-03-26 18:53:01 +10:00
Matteo Pagliazzi de972eebc0 change email priority 2015-03-25 21:24:09 +01:00
Matteo Pagliazzi 488cd8852b move invites to quest to batch mode 2015-03-25 18:11:21 +01:00
Matteo Pagliazzi ab0c5106a1 move quest-started email to batch mode 2015-03-25 17:52:15 +01:00
Matteo Pagliazzi f470bcd1e1 add support for personal merge vars and move RECIPIENT_NAME to use them 2015-03-25 17:39:28 +01:00
Tyler Renelle 560d51b2e2 feat(tour): esc force closes, but puts justin head in toolbar. clicking 
justin head brings tour back.
 2015-03-24 15:41:44 -06:00
kholliday 23e7a8e258 Added check for user object to prevent errors 2015-03-24 08:54:45 -05:00
kholliday 1a725c0515 Added Conditional Semantics to group member query to always include the user 2015-03-23 15:17:21 -05:00
Tyler Renelle 1e8265a9f1 feat(tour): add the other tour entries @lemoness 2015-03-19 15:53:12 -06:00
Matteo Pagliazzi 92a6af72cf fix(emails): send emails to new fb users 2015-03-18 20:11:16 +01:00
Matteo Pagliazzi 75d1a766e5 chore(i18n): update locales 2015-03-18 19:37:26 +01:00
Matteo Pagliazzi 9e540e86af add email with optional message when kicking user from group 2015-03-18 19:12:53 +01:00
Tyler Renelle 2cf98daec4 feat(auth): temporarily back to nodemailer #4789 (cc @paglias) 2015-03-14 18:30:46 -06:00
Matteo Pagliazzi 5752f75c46 always allow reset password emails 2015-03-13 18:42:23 +01:00
Tyler Renelle 1687d9aeda feat(auth): 404 on "can't find email" 2015-03-11 18:12:30 -06: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 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
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
Blade Barringer 1629ca037b Did the _.isMember stuff the right way 2015-02-25 15:28:14 -06:00
Blade Barringer 30e158de48 Add _isMember attribute to groupSchema 2015-02-25 11:51:32 -06:00
Matteo Pagliazzi 45f2453a62 typo 2015-02-24 16:51:09 +01:00
Tyler Renelle 02901e52fd perf(auth): small register perf improvement. use $or in $regex query, 
intead of two queries, so if first operand true we short-circuit second operand
 2015-02-23 23:48:46 -07:00
Tyler Renelle 16c4c420bb chore(server): small updates to better support recent nodejs buildpack 2015-02-23 23:48:46 -07:00
Matteo Pagliazzi 4151b0733f add ability to unsubscribe from a single event using a dedicated link 2015-02-23 21:25:01 +01:00
Matteo Pagliazzi 6d38086b66 use profile name in emails for fb users 2015-02-20 18:17:54 +01:00
Matteo Pagliazzi 397a293ca8 change text for recapture emails settings 2015-02-20 18:15:47 +01:00
Matteo Pagliazzi 38af7ff3c1 emails: add optional reply_to_address variable 2015-02-18 19:31:02 +01:00
Blade Barringer 84ce4bb5d8 Corrected path to config.json 2015-02-13 09:45:18 -06:00
Blade Barringer 9dfd96b84f Moved and configured config.json to be in root of directory 2015-02-13 09:24:16 -06:00
Blade Barringer 477d3d6085 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-02-12 13:32:23 -06:00
Blade Barringer df5ff3d5a1 Downgraded coffeescript module to 1.6 2015-02-12 13:31:21 -06:00
Blade Barringer a6a0282c82 Corrected common image paths 2015-02-12 12:05:38 -06:00
Blade Barringer 8ac9dc3ced Merge branch 'develop' into common-convert 2015-02-10 16:27:46 -06:00
Blade Barringer 17032a4f13 Reverted changes back into website/src 2015-02-10 16:06:32 -06:00
Blade Barringer bf4f2299e2 Moved src to website/src (again) 2015-02-10 16:04:17 -06:00
Blade Barringer e243887563 Deleted website/src 2015-02-10 16:03:11 -06:00
Blade Barringer 75c9b5a978 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	src/controllers/groups.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/models/user.js
 2015-02-09 22:21:27 -06:00
Blade Barringer ac4dbf6eec Added /register. Required for newer version of coffee-script module 2015-02-09 13:37:30 -06:00