02abee9f4e
fix(sharing): Landing page tweaks
2015-11-03 16:16:17 -05:00
0260ea3fcd
WIP(sharing): Draft functional landing page
2015-11-03 15:04:31 -05:00
502e7f0af2
Merge branch 'develop' into sabrecat/more-modals
2015-11-03 14:29:23 -05:00
1fa15ba24a
Merge pull request #6167 from HabitRPG/sabrecat/content-201511
...
November backgrounds and Armoire
2015-11-03 11:58:51 -06:00
2713b0f26f
chore(i18n): update locales
2015-11-02 22:08:28 -06:00
6b3fcd3d11
fix(content): Correct stats for Royal Robes
...
...in newtype content file
2015-11-02 17:34:59 -05:00
510080325d
fix(content): Correct missing Armoire items
...
...in newstyle content files
2015-11-02 17:33:03 -05:00
e74c83be2e
feat(content): November backgrounds and Armoire
2015-11-02 17:28:20 -05:00
2cb4e80019
chore(event): End Fall Festival
2015-11-02 12:55:48 -05:00
9227dd89be
fix(event): Extend festival one day
2015-11-01 13:27:36 -06:00
fa060bf6cd
revert a commit that went live prematurely when I was distracted - sorry for commit spam
2015-10-31 19:26:05 +09:00
8f21fb2419
set lastCron to current moment if the user's timezone has changed when they authenticate
2015-10-31 18:34:35 +09:00
c419ca8839
Merge pull request #6068 from AminArria/Wrong-max-level-messages
...
Wrong max level messages
2015-10-30 23:21:29 -05:00
4a9b0f1d12
Merge branch 'Thrashmandicoot-merchant-button-fix' into develop
2015-10-30 22:50:26 -05:00
898850fd6e
Adjust wording of market message.
2015-10-30 22:50:04 -05:00
391e09dd33
Fix auto-redirect
2015-10-30 22:28:11 -05:00
76de8af848
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
2015-10-30 20:02:16 -07:00
154fcb4f8c
make daysMissed have a negative value for a lastCron in the future so that setting your PC time backwards doesn't trigger cron
2015-10-31 13:00:42 +10:00
34c51fc710
revert recent cron change (better code incoming; what WAS I thinking)
2015-10-31 10:59:41 +10:00
0c5e520e6f
WIP(sharing): Incomplete landing page
...
First stab at creating landing pages for inbound social traffic. May need a different solution.
2015-10-30 17:35:30 -04:00
5d3f41637f
Merge branch 'develop' into sabrecat/more-modals
2015-10-30 16:33:17 -04:00
ad6fbef85c
Move chat tests to new infrastructure
2015-10-30 14:47:14 -05:00
68660b3043
Merge pull request #6140 from HabitRPG/sabrecat/habitoween
...
WIP: Habitoween
2015-10-30 14:46:44 -05:00
dca0d7c3f3
fix(event): Keep NPCs burnt out
2015-10-30 15:36:17 -04:00
161069cfec
prevent cron running if the lastCron date is in the future
2015-10-31 04:12:43 +10:00
724bc6e861
Compiled css for sprites
2015-10-30 10:10:12 -05:00
e8fa22bf93
chore(i18n): update locales
2015-10-30 09:25:43 -05:00
aa111b3c1a
Update tests to assert against translation strings
2015-10-30 09:01:57 -05:00
64ea4e42e7
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
2015-10-30 03:43:35 -07:00
ebbc72e9c2
Refactor sellForGold, add displayPotion/item
2015-10-30 02:26:41 -07:00
1923a3a467
change on-hover text for Mystery Item gift box to just mention wiki page
2015-10-30 06:59:54 +10:00
11ae4a9b87
change on-hover text for Mystery Item gift box to link to wiki page and remove statement about finding exact date on wiki
2015-10-30 06:30:11 +10:00
27d1e9c788
feat(event): Habitoween
...
Swaps out basic fall costume NPCs for their Halloween versions. Removes "broken" NPC sprites not needed after World Boss.
2015-10-29 14:15:18 -04:00
dd09633d31
Merge branch 'locks-auto-equip' into develop
2015-10-29 12:25:18 -05:00
6ff904bd5a
Merge branch 'develop' into czan-develop
2015-10-29 08:40:03 -05:00
f4ea6c1d5d
feat(sharing): Opt Out WIP
...
First draft of support for opting out of future modal display on specific events, and adds the second barebones target page for sharing.
2015-10-28 16:36:47 -04:00
bd230df0d3
Added rebirthLevel var to remove need of extra translation string
2015-10-28 14:33:45 -04:30
27e3797307
Merge branch 'develop' into sabrecat/more-modals
...
Conflicts:
common/locales/en/challenge.json
2015-10-28 14:54:55 -04:00
01373882c6
make error notification persistent, change text and make it translatable
2015-10-28 19:42:26 +01:00
5754b4f72a
chore(i18n): update locales
2015-10-27 21:38:23 -05:00
1a6b1f2a1c
Update string
2015-10-27 21:36:52 -05:00
b82054128d
chore(i18n): update locales
2015-10-27 21:36:51 -05:00
711413f832
Update string
2015-10-27 21:28:33 -05:00
cdc58c78fd
Merge branch 'nicolevonvon-develop' into develop
2015-10-27 20:19:09 -05:00
c812c0ae90
Add popover to no owner label
2015-10-27 20:18:39 -05:00
47ec2e1f93
Challenges now display'no owner' if original owner deletes account
2015-10-27 22:15:19 +02:00
4d6bd38648
Add GET routes for /user/tags and /user/tags/{id}
...
An operation that is useful for tools to be able to do is to list a
user's tags without having to pull down the entire user object (which is
likely significantly larger than the tags). This commit adds a route to
GET /user/tags, to get a list of the user's tags, as well as a GET
/user/tags/{id} to get the details of a particular tag.
This commit also includes tests for the two new routes.
2015-10-27 13:49:17 +11:00
c04b27ffd5
Simplify community guidelines string
2015-10-26 18:08:45 -05:00
f0e4149adb
Merge branch 'develop' into ksami-develop
2015-10-26 17:56:05 -05:00
2df6df2bee
Merge pull request #6091 from HabitRPG/sabrecat/mystery-201510
...
October 2015 Subscriber Items
2015-10-26 15:04:43 -05:00
Sabe Jones