Commit Graph

11721 Commits

Author SHA1 Message Date
Alys 67a291f03d migration script for setting flags.tutorial.ios 2015-11-05 18:13:55 +10:00
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
Amin Arria 6d93356967 Changed overview link 2015-11-03 22:56:47 -04:30
Blade Barringer 6ed3ba36ae Refactor task helper for unit and integration tests. 2015-11-03 21:21:16 -06:00
Amin Arria 8611c00201 Added links 2015-11-03 22:38:55 -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
Sabe Jones caa4170f12 fix(sharing): Wording tweaks 2015-11-03 17:19:57 -05:00
Sabe Jones 02abee9f4e fix(sharing): Landing page tweaks 2015-11-03 16:16:17 -05:00
Sabe Jones 0260ea3fcd WIP(sharing): Draft functional landing page 2015-11-03 15:04:31 -05:00
Sabe Jones 502e7f0af2 Merge branch 'develop' into sabrecat/more-modals 2015-11-03 14:29:23 -05:00
Sabe Jones 3691a59ddb fix(front-page): Update registered user count 2015-11-03 12:30:54 -06:00
Amin Arria 0947a5be73 Ignorado sublime 2015-11-03 13:36:24 -04:30
Amin Arria 167af1afd4 New static page: overview 2015-11-03 13:35:14 -04:30
Sabe Jones 1fa15ba24a Merge pull request #6167 from HabitRPG/sabrecat/content-201511
November backgrounds and Armoire
2015-11-03 11:58:51 -06:00
Amin Arria fa9b331f03 Created route for overview 2015-11-03 13:15:55 -04:30
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