 Sabe Jones
|
56fbc33d1c
|
Merge branch 'develop' into Move-Overview-To-Website
Conflicts:
website/src/routes/pages.js
|
2015-11-05 14:31:00 -05:00 |
|
|
Sabe Jones
|
18c2279be4
|
fix(overview): Wording and layout tweaks
|
2015-11-05 14:18:51 -05:00 |
|
|
Sabe Jones
|
bb55a74f48
|
chore(news): iOS update Bailey
Also fixes the color of the iOS app icon and codes it more intelligently.
|
2015-11-05 11:48:51 -05:00 |
|
|
Sabe Jones
|
3a1862ecef
|
fix(static): Non-widgety App Store links
|
2015-11-04 22:42:10 -05:00 |
|
|
Sabe Jones
|
df7e0236c2
|
fix(static): Improved /apps layout
|
2015-11-04 15:30:42 -05:00 |
|
|
Sabe Jones
|
8c4ecb8f6c
|
feat(static): Apps page
|
2015-11-04 13:35:31 -05:00 |
|
|
Blade Barringer
|
799190a898
|
Merge branch 'develop' into flag_messages_in_api
|
2015-11-04 07:56:34 -06:00 |
|
|
Amin Arria
|
6d93356967
|
Changed overview link
|
2015-11-03 22:56:47 -04:30 |
|
|
Amin Arria
|
5278a08c93
|
Added horizontal line
|
2015-11-03 22:32:23 -04:30 |
|
|
Amin Arria
|
7342735b1b
|
Fix error missing web in webStep
|
2015-11-03 22:18:41 -04:30 |
|
|
Amin Arria
|
f79110d6d2
|
Changed to be more like the FAQ
|
2015-11-03 22:03:24 -04:30 |
|
|
Amin Arria
|
167af1afd4
|
New static page: overview
|
2015-11-03 13:35:14 -04:30 |
|
|
Blade Barringer
|
24480e5f04
|
Merge branch 'develop' into srrvnn-develop
|
2015-11-03 07:31:48 -06:00 |
|
|
Sabe Jones
|
e74c83be2e
|
feat(content): November backgrounds and Armoire
|
2015-11-02 17:28:20 -05:00 |
|
|
Sabe Jones
|
2cb4e80019
|
chore(event): End Fall Festival
|
2015-11-02 12:55:48 -05:00 |
|
|
Blade Barringer
|
0894a3ea2d
|
Merge branch 'develop' into srrvnn-develop
|
2015-11-02 06:45:45 -06:00 |
|
|
Sabe Jones
|
2e7006a0f7
|
chore(news): Burnout win Bailey
|
2015-10-31 16:03:34 -04:00 |
|
|
Blade Barringer
|
c419ca8839
|
Merge pull request #6068 from AminArria/Wrong-max-level-messages
Wrong max level messages
|
2015-10-30 23:21:29 -05:00 |
|
|
Blade Barringer
|
2eb6cab2be
|
Merge pull request #6014 from ahstro/toggle-chevrons
Toggle chevron direction
|
2015-10-30 23:13:51 -05:00 |
|
|
Blade Barringer
|
add761e58e
|
Remove extraneous div
|
2015-10-30 23:05:19 -05:00 |
|
|
Blade Barringer
|
92271c2049
|
Clean up view for market.
|
2015-10-30 22:49:13 -05:00 |
|
|
Thrashmandicoot
|
76de8af848
|
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
|
2015-10-30 20:02:16 -07:00 |
|
|
Thrashmandicoot
|
1051ff0006
|
Fix inline-styling to be class styling
|
2015-10-30 20:01:22 -07:00 |
|
|
Sabe Jones
|
68660b3043
|
Merge pull request #6140 from HabitRPG/sabrecat/habitoween
WIP: Habitoween
|
2015-10-30 14:46:44 -05:00 |
|
|
Sabe Jones
|
dca0d7c3f3
|
fix(event): Keep NPCs burnt out
|
2015-10-30 15:36:17 -04:00 |
|
|
Thrashmandicoot
|
64ea4e42e7
|
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
|
2015-10-30 03:43:35 -07:00 |
|
|
Thrashmandicoot
|
0e52a62ad2
|
dynamic images for merchant, finishes refactor
|
2015-10-30 03:43:13 -07:00 |
|
|
Thrashmandicoot
|
e1b26a884c
|
Add display for selling items, needs right img
|
2015-10-30 02:27:36 -07:00 |
|
|
Sabe Jones
|
d3a6ff5b2d
|
fix(front-page): Remove extra script tag
Why did I even do that?
|
2015-10-29 17:07:41 -04:00 |
|
|
Sabe Jones
|
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 |
|
|
Blade Barringer
|
dd09633d31
|
Merge branch 'locks-auto-equip' into develop
|
2015-10-29 12:25:18 -05:00 |
|
|
Blade Barringer
|
68fabbf56f
|
Update names
|
2015-10-29 08:07:06 -05:00 |
|
|
Amin Arria
|
bd230df0d3
|
Added rebirthLevel var to remove need of extra translation string
|
2015-10-28 14:33:45 -04:30 |
|
|
Blade Barringer
|
cdc58c78fd
|
Merge branch 'nicolevonvon-develop' into develop
|
2015-10-27 20:19:09 -05:00 |
|
|
Blade Barringer
|
c812c0ae90
|
Add popover to no owner label
|
2015-10-27 20:18:39 -05:00 |
|
|
nicolevonvon
|
47ec2e1f93
|
Challenges now display'no owner' if original owner deletes account
|
2015-10-27 22:15:19 +02:00 |
|
|
Alys
|
1cc7ea872f
|
chore(news): Exhaust Strike Bailey - recommiting after temporary removal
|
2015-10-27 19:18:05 +10:00 |
|
|
Alys
|
23059763eb
|
revert Exhaust Strike Bailey change (commit f5d6c92897) to allow urgent deployment
|
2015-10-27 18:45:30 +10:00 |
|
|
Sabe Jones
|
f5d6c92897
|
chore(news): Exhaust Strike Bailey
|
2015-10-27 00:24:11 -04:00 |
|
|
Blade Barringer
|
c04b27ffd5
|
Simplify community guidelines string
|
2015-10-26 18:08:45 -05:00 |
|
|
Blade Barringer
|
f0e4149adb
|
Merge branch 'develop' into ksami-develop
|
2015-10-26 17:56:05 -05:00 |
|
|
Blade Barringer
|
4dd368a028
|
Merge pull request #6082 from anilanar/reroll-syntax-bug
fix a minor syntax error when opening reroll modal.
|
2015-10-26 17:55:16 -05:00 |
|
|
Sabe Jones
|
392889c7da
|
feat(mystery): October 2015 subscriber set
|
2015-10-23 15:45:43 -04:00 |
|
|
ksami
|
f2c856f6e6
|
Make link translatable in options/inventory/time-travelers
|
2015-10-23 23:40:11 +08:00 |
|
|
ksami
|
b3cc58886c
|
Make strings translatable in options/social/chat-box
|
2015-10-23 23:20:59 +08:00 |
|
|
Sabe Jones
|
bcc522f08d
|
feat(sharing): Add Tumblr button
|
2015-10-22 13:52:26 -04:00 |
|
|
Sabe Jones
|
d08a3efbcd
|
fix(news): Bogus trailing slash
|
2015-10-22 12:04:43 -05:00 |
|
|
Anil Anar
|
e269e04172
|
fix a minor syntax error when opening reroll modal.
|
2015-10-22 09:24:04 +02:00 |
|
|
Sabe Jones
|
9fb671f068
|
fix(social): Better share image
|
2015-10-21 16:25:03 -05:00 |
|
|
Sabe Jones
|
a2c0e02283
|
fix(social): Correct OG tag errors
|
2015-10-21 16:37:33 -04:00 |
|