75c25dc7a9
Rollback of /social/index.jade to reverse previous commits changes and return branch to upstream parity.
2015-07-01 10:13:10 -04:00
cbb0988679
Adds a space to social/index.jade to test development platform and git tracking.
2015-07-01 09:59:48 -04:00
851868296f
Merge branch 'Alys-guild-list-links-2015-06-28' into develop
2015-06-30 22:40:35 -05:00
a3f5f626a6
Put h3 and a on one line
2015-06-30 22:39:48 -05:00
ca36c5c632
Merge pull request #5531 from HabitRPG/paglias/amazon-payments
...
Amazon Payments Subscriptions
2015-07-01 01:40:27 +02:00
71d8fd2f0c
fix(analytics): Handle missing user object
2015-06-30 17:13:56 -05:00
3d15da61ec
fix(analytics): Correct user ID handling
2015-06-30 16:52:18 -05:00
46a7591492
Merge branch 'release-june-30th-2015' into develop
2015-06-30 13:39:51 -05:00
f88c5fb8b5
chore(news): June 30 Bailey
2015-06-30 12:35:16 -05:00
65f4aac23c
feat(amazon-payments): working subscriptions, put donations and gifts on hold
2015-06-30 17:59:30 +02:00
8747cf4cce
fix(amazon-oayments): use production url
2015-06-30 17:59:30 +02:00
dbce6f7676
fix(amazon-payments): use right url in production
2015-06-30 17:59:30 +02:00
271245f1e6
feat(amazon-payments): finalize one time purchases
2015-06-30 17:59:30 +02:00
78cca423f0
feat(amazon-payments): completely refactor client side flow, support subscription widgets WIP
2015-06-30 17:59:30 +02:00
e38f8bf4ef
amazon payments: wip
2015-06-30 17:59:30 +02:00
a377501f64
feat(amazon-payments): wip on donations
2015-06-30 17:59:30 +02:00
6faef6f737
wip amazon payments
2015-06-30 17:59:30 +02:00
b0643e7177
WIP: start working on amazon payments
2015-06-30 17:59:30 +02:00
4304e56e70
Merge pull request #5511 from Alys/use-costume-explanation-2015-06-28
...
make costume option more noticeable and understandable
2015-06-29 19:25:44 -05:00
547523c8f7
Merge branch 'crookedneighbor-blade-refactor-clone-challenges' into release-june-30th-2015
2015-06-29 17:56:42 -05:00
bc837fd4db
Moved menu stuff to own controller
2015-06-29 12:39:05 -05:00
567ed1f28b
Correct seenMessage use in menu
...
Closes #5519
2015-06-29 08:58:51 -05:00
522181890e
Added additional check for chatChanged
2015-06-29 08:13:03 -05:00
a946f2b5a5
rename "show more/less" locale keys to be generic; change to those keys for Use Costume text and Custom Day Start text; move Use Costume "show less" link to bottom of section
2015-06-29 21:49:54 +10:00
03d1f12a7c
fix isOnQuest function to correctly check for quest being active - fixes https://github.com/HabitRPG/habitrpg/issues/5518
2015-06-29 19:42:22 +10:00
b72b14fe6c
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-28 21:07:32 -05:00
11396d4756
make costume option more noticeable and understandable - fixes https://github.com/HabitRPG/habitrpg/issues/5204
2015-06-28 19:40:39 +10:00
b5ca45a713
convert name of guild to link to guild in index list of public guilds
2015-06-28 15:35:37 +10:00
5f29e19aa7
Merge pull request #5452 from gisikw/isolate-directives
...
Encapsulate directive functions in anonymous functions
2015-06-27 22:33:29 -05:00
bcf141840d
Merge branch 'TheHollidayInn-tasks-search-checklists' into develop
2015-06-27 22:23:08 -05:00
4abd7f85f8
Adjustments to PR#5494
...
* Update filter name to be more accurate
* Add additional tests
* Simplify checklist checking logic
* Prevent errors from multiple matches in checklist
2015-06-27 22:21:50 -05:00
5c4732304a
Merge pull request #5504 from Alys/cid-2015-06-25
...
prevent challenge tasks being deleted when challenge ID has been lost
2015-06-27 17:07:10 -05:00
3262c2d869
Refactored avatar
2015-06-27 16:08:38 -05:00
9f70598d64
Fix comment typo
2015-06-27 12:40:53 -04:00
76a0bf48f2
Fix typo
2015-06-27 12:33:04 -04:00
7616c6d224
Fixed ng-class syntax
2015-06-27 12:16:43 -04:00
4ba82f80da
Added mixin to reduce code duplication
2015-06-27 12:12:01 -04:00
6d11de8769
Correct missing one
2015-06-27 10:07:14 -05:00
7d92b39790
Correct usage of ng-class
2015-06-27 09:57:59 -05:00
0fc14f129d
prevent challenge tasks being deleted when challenge ID (cid) has been lost - possible fix for https://github.com/HabitRPG/habitrpg/issues/4466
2015-06-27 14:19:40 +10:00
01b3df17af
Changed all double-spans in avatar.jade to single spans used ternary operators
2015-06-26 17:15:04 -04:00
8ba621795a
Task filter now searches checklists
2015-06-25 22:33:08 -05:00
07541ea7e4
Merge branch 'TheHollidayInn-settings-unsubscribe-email-checkall-fix' into develop
2015-06-25 20:51:19 -05:00
08c7ca1833
Refactor email notifications
2015-06-25 20:49:38 -05:00
f9ee0657f6
Merge pull request #5493 from gisikw/temporarily-disable-nr
...
Disable NR to check memory issues
2015-06-25 19:42:31 -04:00
e93cb817be
Disable NR to check memory issues
2015-06-25 19:21:45 -04:00
775f903c3d
feat(events): Limited edition
...
Summer Splash skins and June mystery item. Also announces the Gokul sound theme.
2015-06-25 11:19:01 -05:00
81a05230e7
Uncheck all email notication options when we click unsubscribe all
2015-06-24 21:38:02 -05:00
ac7c1a1436
Merge pull request #5474 from hairlessbear/show_selected_food
...
Added selectableInventory class to selected food on Pets page
2015-06-24 08:29:03 -05:00
01755a6d98
setTimeout all the analytics stuff
2015-06-24 03:23:48 -04:00
Alexander Bragdon