Commit Graph

492 Commits

Author SHA1 Message Date
Blade Barringer aafc1131ad Made message sent notification a translatable string 2014-11-23 21:39:14 -06:00
Tyler Renelle 1539c35d29 fix(private-messages): clear newMessages both when leaving and entering inbox 2014-11-21 08:34:08 -07:00
Tyler Renelle 31fdc866c3 fix(members): add a callback so members modal doesn't popup until after
member is fetched
2014-11-21 08:15:19 -07:00
Tyler Renelle f5415ac6c5 feat(private-messages): start implementing private messaging (includes blocking). Start experimenting with reflists for PMs, instead of arrays 2014-11-20 19:03:01 -07:00
Tyler Renelle cb3ebccbbf feat(invite-friends): obfuscated invite 2014-11-18 16:38:43 -08:00
Tyler Renelle 6ef838cf1a feat(webhooks): move webhooks from array to object (everything should
really be stored as objects). Add to API routes (see
HabitRPG/habitrpg-shared#83a22b8). Note, sorting doesn't work. Meh.
2014-11-16 20:03:56 -08:00
Tyler Renelle 21d6b71d37 Merge branch 'webhooks' into develop
Conflicts:
	src/controllers/user.js
2014-11-16 15:24:15 -08:00
Matteo Pagliazzi 45845228d0 fix(invite-friends): generate correct link on the client 2014-11-16 11:39:56 +01:00
Tyler Renelle 5fab3881a2 feat(invite-friends): allow specifying inveter's name (#4238 @lemoness) 2014-11-13 16:33:09 -07:00
Tyler Renelle 524e0514a1 feat(invite-friends): update wording on invitations. Add commented-out
sample code on copy-link (it's not working)
2014-11-13 12:57:04 -07:00
Tyler Renelle 2166321572 feat(invite-friends): add inviting friends via email. URL parsed, session holds invitation. If user joins party (new user or existing), the inviter is rewarded 2014-11-12 19:24:47 -07:00
Tyler Renelle 8f633e81db fix(sharing): add phantomjs buildpack to heroku (for pageres), proper use of nested nconf keys 2014-11-12 14:30:17 -07:00
Tyler Renelle 3a415a45a9 feat(sharing): add download link 2014-11-11 19:12:02 -07:00
Tyler Renelle 69da58503a feat(sharing): move avatar-sharing to herobox, use addthis instead of
custom solution. refactor from pages/* to export/*
2014-11-11 19:11:49 -07:00
Tyler Renelle cd2d861860 fet(analytics): track individually for cohort 2014-11-11 13:00:41 -07:00
Tyler Renelle 6304dd2e15 feat(auth): move to hello.js for social auth, paves the way for multiple
connectors. Prettier buttons via zocial
2014-11-06 14:45:06 -07:00
Tyler Renelle 8651f0da25 fix(facebook): move from passport-facebook to Facebook JS SDK. Better
security on FB login by validating accessToken. Create user from FB
profile if none exists, allows 3rd-party apps to. Fixes #4221
2014-11-05 18:23:10 -07:00
Tyler Renelle 9efaf39b2b feat(webhooks): add webhooks to user.preferences (API settings) so we can post to external services (eg, Beeminder) 2014-10-29 15:27:39 -06:00
Tyler Renelle d45f40ca1f refactor(tags): simplify with ui-keyup, see #4141 2014-10-29 14:28:09 -06:00
Tyler Renelle c3a62096ad Merge pull request #4141 from gjoyner/tags
Tags (filters) saves when pressing Enter instead of deleting
2014-10-29 14:27:21 -06:00
Tyler Renelle 8423de287e Merge pull request #4142 from gjoyner/tasks
Popovers now disappear when clicking Save & Close
2014-10-29 14:22:21 -06:00
Tyler Renelle d11dd852c5 Merge pull request #4144 from gjoyner/front
Front page's Forgot Password will report an invalid email address instead of simply errorring. Does NOT include updated locals/en/front.json
2014-10-29 14:19:38 -06:00
Alice Harris 7d817f1298 change Heroic to Guardian for non-staff moderators 2014-10-28 11:33:50 +10:00
Tyler Renelle b15e239601 Merge branch 'Alys-communityGuidelines' into develop 2014-10-27 16:20:30 -06:00
Alice Harris 5e89d07e07 add tabs to Habits (All, Yellow-Red, Green-Blue) and to rewards (All, Equipment & Skills) 2014-10-21 15:39:46 +10:00
Alice Harris 817e7b8686 replace original challenge fix with negue's suggestion 2014-10-17 19:37:35 +10:00
gjoyner 5e87b42af3 Front page's Forgot Password will report an invalid email address instead of simply errorring. Does NOT include updated locals/en/front.json 2014-10-13 23:47:34 -07:00
gjoyner 4ab19ac225 Popovers now disappear when clicking Save and Close 2014-10-13 14:10:59 -07:00
gjoyner feb55324ba Tags (filters) saves when pressing Enter instead of deleting the current tag 2014-10-13 01:57:59 -07:00
Tyler Renelle 56e2ec1bc4 Merge pull request #4140 from gjoyner/checklists
Adding checklist item drag and drop feature
2014-10-12 18:27:06 -06:00
Matteo Pagliazzi cd4626ec06 fix(moment): use new syntax, remove deprecation warning 2014-10-12 20:40:58 +02:00
gjoyner 9afbe42dbf Fixing indentions in taskCtrl.js 2014-10-12 03:15:28 -07:00
gjoyner 36bf09d984 Adding checklist item drag and drop feature 2014-10-12 01:48:51 -07:00
Alice Harris 13b12b830c allow a task to stay visible while being edited, regardless of other parameters 2014-10-10 22:14:43 +10:00
Alice Harris 43d2d1355e renamed Daily tabs to save space, removed To-Dos from new code because compled/all tabs were blank, decoupled To-Do code from Dailes code to allow future changes (e.g., "Dated" tab for To-Dos) 2014-10-09 20:04:03 +10:00
Bob Example c4a2e720fd Add ability to hide completed dailies.
While I was at it, I also did a bit of refactoring in general around the hiding
of completed todos/dailies.
2014-10-09 14:49:04 +10:00
Brian Chen 5809e52fe9 Make attribute referencing in notification logic more robust 2014-10-04 20:56:13 +08:00
Brian Chen 9ecbe9d48f Add unallocated attribute points notification
* Uses i18n "haveUnallocated" string, to come in another commit
2014-10-04 19:57:30 +08:00
Brian Chen 74be4b211b DRY-refactor notification display conditions
* Condense the different notification icons into one span with a
  dynamically selected ng-class.
* Move logic for determining which notification icon to show and whether
  there are no notifications into AuthCtrl.
* Refactor out the two similar sequences of logic conditions into a
  helper function.
2014-10-04 17:56:56 +08:00
Tyler Renelle e666d2f837 fix(spookDust): user serverside method for spookdust as it's path-protected 2014-10-03 00:33:39 -06:00
Tyler Renelle 0841cafd1f feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP 2014-10-02 23:18:13 -06:00
Tyler Renelle e759dbe951 Merge pull request #4045 from Verabird/guildreject
fixing guild reject error (issue #2886)-correcting syntax
2014-10-02 17:22:36 -06:00
Negue bf662ff119 fix rootCtrl.js ; forgot a comma while merging... 2014-10-01 20:53:29 +02:00
negue a595880568 Merge pull request #4044 from negue/apiUrlService
Use ApiUrlService in all services
2014-10-01 19:58:26 +02:00
Alice Harris ee325ce27f Merge pull request #4093 from deilann/release_pets
feat(pets): release pets
2014-10-01 06:35:36 +10:00
deilann 8427c53d90 release pets feature 2014-09-29 13:35:38 -07:00
Tyler Renelle efd17fe86b GA demographics 2014-09-26 13:45:01 -06:00
Negue 8f468c27ff use ApiUrlService instead of API_URL; fixed spacing in groupsCtrl.js 2014-09-16 20:52:32 +02:00
Alice Harris 6e33c237d3 Merge pull request #4022 from Alys/partyAvatarSortOrder
improve and clarify party avatar sort options for header - fixes https://github.com/HabitRPG/habitrpg/issues/2239
2014-09-16 14:15:01 +10:00
Vera Pavel 3b16206293 fixing guild reject error (issue #2886)-correcting syntax 2014-09-15 21:35:27 -04:00