198d2e6ab5
misc fixes and run gulp lint when testing
2016-01-24 12:38:20 +01:00
ba60604899
Merge branch 'TheHollidayInn-api-v3-groups-chat-clear-flagss' into api-v3-groups
2016-01-24 12:27:42 +01:00
e8c2d16f2c
Merge branch 'api-v3-groups-chat-clear-flags' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-groups-chat-clear-flagss
2016-01-24 12:27:23 +01:00
bf1991d3de
Merge branch 'TheHollidayInn-api-v3-chat-delete' into api-v3-groups
2016-01-24 12:24:25 +01:00
9e1f23edbd
Merge branch 'api-v3-chat-delete' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-chat-delete
2016-01-24 12:23:51 +01:00
fe170a591a
Merge pull request #6531 from TheHollidayInn/api-v3-group-get-groups-test
...
Added initial get groups tests
2016-01-24 12:13:54 +01:00
c5d731aa80
Merge pull request #6563 from TheHollidayInn/api-v3-get-group-tests
...
Added initial get group tests
2016-01-24 12:12:28 +01:00
f8274ad504
Merge pull request #6574 from TheHollidayInn/api-v3-groups-seen-chat
...
Fixed send message and added intiial seen chat tests
2016-01-24 12:06:47 +01:00
e8c13d3117
Added initial clear chat flags tests
2016-01-23 23:11:57 -06:00
c498eef21c
Added initial chat delete tests
2016-01-23 23:09:22 -06:00
ff034cf61b
Fixed send message for parties and added party seen message test
2016-01-23 19:56:11 -06:00
9405d4b054
Fixed send message and added intiial seen chat tests
2016-01-23 14:32:24 -06:00
2063070f18
Added group toJSON conversion and fixed syntax errors
2016-01-23 13:42:01 -06:00
febc48cd41
Fixed failing chat test by using and admin to view chat flags
2016-01-23 13:42:01 -06:00
ab5fc1f526
Added initial get group tests
2016-01-23 13:42:00 -06:00
13693a041a
fix npm test so that it does not fail - temporary solution
2016-01-23 19:44:55 +01:00
cded1aa8ab
remove duplicate eslint rules
2016-01-23 19:13:24 +01:00
1a31f73238
fix query when setting new group leader
2016-01-20 21:35:00 +01:00
ef6afaedb4
Added intitial group leave tests
...
Fixed test readability, updated party test, and updated challenge update code when leaving group
Updated library, added group existance check, and reset full party
Updated syntax, added new userUnlinkChallenges, and added some initial testing for challenges
Added challenge tasks tests
Added try/catch to group remove, add more party tests, fixed broken challenge test, removed useless return value
Added public guild tests, added more tests to party, and abstracted remove invitations logic
Closes #6506
2016-01-20 08:51:30 -06:00
be55176954
Ensured tavern is not returned twice and removed leader population
2016-01-19 08:13:24 -06:00
66083f766c
Merge branch 'api-v3' into api-v3-groups
2016-01-18 18:04:20 -06:00
32a2b3121e
Merge branch 'develop' into api-v3
2016-01-18 18:04:07 -06:00
5b740b1a11
Fix setting of environment variables in gulp test tasks in Windows
...
See this stackoverflow link for why this is necessary
http://stackoverflow.com/questions/27084392/code-coverage-for-mocha-in-windows-7/27193866#27193866
2016-01-18 16:55:15 -06:00
fc8c377eab
Merge pull request #6455 from querry43/docker-changes
...
Docker changes
2016-01-18 16:13:18 -06:00
d44ff94acb
Merge pull request #6547 from vIiRuS/guidelinespage
...
Add viirus to Community Guidelines page. Fixes #6546
2016-01-18 15:37:58 -06:00
c6b4b24052
Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks
...
Text and visual tweaks for Gems
2016-01-18 15:25:58 -06:00
9b008f71a0
fix(CSS): remove redundant style
2016-01-18 16:13:24 -05:00
fe58129cd3
remove Completion from Octopus quest text - ref https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-172600908
2016-01-19 06:18:49 +10:00
d0de12abac
Add viirus to Community Guidelines page. Fixes #6546
2016-01-18 20:52:27 +01:00
fd62e39f20
fix spelling mistake: crystaline -> crystalline
2016-01-19 04:47:50 +10:00
477603539e
Merge branch 'api-v3' into api-v3-groups
2016-01-18 11:24:55 -06:00
64c4f0f94a
Merge branch 'develop' into api-v3
2016-01-18 11:24:34 -06:00
79f2dc6b1a
tests: Update gulp task to use npm scripts
2016-01-18 11:10:22 -06:00
c56f5fefc1
chore: remove unused npmignore
2016-01-18 10:14:06 -06:00
1ff9db253b
Merge branch 'api-v3' into api-v3-groups
2016-01-18 10:13:48 -06:00
aa68a5ed38
fix: Update vagrant to use npm 3
2016-01-18 10:13:09 -06:00
a0a840e22a
Merge branch 'develop' into api-v3
2016-01-18 10:12:42 -06:00
89ef7c24c4
refactor: Modularize vagrant scripts
2016-01-18 10:08:49 -06:00
0ee7970276
fix: vagrant provisioning installs node automatically
2016-01-18 08:47:57 -06:00
ee854229c7
fix dateCompleted not remove from un-completed todos and fix tasks test
2016-01-18 15:01:46 +01:00
5b0d3be444
Merge branch 'develop' into KristianTashkov-nvm-in-vagrant-develop
2016-01-18 06:47:17 -06:00
0c1bb2e4df
Merge pull request #6119 from nivl4/nivl4/vagrant
...
Update vagrant provisioning script to create symlinks for any binaries the package might contain
2016-01-18 06:42:28 -06:00
af19d0d77b
fix: Correct stylus comment about modal height
2016-01-17 16:11:42 -06:00
0a2c833f9b
Merge branch 'tylerxo-develop' into develop
2016-01-17 16:10:59 -06:00
53f93675c3
Merge branch 'anowlcalledjosh-homepage_news_icons' into develop
2016-01-17 16:07:30 -06:00
d93cabafb9
Added initial tests for createChallengeTasks and fixed some issues in the challenge and challengeTask routes
2016-01-17 16:03:19 -06:00
f37b5a7fac
Challenges join route and tests
2016-01-17 15:44:15 -06:00
b24ff233f2
Merge pull request #6542 from crookedneighbor/api_v3_generate_challenge
...
Api v3 generateChallenge helper
2016-01-17 14:55:18 -06:00
c5947ca9c4
Updated party test to conform to new leader populate
2016-01-17 14:20:51 -06:00
7b59455252
tests(api): Add generateChallenge helper
2016-01-17 13:58:46 -06:00
Matteo Pagliazzi