Blade Barringer
cea2879539
Merge branch 'mountmaster' of https://github.com/taldin/habitrpg into taldin-mountmaster
2014-12-11 08:15:18 -06:00
Matteo Pagliazzi
ce73a75133
feat(email): add new image for subscription email
2014-12-09 17:34:28 +01:00
Blade Barringer
5ac7f479d3
Added some spacing between icons and text on challenge/guild buttons
2014-12-07 21:03:09 -06:00
Blade Barringer
05c01ebd3c
Made glyphicons white on for challenge/guild join/leave buttons
2014-12-07 21:01:40 -06:00
Blade Barringer
60f3e0032e
Adjusted margin for markdown list in tast-text. Closes #2721
2014-12-06 16:41:59 -06:00
Blade Barringer
66f913e833
closes #4353 . If time on chat would break onto new line, just puts whole
...
time statment on new line
2014-12-05 23:51:07 -06:00
Blade Barringer
ea869a4487
Adjust trasnparent class of challenge buttons. Closes #4346
2014-12-05 15:13:34 -06:00
Sabe Jones
aa346c9271
Merge pull request #4328 from SabreCat/gems
...
Add available Gems counter to Market
2014-12-04 20:30:46 -06:00
Sabe Jones
c9b0898499
fix(style): help emoji line up with task text
...
Adds a `vertical-align` property to `span.emoji` so adding an emoji to a task doesn't cause it to bounce out of alignment with the rest of the task's text.
2014-12-04 16:32:00 -06:00
Blade Barringer
6b8a4f966b
Merge pull request #4321 from sbreiler/develop
...
Fix #2879 (Check-Icons)
2014-12-04 08:15:38 -06:00
Sabe Jones
ce8b6d2901
fix(style): Give room for badge
2014-12-03 22:22:21 -06:00
Tyler Renelle
3423e9857d
fix(gifts): $rootScope => Payments
2014-12-03 19:38:09 -07:00
Tyler Renelle
d2e230db1f
fix(plans): various bug fixes
2014-12-03 18:34:26 -07:00
Tyler Renelle
30c1ac4b1e
fix(plans): lots of bug fixes & cleanup
2014-12-03 16:01:57 -07:00
Tyler Renelle
0a53a5717e
refactor(payments): move payments into it's own service, out of rootCtrl
2014-12-03 14:17:08 -07:00
Tyler Renelle
0fffd66588
feat(plans): time travelers tab, 1 trinket to buy 1 set
2014-12-03 14:17:08 -07:00
Tyler Renelle
7f2b6b5cfb
feat(plans): allow block subscriptions from paypal/stripe
2014-12-03 14:17:07 -07:00
Tyler Renelle
5b01fff700
feat(gifts): allow gifting subscriptions
2014-12-03 14:17:07 -07:00
Tyler Renelle
e8dbd5ca1a
feat(gifts): allow gifting gems from paypal/stripe
2014-12-03 14:17:07 -07:00
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
Steffen Breiler
ffb073102f
Fix #2879 (Check-Icons)
...
IE11 shows checkmark in wierd position. It seems that IE does size the "checkmark" differently than firefox, which make them appear to be more to the right and bottom. I'm using glyphicons to fix that. The look is constistent in different browser. Though its kind of thicker than the original was.
2014-12-03 18:51:17 +01: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
