Blade Barringer
78cfbd2c6a
Revert btn-buy style change
2015-11-04 22:02:50 -06:00
Blade Barringer
3726f48ff2
chore(i18n): update locales
2015-11-04 21:57:16 -06:00
Sabe Jones
3a1862ecef
fix(static): Non-widgety App Store links
2015-11-04 22:42:10 -05:00
Blade Barringer
cde66d6167
Merge pull request #6183 from crookedneighbor/clientIdentifier
...
Client identifier
2015-11-04 20:03:31 -06:00
Blade Barringer
5a36d8e3f5
Switch to single quotes to conform to code style.
2015-11-04 18:03:50 -06:00
Blade Barringer
905e7b17ea
Refactor user model
2015-11-04 18:00:40 -06:00
Blade Barringer
797287a75c
Add and adjust tests for new register behavior.
2015-11-04 17:40:49 -06:00
Blade Barringer
8618716ca4
Update requester to take in additional set parameters.
2015-11-04 17:40:10 -06:00
Sabe Jones
de5d2df94c
fix(i18n): Add missing string
2015-11-04 16:04:51 -05:00
Sabe Jones
c61e49f5a7
Merge pull request #6182 from HabitRPG/sabrecat/apps-page
...
Apps page
2015-11-04 14:46:49 -06: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
Phillip Thelen
7f189bebba
disable tutorial/tour depending on client
2015-11-04 16:54:47 +01:00
Phillip Thelen
921ee881a5
Only create sample habits+dailies when registered through website
2015-11-04 16:41:13 +01:00
Phillip Thelen
e13c008076
send "habitica-web" as x-client header
2015-11-04 16:26:50 +01:00
Blade Barringer
a7f0a2a8ca
Merge pull request #6171 from crookedneighbor/flag_messages_in_api
...
Flag messages in api
2015-11-04 08:58:34 -06:00
Blade Barringer
269fd2a94f
Add test for admin flagging a message
2015-11-04 08:00:35 -06:00
Blade Barringer
799190a898
Merge branch 'develop' into flag_messages_in_api
2015-11-04 07:56:34 -06:00
Blade Barringer
6ed3ba36ae
Refactor task helper for unit and integration tests.
2015-11-03 21:21:16 -06:00
Sabe Jones
3691a59ddb
fix(front-page): Update registered user count
2015-11-03 12:30:54 -06:00
Sabe Jones
1fa15ba24a
Merge pull request #6167 from HabitRPG/sabrecat/content-201511
...
November backgrounds and Armoire
2015-11-03 11:58:51 -06:00
Blade Barringer
0923077f2f
Correct task.
2015-11-03 08:49:10 -06:00
Blade Barringer
b71f1f7862
Extract mocha function into taskHelper
2015-11-03 08:41:16 -06:00
Blade Barringer
8c95de0835
Move api tests to v2 namespace
2015-11-03 08:31:20 -06:00
Blade Barringer
1a68b5e9ee
Refactor and add tests to flagged messages.
2015-11-03 08:00:14 -06:00
Blade Barringer
24480e5f04
Merge branch 'develop' into srrvnn-develop
2015-11-03 07:31:48 -06:00
Blade Barringer
2713b0f26f
chore(i18n): update locales
2015-11-02 22:08:28 -06:00
Sabe Jones
6b3fcd3d11
fix(content): Correct stats for Royal Robes
...
...in newtype content file
2015-11-02 17:34:59 -05:00
Sabe Jones
510080325d
fix(content): Correct missing Armoire items
...
...in newstyle content files
2015-11-02 17:33:03 -05: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
Matteo Pagliazzi
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
Blade Barringer
6f3be77961
Add tests for flagged messages in get group object test
2015-11-02 07:46:21 -06:00
Blade Barringer
0894a3ea2d
Merge branch 'develop' into srrvnn-develop
2015-11-02 06:45:45 -06:00
Sabe Jones
9227dd89be
fix(event): Extend festival one day
2015-11-01 13:27:36 -06:00
Blade Barringer
da06e0736a
Adjust style of tests.
2015-10-31 21:37:44 -05:00
Blade Barringer
f84a10ee4e
Simplify delete user test
2015-10-31 21:37:17 -05:00
Blade Barringer
d5c346bf3f
Merge branch 'develop' into jeremyabbott-deleteusertestupdates
2015-10-31 21:27:16 -05:00
Jeremy Abbott
19128cf8f2
Fnished user in solo group tests
...
Also minor code cleanup in random files.
2015-10-31 16:19:50 -05:00
Sabe Jones
2e7006a0f7
chore(news): Burnout win Bailey
2015-10-31 16:03:34 -04:00
Blade Barringer
421b402948
Add helper to check the existence of a document
2015-10-31 10:55:28 -05:00
Blade Barringer
6a65711c2f
Close db connections in helpers
2015-10-31 10:55:17 -05:00
Alys
fa060bf6cd
revert a commit that went live prematurely when I was distracted - sorry for commit spam
2015-10-31 19:26:05 +09:00
Alys
559a2cea50
revert my stupid tavern quest hack because a server restart was all that was needed
2015-10-31 19:11:07 +09:00
Alys
fbb1f9aec5
create a nasty hack to get rid of the persistent Tavern quest exhaust sprites
2015-10-31 19:01:21 +09:00
Alys
8f21fb2419
set lastCron to current moment if the user's timezone has changed when they authenticate
2015-10-31 18:34:35 +09: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
4a9b0f1d12
Merge branch 'Thrashmandicoot-merchant-button-fix' into develop
2015-10-30 22:50:26 -05:00
