81fa689a11
Merge pull request #7042 from TheHollidayInn/api-v3-ops-reroll
...
Ported reroll. Added unit tests. Added reroll route. Added integration tests
2016-04-09 15:14:04 +02:00
fd1f42af24
Merge pull request #7047 from HabitRPG/merge_in_develop
...
[v3] Merge in develop
2016-04-08 22:19:53 -05:00
1ab78f1c9a
refactor: Port v2 flag report change to v3
2016-04-08 21:49:16 -05:00
60f99a29ed
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-04-08 21:31:53 -05:00
8a42a3a51e
Merge branch 'develop' into api-v3
2016-04-08 21:31:41 -05:00
e6b5a6820f
Merge pull request #7044 from HabitRPG/flag_email_refactor
...
refactor: Simplify flag_report_email load
2016-04-08 17:31:13 -05:00
2bbae8c5f5
refactor: Simplify flag_report_email load
2016-04-08 17:14:14 -05:00
b7d801a603
fix(news): typo
2016-04-08 16:17:51 -05:00
1685b7285f
Ported reroll. Added unit tests. Added reroll route. Added integration tests
2016-04-08 15:56:11 -05:00
7118e68cf0
chore(news): Beguilement Strike Bailey
2016-04-08 19:06:09 +00:00
116839ca81
Merge pull request #7018 from piousbox/shared-code-webhooks
...
Shared code webhooks
2016-04-08 11:04:57 +02:00
9704c47293
Merge branch 'api-v3' into shared-code-webhooks
2016-04-07 21:23:38 +00:00
4c0f9ed1c8
resolving conflicts
2016-04-07 21:23:16 +00:00
4d28eea6e2
Merge pull request #7037 from TheHollidayInn/api-v3-ops-rebirth
...
Ported rebirth. Add unit tests. Added rebirth route. Added integration tests
2016-04-07 23:18:15 +02:00
fec9ce3dbe
Ported rebirth. Add unit tests. Added rebirth route. Added integration tests
2016-04-07 15:02:55 -05:00
12255181d8
Merge branch 'TheHollidayInn-api-v3-ops-revive' into api-v3
2016-04-06 23:24:27 +02:00
81d665513c
Merge branch 'api-v3-ops-revive' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-revive
2016-04-06 23:24:14 +02:00
cc4ade2e6d
Merge pull request #7029 from TheHollidayInn/api-v3-ops-unlock
...
Ported unlock. Add unit tests. Create unlock route. Add integration tests
2016-04-06 23:08:17 +02:00
621bf9609e
Ported revive. Added unit tests. Add revive route. Added integration tests
2016-04-06 15:59:42 -05:00
2bd710a882
Ported unlock. Add unit tests. Create unlock route. Add integration tests
2016-04-06 15:53:32 -05:00
a72c6c782d
Merge pull request #7026 from TheHollidayInn/api-v3-ops-sell
...
Ported sell function. Add unit tests. Create sell route. Add integration tests
2016-04-06 18:42:06 +02:00
05b41bb41c
Ported sell function. Add unit tests. Create sell route. Add integration tests
2016-04-06 08:27:18 -05:00
7e9163a17f
chore: Remove apdex check from new relic monitoring
2016-04-05 20:08:44 -05:00
74dace9b5a
chore: Re-enable New Relic
...
closes #7011
2016-04-05 20:08:31 -05:00
ae14d405cb
fix(css): Scope textarea z-index to just task boxes
2016-04-05 20:07:11 -05:00
1f6eef0082
Sabrecat/armoire 201604
...
* WIP(content): add sprites
* feat(content): Armoire and Backgrounds 2016-04
2016-04-05 15:30:01 -05:00
7425af4fb4
Merge pull request #7013 from Hus274/develop
...
Splitting party and boss damage notifications into two code blocks.
2016-04-05 09:01:36 -05:00
7d17921621
Merge pull request #7020 from MathWhiz/patch-2
...
fix: Allow task notes textarea to rest above other elements when expanded
2016-04-05 08:56:39 -05:00
c7d058f2bc
Add z-index to notes textarea
2016-04-04 20:48:54 -05:00
14b0ec8b03
shared-code-webhooks
2016-04-04 16:31:48 +00:00
68ff26e6d6
v3: check that tasks are deleted when the user deletes the acocunt and misc fixes
2016-04-04 17:16:36 +02:00
1620614b3b
Merge branch 'TheHollidayInn-api-v3-ops-release-mounts' into api-v3
2016-04-04 11:49:17 +02:00
c86898c7e4
Merge branch 'api-v3-ops-release-mounts' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-release-mounts
2016-04-04 11:49:06 +02:00
4083b1b045
Merge branch 'TheHollidayInn-api-v3-ops-release-both' into api-v3
2016-04-04 11:46:56 +02:00
66959c23f5
Merge branch 'api-v3-ops-release-both' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-release-both
2016-04-04 11:46:46 +02:00
c755cb5d26
Merge pull request #7003 from TheHollidayInn/api-v3-ops-release-pets
...
Ported release pets, added unit tests, added route with integration t…
2016-04-03 22:19:25 +02:00
c916c74775
Ported release both, added unit tests, add release both route with integration tests
2016-04-03 14:44:00 -05:00
487a26ec43
Ported release pets, added unit tests, added route with integration tests
2016-04-03 14:37:20 -05:00
24b7b4c838
Ported release mounts, add unit tests, added release mounts route with integration tests
2016-04-03 14:34:43 -05:00
bb373ed93a
Splitting party and boss damage notifications into two code blocks.
...
Splitting the party and boss damage notifications into two code blocks will allow the page to push them to newlines if needed instead of added a scroll bar and making the user scroll to see the entire message.
Related issue: https://github.com/HabitRPG/habitrpg/issues/3453
2016-04-03 10:42:15 -07:00
d133fc08f2
Merge pull request #7004 from HabitRPG/api-v3-coupons
...
[Api v3] Coupons
2016-04-02 19:44:06 +02:00
de74fae0b4
v3: port coupons
2016-04-02 16:37:55 +02:00
731ac86244
port changes to cron develop
2016-04-02 12:15:24 +02:00
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
3b98fe377f
Merge pull request #6999 from piousbox/shared-code-update-stats
...
Shared code update stats
2016-04-01 23:16:35 +02:00
7f3feedd12
shared-code-update-stats
2016-04-01 20:50:28 +00:00
843dd09d35
Merge pull request #6986 from HabitRPG/api-v3-one-app
...
[Api v3] Consolidate server code and share middlewares where possible
2016-04-01 19:30:52 +02:00
6cbbdcdcbe
v3: port static pages, make routes lib more flexible, share middlewares between v2 and v3, port v1, simplify server.js
2016-04-01 19:07:03 +02:00
238dee7608
Merge pull request #6962 from piousbox/shared-code-user-score-task
...
shared-code-user-score-task
2016-04-01 18:28:55 +02:00
Matteo Pagliazzi