Tyler Smith
b5b3a1545b
Adding conditional to prevent undefined object error
2016-01-19 19:53:20 -08:00
Josh Holland
77342e5790
Fix 'add task' button jumping around
2016-01-19 20:56:06 +00:00
Sabe Jones
023ee44ddc
Merge pull request #6553 from dbarnett/develop
...
Open links from task notes into new browser window/context (Fixes #5622 )
2016-01-19 14:54:59 -06:00
Sabe Jones
c4acd262eb
Merge pull request #6476 from Sighne/sighne/upgrade-amount-users
...
#6460 : upgrade amount of users
2016-01-19 13:41:03 -06:00
David Barnett
7a29542815
Open links from task notes into new browser window/context ( Fixes #5622 )
2016-01-19 11:01:41 -08:00
Sabe Jones
2848f5d709
Merge branch 'NathanMaton/fix-homepage-text' into develop
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
2016-01-19 13:59:49 -05:00
Sabe Jones
95ee19b4ca
Merge branch 'taldin/faq-wiki-links' into develop
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
2016-01-19 13:50:35 -05:00
Matteo Pagliazzi
3a300cb93e
add new emails images
2016-01-19 18:30:57 +01:00
Blade Barringer
92657fa8af
refactor: Remove unused code in test
2016-01-18 22:40:11 -06:00
Jason Vinson
2989057dd3
Fix for issue #5182 : Allow cancel editing group infobox
2016-01-18 22:39:06 -06:00
Blade Barringer
0b5a8bf76d
chore(i18n): update locales
2016-01-18 18:24:44 -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
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
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
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
Blade Barringer
4a3871f52f
tests(api): Add ApiChallenge class
2016-01-17 11:41:29 -06:00
Blade Barringer
96f6bbfb0c
tests(api): Add sync method to api objects
2016-01-16 21:50:54 -06:00
Blade Barringer
87d4c68bea
lint: Correct linting errors
2016-01-16 19:13:33 -06:00
Tyler Smith
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
Blade Barringer
91ffe5c402
tests(api): Reorganize integration helper for v2
2016-01-16 17:28:36 -06:00
Blade Barringer
ef5064f351
Move generators to own file
2016-01-16 17:23:30 -06:00
Joshua Holland
e98dc1405b
Fix rendering of front page news icons
...
Rendering was 'pixelated', is now 'auto'.
2016-01-16 22:43:29 +00:00
Joshua Holland
c85f994f4c
Make .img-rendering-auto apply to descendants
2016-01-16 22:39:40 +00:00
Blade Barringer
6287ae6776
tests(api): Outsource mongo updates to mongo module in api helper
2016-01-16 14:33:53 -06:00
Blade Barringer
80224adafa
tests: Extract mongo functions into separate file
2016-01-16 14:12:26 -06:00
Blade Barringer
54159c069d
tests: Move api translation checkout out into separate file
2016-01-16 14:09:20 -06:00
Blade Barringer
e9f618da5e
tests: Extract api objects to separate files
2016-01-16 14:06:47 -06:00
Blade Barringer
29415441f7
tests: Create base class that ApiUser and ApiGroup inherit from
2016-01-16 09:48:51 -06:00
Blade Barringer
9f2a8c03b2
tests: Remove references to different api routes in helper
2016-01-16 09:45:02 -06:00
Sighne
4d1daf1c41
Uses a const instead of a variable
2016-01-16 11:11:48 +01:00
Sighne
a716ce3fa7
Adds a variable to manage user count
2016-01-16 11:11:48 +01:00
Sighne
5931ddf2ba
Decrease margin for the new logo to fit in social pages
2016-01-16 11:11:48 +01:00
Sighne
ffe1dd6c6a
Upgrade amount of users where I missed and add Discover logo on social pages
2016-01-16 11:11:48 +01:00
Sighne
a9f10380b9
Upgrades amount of users on static page
2016-01-16 11:11:48 +01:00
Sighne
de3d4ae8e7
Adds Discover magazine logo
2016-01-16 11:11:48 +01:00
Blade Barringer
28fc6dd4bd
tests: Convert helpers to use async/await
2016-01-15 20:36:54 -06:00
Sabe Jones
23720e0a43
style(subscription): more tweaks
2016-01-15 14:10:02 -05:00
