Keith Holliday
febc48cd41
Fixed failing chat test by using and admin to view chat flags
2016-01-23 13:42:01 -06:00
Keith Holliday
ab5fc1f526
Added initial get group tests
2016-01-23 13:42:00 -06:00
Matteo Pagliazzi
13693a041a
fix npm test so that it does not fail - temporary solution
2016-01-23 19:44:55 +01:00
Matteo Pagliazzi
cded1aa8ab
remove duplicate eslint rules
2016-01-23 19:13:24 +01:00
Matteo Pagliazzi
1a31f73238
fix query when setting new group leader
2016-01-20 21:35:00 +01:00
Keith Holliday
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
Blade Barringer
66083f766c
Merge branch 'api-v3' into api-v3-groups
2016-01-18 18:04:20 -06:00
Blade Barringer
32a2b3121e
Merge branch 'develop' into api-v3
2016-01-18 18:04:07 -06:00
Kristian Tashkov
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
Sabe Jones
fc8c377eab
Merge pull request #6455 from querry43/docker-changes
...
Docker changes
2016-01-18 16:13:18 -06:00
Sabe Jones
d44ff94acb
Merge pull request #6547 from vIiRuS/guidelinespage
...
Add viirus to Community Guidelines page. Fixes #6546
2016-01-18 15:37:58 -06:00
Sabe Jones
c6b4b24052
Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks
...
Text and visual tweaks for Gems
2016-01-18 15:25:58 -06:00
Sabe Jones
9b008f71a0
fix(CSS): remove redundant style
2016-01-18 16:13:24 -05:00
Alys
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
Phillip Thelen
d0de12abac
Add viirus to Community Guidelines page. Fixes #6546
2016-01-18 20:52:27 +01:00
Alys
fd62e39f20
fix spelling mistake: crystaline -> crystalline
2016-01-19 04:47:50 +10:00
Blade Barringer
477603539e
Merge branch 'api-v3' into api-v3-groups
2016-01-18 11:24:55 -06:00
Blade Barringer
64c4f0f94a
Merge branch 'develop' into api-v3
2016-01-18 11:24:34 -06:00
Blade Barringer
79f2dc6b1a
tests: Update gulp task to use npm scripts
2016-01-18 11:10:22 -06:00
Blade Barringer
c56f5fefc1
chore: remove unused npmignore
2016-01-18 10:14:06 -06:00
Blade Barringer
1ff9db253b
Merge branch 'api-v3' into api-v3-groups
2016-01-18 10:13:48 -06:00
Blade Barringer
aa68a5ed38
fix: Update vagrant to use npm 3
2016-01-18 10:13:09 -06:00
Blade Barringer
a0a840e22a
Merge branch 'develop' into api-v3
2016-01-18 10:12:42 -06:00
Blade Barringer
89ef7c24c4
refactor: Modularize vagrant scripts
2016-01-18 10:08:49 -06:00
Blade Barringer
0ee7970276
fix: vagrant provisioning installs node automatically
2016-01-18 08:47:57 -06:00
Matteo Pagliazzi
ee854229c7
fix dateCompleted not remove from un-completed todos and fix tasks test
2016-01-18 15:01:46 +01:00
Blade Barringer
5b0d3be444
Merge branch 'develop' into KristianTashkov-nvm-in-vagrant-develop
2016-01-18 06:47:17 -06:00
Blade Barringer
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
Blade Barringer
af19d0d77b
fix: Correct stylus comment about modal height
2016-01-17 16:11:42 -06:00
Blade Barringer
0a2c833f9b
Merge branch 'tylerxo-develop' into develop
2016-01-17 16:10:59 -06:00
Blade Barringer
53f93675c3
Merge branch 'anowlcalledjosh-homepage_news_icons' into develop
2016-01-17 16:07:30 -06:00
Keith Holliday
d93cabafb9
Added initial tests for createChallengeTasks and fixed some issues in the challenge and challengeTask routes
2016-01-17 16:03:19 -06:00
Kristian Tashkov
f37b5a7fac
Challenges join route and tests
2016-01-17 15:44:15 -06:00
Blade Barringer
b24ff233f2
Merge pull request #6542 from crookedneighbor/api_v3_generate_challenge
...
Api v3 generateChallenge helper
2016-01-17 14:55:18 -06:00
Blade Barringer
7b59455252
tests(api): Add generateChallenge helper
2016-01-17 13:58:46 -06:00
Blade Barringer
81e6172fb1
tests: Tighten up generateGroup members helper
2016-01-17 13:42:09 -06:00
Blade Barringer
b75adb4f3b
tests(api): Pull in theunknown's changes to createAndPopulateGroup
...
bf6814265c
2016-01-17 13:22:39 -06:00
Blade Barringer
1e9f24a6b0
Merge branch 'api-v3' into api-v3-groups
2016-01-17 11:45:00 -06:00
Blade Barringer
5d803fde56
tests(api): Adjust v3 api-integration helper to export all generate methods
2016-01-17 11:43:31 -06:00
Blade Barringer
08381793a8
Merge branch 'develop' into api-v3
2016-01-17 11:41:49 -06:00
Blade Barringer
4a3871f52f
tests(api): Add ApiChallenge class
2016-01-17 11:41:29 -06:00
Matteo Pagliazzi
3630f5a3ea
Merge pull request #6504 from HabitRPG/api-v3-members
...
[API v3] Members routes
2016-01-17 18:40:17 +01:00
Matteo Pagliazzi
ec7ed9c90e
add tests for getChallengeMemberProgress route and several bug fixes
2016-01-17 18:31:03 +01:00
Matteo Pagliazzi
8de8ca7e18
add getChallengeMemberProgress route and misc fixes
2016-01-17 12:01:57 +01:00
Matteo Pagliazzi
c27f98075c
Merge branch 'api-v3-groups' into api-v3-members
2016-01-17 11:24:10 +01:00
Blade Barringer
38cdf07a4d
Merge branch 'api-v3' into api-v3-groups
2016-01-16 21:56:55 -06:00
Blade Barringer
5de2503039
Merge branch 'develop' into api-v3
2016-01-16 21:54:13 -06:00
Blade Barringer
96f6bbfb0c
tests(api): Add sync method to api objects
2016-01-16 21:50:54 -06:00
Blade Barringer
965c5dbaa7
Merge branch 'api-v3' into api-v3-groups
2016-01-16 19:46:47 -06:00
Blade Barringer
a44cf5e0fc
lint: Fix linting erros in test helpers
2016-01-16 19:27:03 -06:00
