Commit Graph

34 Commits

Author SHA1 Message Date
Matteo Pagliazzi 547e8a04f5 cleanup group model 2015-12-29 14:43:29 +01:00
Blade Barringer 65bb655a10 Merge branch 'develop' into api-v3 2015-12-13 16:39:59 -06:00
Alys cf01376f7d adjust forgot password text to specify that you must use the website - fixes https://github.com/HabitRPG/habitrpg-android/issues/170 2015-12-11 06:39:03 +10:00
Matteo Pagliazzi 5fa514b6fa Merge branch 'develop' into api-v3 2015-11-27 17:05:29 +01:00
Alys 431eaec71a add a missing full stop to a message and to the associated test 2015-11-24 14:11:01 +10:00
Matteo Pagliazzi b315d10c79 migrate utils to v3, uprade nodemailer 2015-11-14 17:43:56 +01:00
Matteo Pagliazzi cf4eb7c89b Merge pull request #6237 from HabitRPG/api-v3-firebase
port firebase lib to api v3
2015-11-14 13:14:50 +01:00
Matteo Pagliazzi d89b1cb60d port firebase lib to api v3 2015-11-14 02:50:58 +01:00
Blade Barringer be672e570c Merge branch 'api-v3' into api-v3-i18n 2015-11-13 07:44:48 -06:00
Blade Barringer 6e8e1648d9 Merge branch 'develop' into api-v3 2015-11-13 07:38:24 -06:00
Blade Barringer 27d3d9d296 Merge pull request #6229 from HabitRPG/emails
Adjust the way email invitations resolve.
2015-11-13 07:18:41 -06:00
Blade Barringer 565aaff976 Merge pull request #6219 from HabitRPG/js_ify_common
Js ify common
2015-11-13 06:49:54 -06:00
Blade Barringer e4679d6a63 Adjust the way email invitations resolve. 2015-11-12 18:58:01 -06:00
Blade Barringer 8e147d7b12 Allow users who register via facebook to see site tutorial. 2015-11-12 18:26:42 -06:00
Blade Barringer abe778836d Fixes #6225 2015-11-12 12:52:35 -06:00
Matteo Pagliazzi de21b72027 move old i18n version to api-v2 folder and use new i18n where possible 2015-11-12 16:43:02 +01:00
Blade Barringer 1e106b3c53 Move old webhooks to v2 lib 2015-11-12 09:08:36 -06:00
Blade Barringer 858bf99930 Move old logging lib v2 directory 2015-11-12 08:18:23 -06:00
Blade Barringer 9408effb4e Remove coffeescript dependency from website 2015-11-11 20:32:16 -06:00
Blade Barringer c5445dc426 Merge branch 'develop' into api-v3 2015-11-11 19:42:39 -06:00
Blade Barringer 43064dcf9a Wrap flag purcging code in check for flags object 2015-11-11 18:00:15 -06:00
Blade Barringer 13da95b552 Add tests for clearflags route 2015-11-11 17:58:41 -06:00
Sabe Jones 3672601999 fix(chat): Handle nonexistent message.flags 2015-11-11 16:25:36 -05:00
Blade Barringer 117a254cc8 Patch exploit that would allow users to auto-delete messages 2015-11-11 06:46:11 -06:00
Matteo Pagliazzi 249037b80f upgrade some deps, and remove unused qs module 2015-11-11 12:12:44 +01:00
Blade Barringer 1fc21167dc Send back flag data if user had flagged the message. 2015-11-10 08:15:54 -06:00
Matteo Pagliazzi ac7d3e642f port middlewares to authenticate users with headers and sessions 2015-11-07 15:37:38 +01:00
Blade Barringer eae9adfaec Merge branch 'develop' into api-v3 2015-11-04 20:25:05 -06:00
Blade Barringer cde66d6167 Merge pull request #6183 from crookedneighbor/clientIdentifier
Client identifier
2015-11-04 20:03:31 -06:00
Matteo Pagliazzi b21df9edb3 use node 4, npm 3, mongoose 4 and express 4 2015-11-04 18:26:38 +01:00
Phillip Thelen 921ee881a5 Only create sample habits+dailies when registered through website 2015-11-04 16:41:13 +01: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
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