887aa478ec
chore: merge in develop
2016-04-15 10:11:54 -05:00
33c0cdd569
chore(lint): lint files in preparation for eslint v2
2016-04-15 08:37:05 -05:00
1a64886f7d
Merge branch 'develop' into api-v3
2016-04-15 08:04:46 -05:00
11b5c1b405
v3: several fixes to class system, move /logout outside of api
2016-04-14 20:05:30 +02:00
7bb6f968b4
feat(content): Pet Quest 2016-04 ( #7071 )
...
Also renames the Be-Wilder special pet/mount rewards to "Magical Bee" from "Bumblebee".
2016-04-13 12:15:38 -05:00
6458796a36
v3: first review of common code and task models
2016-04-12 19:30:39 +02:00
004b032084
adapt reset to v2 and remove deleted files from gulpfile
2016-04-12 18:50:02 +02:00
3970064fe5
Ported reset. Added unit tests. Added reset route. Added integration tests
2016-04-12 11:19:36 -05:00
fa32dabc92
Merge pull request #7064 from piousbox/shared-code-crit
...
shared-code-crit
2016-04-12 09:58:46 +02:00
2f1329254e
shared-code-tags-gold-silver ( #7056 )
2016-04-12 09:57:57 +02:00
2d69285080
shared-code-crit
2016-04-11 20:21:33 +00:00
463ba81468
fix(build) only require/import the main common file
2016-04-11 19:46:48 +02:00
c6879aa5df
fix(v3): cleanup of shared code
2016-04-10 18:42:59 +02:00
42ef779b46
Ported addPushDevice. Added unit tests. Added addPushDevice route. Added integration tests
2016-04-10 09:47:14 -05:00
7a24bceac9
Merge pull request #7051 from piousbox/shared-code-percent
...
shared-code-percent
2016-04-10 12:29:43 +02:00
3c784e869a
shared-code-percent
2016-04-09 21:13:16 +00:00
1f4a0680ea
shared-code-private-messages
2016-04-09 16:56:03 +00:00
6b2d1a1416
v3 adapt v2: adapt common ops
2016-04-09 16:45:43 +02:00
910ea836ba
Merge branch 'api-v3' into api-v3-adapt-v2
2016-04-09 15:31:09 +02:00
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
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
1685b7285f
Ported reroll. Added unit tests. Added reroll route. Added integration tests
2016-04-08 15:56:11 -05:00
70fd869934
Merge branch 'api-v3' into api-v3-adapt-v2
2016-04-08 12:03:50 +02:00
276cbc58bb
v3: fix cron middleware, remove unused code from shared
2016-04-08 11:56:51 +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
fec9ce3dbe
Ported rebirth. Add unit tests. Added rebirth route. Added integration tests
2016-04-07 15:02:55 -05:00
2d3fbe9f13
v3 adapt v2: lint client only shared ops and enable members integration tests
2016-04-07 11:54:36 +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
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
b431b02012
v3 adapt v2: port tags, cast, cron, deletUser and removeMember. Fix a few bugs in v3
2016-04-06 19:28:43 +02:00
05b41bb41c
Ported sell function. Add unit tests. Create sell route. Add integration tests
2016-04-06 08:27:18 -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
14b0ec8b03
shared-code-webhooks
2016-04-04 16:31:48 +00:00
382e391fd0
port updateTask, addTask, clearCompleted, taskDefaults, uuid
2016-04-04 17:18:42 +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
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
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
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
7f3feedd12
shared-code-update-stats
2016-04-01 20:50:28 +00: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
e6e2c26a12
shared-code-user-score-task
2016-04-01 16:11:37 +00:00
aae94bf1b4
Merge branch 'api-v3-open-mystery-item' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-open-mystery-item3
2016-04-01 16:39:52 +02:00
82afc1971d
Merge branch 'api-v3-ops-read-card' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-read-card
2016-04-01 16:30:48 +02:00
7e093f1622
Merge branch 'api-v3-hourglass-purchase' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-hourglass-purchase2
2016-04-01 16:28:20 +02:00
Blade Barringer