e95837f69f
Merge branch 'develop' into api-v3
2016-04-02 11:34:04 +02:00
0ba47de43d
adjust cron so that it prevents a double cron when timezone decreases (timezoneOffset increases)
...
* start to fix cron for when timezones change
* add some incomplete code
* change cron to identify when timezone changes and run only if both zones agree it should run - BAD - does cron an hour early one day later
* change timezone offset variable names
* improve handling of each individual timezone change possibility
* remove unnecessary casting to number
* remove duplicated code
* finish code for dangerous timezone change
* fix linting errors
* remove console.log lines and other testing code
* add a TODO comment for further actions for timezone changes in the "safe" direction
2016-04-02 11:42:15 +10:00
3089658cc7
Merge branch 'develop' into api-v3
2016-03-30 23:40:00 +02:00
a9d227b490
Merge branch 'develop' into wheelchair
2016-03-28 21:12:52 -05:00
02a60d90d8
Merge branch 'develop' into api-v3
2016-03-28 16:02:04 -05:00
f4b43f55f0
refactor: Remove express-csv dependency
2016-03-28 10:24:29 -05:00
b1c3b8e7e7
chore: Update res.json(code, json) to res.status(code).json(json)
2016-03-28 10:24:00 -05:00
cf8153fd93
chore: Update res.send(code) to res.sendStatus(code)
2016-03-28 10:24:00 -05:00
d89d1e50dd
Merge branch 'develop' into api-v3
2016-03-25 15:58:04 +01:00
0f9cf57613
feat: Add wheelchair to avatar customization
2016-03-24 07:57:13 -05:00
f5d4eba292
fix: Default message to '' when not passed in sendGift route
2016-03-22 21:49:27 -05:00
eaea55687b
Make change regarding pluralization of gem gift message easier to read and not one long line
2016-03-22 21:49:27 -05:00
369386e370
Only add an 's' to months of subscription or gems given if they are not 1.
2016-03-22 21:49:22 -05:00
0bde9e2df2
Merge branch 'develop' into api-v3
2016-03-21 23:03:28 +01:00
fb338a00cb
prevent quests being started in guilds
2016-03-18 08:38:32 +10:00
fbdbd8e006
Merge branch 'develop' into api-v3
2016-03-10 18:30:09 +01:00
cc53e6e9dc
Merge pull request #6733 from vIiRuS/mobileStorage
...
Store data for next mobile update
2016-03-09 14:56:15 -06:00
36790592c6
add tests for improvement categories
2016-03-06 17:56:51 +01:00
8920b05f9e
Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3
2016-03-02 12:59:51 +01:00
f69a29c152
improve group invitation code and tests
2016-03-02 09:26:55 +10:00
b4f7625d93
Merge branch 'develop' into api-v3-session-invite
2016-02-27 12:04:39 +01:00
cc5f794f3d
prevent party inviter's email address being used as a Reply-To
2016-02-27 18:48:41 +10:00
91be89e05a
Merge pull request #6735 from HabitRPG/api-v3-dataexport
...
[API v3] Data export
2016-02-20 21:17:32 +01:00
fb343f8feb
port push notifications in api v3
2016-02-19 20:34:55 +01:00
192c57fa85
re-add removed code for dataexport.history
2016-02-19 12:16:09 +01:00
a6db8e693f
refactor dataexport controller
2016-02-19 12:13:48 +01:00
28c6c27b78
Merge branch 'develop' into api-v3
2016-02-14 13:03:29 +01:00
8e8c28725a
Add avatar customizations to content API
2016-01-25 21:59:13 -06:00
4afad11067
Merge branch 'api-v3' into api-v3-groups
2016-01-13 18:41:27 +01:00
771bc0c5b5
put back acceptablePUTPaths variable deleted in merge
2016-01-13 18:41:09 +01:00
e2edb974d7
Merge branch 'api-v3' into api-v3-groups
2016-01-13 18:40:04 +01:00
914b2eb008
Merge branch 'develop' into api-v3
2016-01-13 18:39:44 +01:00
f83b271b30
rever new history preening
2016-01-13 11:07:52 +01:00
5244702e48
perf improvements for challenges history and migration
2016-01-11 18:29:39 +01:00
b1a7e44722
fixes for new history preening, allow only 1 history entry per day in challenges tasks
2016-01-09 21:02:40 +01:00
ae852f9a2e
complete preening and enable for challenges too
2016-01-08 17:47:08 +01:00
874f319d95
fix: Corrects logic where it was possible to customize avatar
...
with gem purchasable items without purchasing them.
Closes #6427
Closes #6448
lint(common): Add unnecessary quotes to make object look less weird
2016-01-03 10:41:44 -06:00
547e8a04f5
cleanup group model
2015-12-29 14:43:29 +01:00
65bb655a10
Merge branch 'develop' into api-v3
2015-12-13 16:39:59 -06:00
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
5fa514b6fa
Merge branch 'develop' into api-v3
2015-11-27 17:05:29 +01:00
431eaec71a
add a missing full stop to a message and to the associated test
2015-11-24 14:11:01 +10:00
b315d10c79
migrate utils to v3, uprade nodemailer
2015-11-14 17:43:56 +01:00
cf4eb7c89b
Merge pull request #6237 from HabitRPG/api-v3-firebase
...
port firebase lib to api v3
2015-11-14 13:14:50 +01:00
d89b1cb60d
port firebase lib to api v3
2015-11-14 02:50:58 +01:00
be672e570c
Merge branch 'api-v3' into api-v3-i18n
2015-11-13 07:44:48 -06:00
6e8e1648d9
Merge branch 'develop' into api-v3
2015-11-13 07:38:24 -06:00
27d3d9d296
Merge pull request #6229 from HabitRPG/emails
...
Adjust the way email invitations resolve.
2015-11-13 07:18:41 -06:00
565aaff976
Merge pull request #6219 from HabitRPG/js_ify_common
...
Js ify common
2015-11-13 06:49:54 -06:00
e4679d6a63
Adjust the way email invitations resolve.
2015-11-12 18:58:01 -06:00
Matteo Pagliazzi