9408effb4e
Remove coffeescript dependency from website
2015-11-11 20:32:16 -06:00
6acd6460ea
Merge pull request #6218 from crookedneighbor/increase_code_coverage_for_clearflags_route
...
Increase code coverage for clearflags route
2015-11-11 18:49:37 -06:00
43064dcf9a
Wrap flag purcging code in check for flags object
2015-11-11 18:00:15 -06:00
13da95b552
Add tests for clearflags route
2015-11-11 17:58:41 -06:00
06a5a1cb95
Merge pull request #6042 from HabitRPG/sabrecat/more-modals
...
More and better modals; Social Media sharing
2015-11-11 17:32:43 -06:00
3672601999
fix(chat): Handle nonexistent message.flags
2015-11-11 16:25:36 -05:00
117a254cc8
Patch exploit that would allow users to auto-delete messages
2015-11-11 06:46:11 -06:00
1fc21167dc
Send back flag data if user had flagged the message.
2015-11-10 08:15:54 -06:00
eed4207c6d
Merge branch 'develop' into sabrecat/more-modals
...
Conflicts:
common/dist/sprites/spritesmith-largeSprites-0.png
common/locales/en/front.json
2015-11-09 16:24:17 -05:00
164309e050
feat(sharing): Streak Achievement
2015-11-06 16:54:23 -05:00
56fbc33d1c
Merge branch 'develop' into Move-Overview-To-Website
...
Conflicts:
website/src/routes/pages.js
2015-11-05 14:31:00 -05:00
4cbda6818c
Correct code to not iterate over mongoose object
2015-11-05 13:08:37 -06:00
cde66d6167
Merge pull request #6183 from crookedneighbor/clientIdentifier
...
Client identifier
2015-11-04 20:03:31 -06:00
905e7b17ea
Refactor user model
2015-11-04 18:00:40 -06:00
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
502e7f0af2
Merge branch 'develop' into sabrecat/more-modals
2015-11-03 14:29:23 -05:00
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
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
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
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
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
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
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
8ea69e90dd
enable new relic, node 4 and npm 3
2015-10-29 16:11:56 +01:00
92fc2683c6
fix(cluster): use for loop instead of _.times
2015-10-29 16:04:30 +01:00
f9ab04e4f9
upgrade to express 4.x
...
cleanup package.json
put errorHandler middleware as the last one
use accepts module instead of req.acceptedLanguages
use normal object notation as it is supported is es5
remove deprecations from auth controller
remove deprecations from groups controller
Revert "remove deprecations from groups controller"
This reverts commit 7cf36295ebbc50c1f2b210a8ab447d7f2c41dba9.
Revert "remove deprecations from auth controller"
This reverts commit deecd701e0551862ba53ea894f2d87a746384fed.
request limit upped to 1mb and 10k chars for query parameters
Upgrade to Express 4.x
2015-10-29 15:59:45 +01:00
6ff904bd5a
Merge branch 'develop' into czan-develop
2015-10-29 08:40:03 -05:00
22caaa7eda
feat(sharing): More opt outs
...
Also fixes a bug where "Display Now" didn't work for pets with a space in their name.
2015-10-28 17:48:16 -04:00
f4ea6c1d5d
feat(sharing): Opt Out WIP
...
First draft of support for opting out of future modal display on specific events, and adds the second barebones target page for sharing.
2015-10-28 16:36:47 -04:00
27e3797307
Merge branch 'develop' into sabrecat/more-modals
...
Conflicts:
common/locales/en/challenge.json
2015-10-28 14:54:55 -04:00
7205ac689d
Merge pull request #6114 from kylestratis/issue-5542a
...
Issue 5542a - remove FIXME comment from invitations section in user model
2015-10-28 06:45:50 -05:00
b70597e1d1
Merge pull request #6122 from crookedneighbor/batch_update_adjustment
...
Batch update adjustment
2015-10-27 21:35:19 -05:00
ed464a2b70
Merge pull request #6127 from crookedneighbor/reinstate_amplitude
...
Reinstate amplitude
2015-10-27 21:35:10 -05:00
0283408d1e
Removed FIXME comment above invitations object - the object is still being used.
2015-10-27 21:12:19 -04:00
a7c52e6086
Reinstate amplitude analytics
2015-10-27 19:37:57 -05:00
3bae95d3ae
remove console.log for push notifications
2015-10-27 22:11:47 +01:00
7541c5a260
fix(analytics): disable amplitude
2015-10-27 17:59:29 +01:00
d05b00fb34
fix(analytics): enable analytics and correctly export methods
2015-10-27 17:39:37 +01:00
Blade Barringer