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
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
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
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
5d803fde56
tests(api): Adjust v3 api-integration helper to export all generate methods
2016-01-17 11:43:31 -06:00
08381793a8
Merge branch 'develop' into api-v3
2016-01-17 11:41:49 -06:00
4a3871f52f
tests(api): Add ApiChallenge class
2016-01-17 11:41:29 -06:00
5de2503039
Merge branch 'develop' into api-v3
2016-01-16 21:54:13 -06:00
96f6bbfb0c
tests(api): Add sync method to api objects
2016-01-16 21:50:54 -06:00
a44cf5e0fc
lint: Fix linting erros in test helpers
2016-01-16 19:27:03 -06:00
5dd2dcd6d8
Merge branch 'improve_tests' into api-v3
2016-01-16 19:24:39 -06:00
87d4c68bea
lint: Correct linting errors
2016-01-16 19:13:33 -06:00
1d7c30a06d
Fixes for the profile modal
...
This commit fixes the following:
1. Unintented scrollbar was being created on the .modal container element
2. 15px gap between the footer and scrollable content, creating an odd visual lapse
3. Modal was too wide between 768px and 900px, bleeding off the page.
2016-01-16 16:14:20 -08:00
ec9d0fd278
tests: Set up placeholder file for api test helpers
2016-01-16 18:13:11 -06:00
07f08de989
Merge branch 'improve_tests' into api-v3
2016-01-16 18:12:36 -06:00
91ffe5c402
tests(api): Reorganize integration helper for v2
2016-01-16 17:28:36 -06:00
ef5064f351
Move generators to own file
2016-01-16 17:23:30 -06:00
e98dc1405b
Fix rendering of front page news icons
...
Rendering was 'pixelated', is now 'auto'.
2016-01-16 22:43:29 +00:00
c85f994f4c
Make .img-rendering-auto apply to descendants
2016-01-16 22:39:40 +00:00
6287ae6776
tests(api): Outsource mongo updates to mongo module in api helper
2016-01-16 14:33:53 -06:00
80224adafa
tests: Extract mongo functions into separate file
2016-01-16 14:12:26 -06:00
54159c069d
tests: Move api translation checkout out into separate file
2016-01-16 14:09:20 -06:00
e9f618da5e
tests: Extract api objects to separate files
2016-01-16 14:06:47 -06:00
29415441f7
tests: Create base class that ApiUser and ApiGroup inherit from
2016-01-16 09:48:51 -06:00
9f2a8c03b2
tests: Remove references to different api routes in helper
2016-01-16 09:45:02 -06:00
28fc6dd4bd
tests: Convert helpers to use async/await
2016-01-15 20:36:54 -06:00
23720e0a43
style(subscription): more tweaks
2016-01-15 14:10:02 -05:00
5315cc9055
Update character.json to separate optOut into two translation strings
...
optOut is currently used to skip the class selection and to opt out of the messaging system.
that creates translation problems.
Fixes #6511
Closes #6518
2016-01-14 20:40:07 -06:00
24e08676db
Add icon for pinned Safari tabs
...
Fixes #6451
Closes #6522
2016-01-14 20:32:51 -06:00
e761315c74
Remove tooltip for 'reverse chat messages' checkbox
...
Fixes #6517
Closes #6525
2016-01-14 20:28:08 -06:00
a0b264f686
Align progress and help icons on to-dos column
...
Fixes #6474
As per #6474 , progress and help icons on the to-dos column were
previously misaligned due to inline styles. This commit adds the same
inline styles to both icons.
Move inline styles on task column icons to a class
This uses existing classes instead of adding a new one, because if new
icons are added in the future this should catch them without any extra
classes having to be added to the new icons.
In addition, this will catch any new .option-box added to .task-column
in the future; this may be good or bad, but is easy to fix in any case.
2016-01-14 20:24:09 -06:00
c084b6b7cd
Merge pull request #6526 from HabitRPG/no_sprite_sheets_css
...
refactor: Remove compiled spritesheet from source control
2016-01-14 18:10:31 -06:00
d02c3d321e
refactor: Remove compiled spritesheet from source control
2016-01-14 18:03:14 -06:00
Blade Barringer