8c4ecb8f6c
feat(static): Apps page
2015-11-04 13:35:31 -05:00
7f189bebba
disable tutorial/tour depending on client
2015-11-04 16:54:47 +01:00
921ee881a5
Only create sample habits+dailies when registered through website
2015-11-04 16:41:13 +01:00
e13c008076
send "habitica-web" as x-client header
2015-11-04 16:26:50 +01:00
799190a898
Merge branch 'develop' into flag_messages_in_api
2015-11-04 07:56:34 -06:00
6d93356967
Changed overview link
2015-11-03 22:56:47 -04:30
5278a08c93
Added horizontal line
2015-11-03 22:32:23 -04:30
7342735b1b
Fix error missing web in webStep
2015-11-03 22:18:41 -04:30
f79110d6d2
Changed to be more like the FAQ
2015-11-03 22:03:24 -04:30
caa4170f12
fix(sharing): Wording tweaks
2015-11-03 17:19:57 -05:00
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
167af1afd4
New static page: overview
2015-11-03 13:35:14 -04:30
fa9b331f03
Created route for overview
2015-11-03 13:15:55 -04:30
1a68b5e9ee
Refactor and add tests to flagged messages.
2015-11-03 08:00:14 -06:00
24480e5f04
Merge branch 'develop' into srrvnn-develop
2015-11-03 07:31:48 -06: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
ed0e4c6d20
Reorganize files under /src, separate express app in two apps, one for api v1 and v2 and the other \
...
for the upcoming api v3
Reorganize files under /src, separate express app in two apps, one for api v1 and v2 and the other for the upcoming api v3
move api v2 routes in a separate folder, rename apiv1 file for better readability, remove auth routes for api v1
move api-v2 controllers in subdirectory
move unorganized files to /libs
fix gulp requires and separate server in old (api v1 and v2) and new (api v3) app
fix require paths
fix require paths
fix require paths
put api v1 back
Reorganize files under /src and separate express app in one for api v1 and v2 and the other for v3
2015-11-02 17:43:32 +01:00
0894a3ea2d
Merge branch 'develop' into srrvnn-develop
2015-11-02 06:45:45 -06:00
2e7006a0f7
chore(news): Burnout win Bailey
2015-10-31 16:03:34 -04:00
559a2cea50
revert my stupid tavern quest hack because a server restart was all that was needed
2015-10-31 19:11:07 +09:00
fbb1f9aec5
create a nasty hack to get rid of the persistent Tavern quest exhaust sprites
2015-10-31 19:01:21 +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
2eb6cab2be
Merge pull request #6014 from ahstro/toggle-chevrons
...
Toggle chevron direction
2015-10-30 23:13:51 -05:00
add761e58e
Remove extraneous div
2015-10-30 23:05:19 -05:00
92271c2049
Clean up view for market.
2015-10-30 22:49:13 -05:00
76de8af848
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
2015-10-30 20:02:16 -07:00
1051ff0006
Fix inline-styling to be class styling
2015-10-30 20:01:22 -07:00
c2222a42c7
Add 70% width styling for item sales
2015-10-30 20:01:06 -07:00
d37450622c
Create a social layout
2015-10-30 18:41:46 -05: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
47168cfdc1
Merge pull request #6145 from crookedneighbor/test_updates
...
Update Tests to test server error messages against translation strings
2015-10-30 09:21:49 -05:00
aa111b3c1a
Update tests to assert against translation strings
2015-10-30 09:01:57 -05:00
0131ba3e45
reert all the deps upgrades
2015-10-30 14:16:35 +01:00
413a06c8d3
disable newrelic
2015-10-30 13:34:18 +01:00
64ea4e42e7
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
2015-10-30 03:43:35 -07:00
0e52a62ad2
dynamic images for merchant, finishes refactor
2015-10-30 03:43:13 -07:00
e1b26a884c
Add display for selling items, needs right img
2015-10-30 02:27:36 -07:00
d3a6ff5b2d
fix(front-page): Remove extra script tag
...
Why did I even do that?
2015-10-29 17:07:41 -04:00
c28afc9abc
feat(sharing): Buttons for more modals
2015-10-29 16:33:27 -04:00
332df1d646
Merge pull request #6136 from HabitRPG/upgrade-stack
...
Upgrade stack
2015-10-29 19:28:51 +01: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
37d83fdade
mongoo 4 and new travis ci infrastructure
2015-10-29 16:35:02 +01:00
Sabe Jones