Matteo Pagliazzi
55db0a4a4b
add routes to get a single user, get members for a group, get members invited to a group
2016-01-12 17:27:06 +01:00
Georgi Gardev
98b0db749b
Refactor User tests to use await syntax
2016-01-12 18:02:09 +02:00
Matteo Pagliazzi
baf0179eb7
Merge branch 'TheHollidayInn-api-v3-groups-invites' into api-v3-groups
2016-01-12 15:48:59 +01:00
Matteo Pagliazzi
b102ff7cae
Merge branch 'api-v3-groups-invites' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-groups-invites
2016-01-12 15:48:47 +01:00
Keith Holliday
1b395b39f8
Added invite limit and tests for when multiple users with an error
2016-01-12 08:43:11 -06:00
Keith Holliday
9141598a34
Updated invite route and function for new standards, and added tests.
2016-01-12 08:43:11 -06:00
Blade Barringer
36cd9e9430
tests(api): Increase test coverage for group post tests
2016-01-12 08:14:50 -06:00
Blade Barringer
88755e69ae
tests(api): Simplify tests
2016-01-12 08:14:12 -06:00
Georgi Gardev
ddd0709b12
Refactor Tags tests to use await syntax
2016-01-12 16:12:35 +02:00
Blade Barringer
fffa95ca09
refactor: Test against party not being private, instead of public
2016-01-12 08:11:19 -06:00
Kristian Tashkov
37cabedecb
Use nvm to install node 4 to vagrant env
2016-01-11 22:29:23 +02:00
Sabe Jones
dba620ee7a
Merge pull request #6417 from GeorgeSG/reverse-chat-option
...
Add option to reverse chat order
2016-01-11 12:55:28 -06:00
Sabe Jones
7e8f0d24c5
Merge remote-tracking branch 'origin/pr/6307' into develop
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
2016-01-11 13:48:01 -05:00
Keith Holliday
ffbd4696e3
Converted posts tests to async/await syntax and updated tests
2016-01-11 12:35:46 -06:00
Matteo Pagliazzi
9e61137e8e
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2016-01-11 18:30:10 +01:00
Matteo Pagliazzi
5244702e48
perf improvements for challenges history and migration
2016-01-11 18:29:39 +01:00
Alys
0d47f8d116
allow purchase of Find the Cub evilsanta2 quest scroll before completing previous quest - fixes https://github.com/HabitRPG/habitrpg/issues/6405
2016-01-12 02:58:33 +10:00
Matt Harrington
1a1823bd43
fixup
2016-01-11 05:17:20 +00:00
Matt Harrington
67f184c0f4
docker maintenance
...
- added docker-compose.yml for quick one-command spinup
- added docker-compose.dev.yml to override /habitrpg mount
- modified Dockerfile to accept /habitrpg mount
2016-01-11 05:04:22 +00:00
Matt Harrington
85c532fe8a
docker maintenance
...
- removing broken sed (was also updating BASE_URL) in favor of NODE_DB_URI (will require documentation)
- changing build order to reduce rebuilding some things unnecessarily
- more effectively using WORKDIR to simplify commands
2016-01-11 05:04:22 +00:00
Matteo Pagliazzi
193e89a79e
fix index when marking task as modified after history preening
2016-01-10 15:57:22 +01:00
Blade Barringer
c5ad006007
chore(i18n): update locales
2016-01-09 23:46:53 -06:00
Blade Barringer
980bec9be3
Merge pull request #6456 from querry43/use-example-dot-com
...
use example.com in the example json so as not to spam legit servers
2016-01-09 23:38:38 -06:00
Blade Barringer
502ba27b47
chore(sprites): Compile sprites
2016-01-09 23:32:17 -06:00
Nathan Maton
b26d3bef40
replaced collars
2016-01-09 23:29:54 -06:00
Matteo Pagliazzi
1d0b05a6df
fix typo in history preening
2016-01-09 21:17:17 +01:00
Matteo Pagliazzi
f55e4f65f9
Merge pull request #6483 from HabitRPG/new-history-preening
...
fixes for new history preening, allow only 1 history entry per day in…
2016-01-09 21:03:18 +01:00
Matteo Pagliazzi
b1a7e44722
fixes for new history preening, allow only 1 history entry per day in challenges tasks
2016-01-09 21:02:40 +01:00
Matteo Pagliazzi
be0fe3eb4f
Merge pull request #6479 from HabitRPG/new-history-preening
...
New history preening
2016-01-09 20:12:33 +01:00
Matteo Pagliazzi
2fff34cff4
finalize tests
2016-01-09 19:47:18 +01:00
Alys
58a92f626d
Merge pull request #6464 from HabitRPG/fix_stat_allocation_bug
...
fix: Corrects stat allocation bug where it was possible to receive more points than 100
2016-01-09 23:00:06 +10:00
Matteo Pagliazzi
dec08955ac
fix tests
2016-01-08 23:02:18 +01:00
Sabe Jones
1b7f17cbd2
chore(news): Bailey 2016-01-08
2016-01-08 16:28:49 -05:00
Sabe Jones
eadf967c9f
Merge pull request #6409 from pnrich/flag-text
...
add extra text to flagging confirmation dialog and to top of PM inbox -- Fix for issue #4648 , parts 3 and 4
2016-01-08 14:05:22 -06:00
Matteo Pagliazzi
82651cf1ed
initial tests
2016-01-08 18:58:54 +01:00
Matteo Pagliazzi
ae852f9a2e
complete preening and enable for challenges too
2016-01-08 17:47:08 +01:00
Matteo Pagliazzi
243b839392
wip: new history preening, delineate process and differentiate between subscribers and non
2016-01-07 20:07:13 +01:00
Matteo Pagliazzi
fdd5ab724a
begin implementing new preenUserHistory method: port current code to es6 and setup tests
2016-01-07 18:44:25 +01:00
Blade Barringer
44dd6674d1
Merge branch 'TayHobbs-develop' into develop
2016-01-06 20:52:53 -06:00
Blade Barringer
8a19a84f3f
lint(tests): Add e2e tests to linter
2016-01-06 20:52:24 -06:00
Taylor Hobbs
a92646b4e9
tests(e2e): Fix test name to use proper English
2016-01-06 20:09:42 -06:00
Daniel Van Camp
99a694bb10
added EU version of t-shirt
2016-01-06 23:15:36 +01:00
Daniel Van Camp
0362977dbd
Merge branch 'develop' into static-page-merch
2016-01-06 22:38:19 +01:00
Matteo Pagliazzi
f235010536
add getChallenge route and remove old code
2016-01-06 22:29:47 +01:00
Sabe Jones
a150efc202
Merge pull request #6473 from HabitRPG/sabrecat/armoire-201601
...
Backgrounds and Armoire 2016-01
2016-01-06 14:29:37 -06:00
Sabe Jones
adfa248dd0
feat(content): backgrounds and Armoire 2016-01
2016-01-06 15:11:20 -05:00
Matteo Pagliazzi
9dfcad238c
rename tasks tests to match new routes
2016-01-06 18:41:25 +01:00
Matteo Pagliazzi
8ba486ec12
change tasks routes to /tasks/(user|challenge)
2016-01-06 18:40:11 +01:00
Matteo Pagliazzi
2b2dcfe7ce
do not delete completed todos that belongs to a challenge
2016-01-06 12:25:53 +01:00
Matteo Pagliazzi
3a6d7bd466
fix sync of remove challenge task
2016-01-06 12:16:41 +01:00