Commit graph

1058 commits

Author SHA1 Message Date
Tyler Renelle
7e9b92fcad feat(gifts): allow gifting from balance 2014-12-03 14:17:07 -07:00
Tyler Renelle
66b4dae0d9 feat(news): move old news to /static/old-news, better use of content space 2014-12-03 13:49:24 -07:00
benmanley
073b338bde fix(tasks): stop reward values overflowing
Fixes #1993

* Restyle reward cost area to fit three digit rewards into default view
* Apply custom styles to rewards with higher values to prevent them
from overflowing
2014-12-03 15:40:08 +00:00
Blade Barringer
8794adde69 Updated function to go to correct options pane. Closes # 4319 2014-12-03 08:01:23 -06:00
benmanley
9c2c08c03d fix(.task-filter): force long words to wrap
Fixes #4308 Task tabs cut off long words

Prevents long words from overflowing outside of tab width in button
bars by forcing them to break.
2014-12-01 13:31:15 +00:00
Blade Barringer
0c675f704b Simplified styles for locked and unlocked backgrounds 2014-11-30 18:57:01 -06:00
Blade Barringer
632d0fdf5d Merge pull request #4299 from pollockjj/develop
Solution for: Differentiate Locked and Unlocked Backgrounds (#4261)
2014-11-30 18:41:51 -06:00
pollockjj
6520caed7d Modified to 15px border and lock icon based on feedback from dev team 2014-11-29 21:56:10 -06:00
pollockjj
1a567ce82f Changes to address github ticket: Differentiate Locked and Unlocked Backgrounds (#4261). Added two new background-specific styles to customizer.styl and utilized them in profile.jade by checking for ownership of the asset and displaying a border or not, as appropriate 2014-11-29 12:25:21 -06:00
benmanley
50b1cba0a6 refactor(tasks) improve UI consistency
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
2014-11-27 10:32:57 +00: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
ebebcea34b fix(webhooks): sort webhooks by created, use angular-filter for sorting object 2014-11-19 15:42:14 -08:00
Tyler Renelle
2023cf852e chore(bower): upgrade angular to 1.3.3. Remove
bindonce (incompatible). Note, bindonce="..." attrs still need to be
converted to their {{::}} equiv for better performance, but this is
functional for now
2014-11-19 14:32:45 -08: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
15f318ccc2 feat(sharing): screw it, social links + img + text aint working, just
redirect to homepage + show member modal
2014-11-11 19:12:02 -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
Alice Harris
b79118c976 fix decapitated mount head 2014-11-02 18:54:33 +10:00
Alice Harris
0963f0fc0a Merge pull request #4114 from Alys/lynnyliz-develop
changes made by lynnyliz to reorganise the mounts page (with fixes for merge conflicts, etc)
2014-11-01 10:25:38 +10: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
Tyler Renelle
5d67995458 Merge pull request #4177 from holyspecter/challenge-action-bacground-bug
Minor bug: In challenges area, Join button has a yellow background
2014-10-27 13:58:26 -06:00
Tyler Renelle
b5fe46155b Merge pull request #4188 from tylerdmace/develop
removed broken img tag and added quotes to malformed a tags
2014-10-27 13:57:49 -06:00
Tyler Mace
5a4aee90ed removed broken img tag and added quotes to malformed a tags 2014-10-26 06:14:31 -06:00
hospect
76de909683 Minor bug: In challenges area, Join button has a yellow background 2014-10-22 01:45:37 +03: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
739e7d3d76 Merge pull request #4157 from crookedneighbor/add-setting-for-due-view
Added setting for making the due tab default on dailies
2014-10-20 05:34:40 +10:00
Matteo Pagliazzi
b1fc435c9a feat(emails): add new images 2014-10-19 17:02:25 +02:00
Alice Harris
d8ff2b6181 Merge pull request #4155 from crookedneighbor/fix-bootstrap-width-errors
Changed margin .row under .container-fluid to match padding
2014-10-19 18:44:39 +10:00
Matteo Pagliazzi
31d0c970fe Merge pull request #4159 from crookedneighbor/update-landing-page-img
Set tags to default tags
2014-10-17 17:17:12 +02:00
Blade Barringer
40585bf977 Set tags to default tags 2014-10-17 09:46:11 -05:00
Alice Harris
817e7b8686 replace original challenge fix with negue's suggestion 2014-10-17 19:37:35 +10:00
Blade Barringer
ed15d0b1c7 Added setting for making the due tab default on dailies 2014-10-16 21:04:23 -05:00