Blade Barringer
65bb655a10
Merge branch 'develop' into api-v3
2015-12-13 16:39:59 -06:00
Blade Barringer
025b302ec6
Merge branch 'develop' into anilanar-favicon192
2015-12-12 20:08:34 -06:00
Blade Barringer
24cd36e716
Remove second babel require
2015-11-15 15:08:31 -06:00
Blade Barringer
49fd6b9f5c
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2015-11-15 14:59:57 -06:00
Blade Barringer
00055ad055
Merge branch 'develop' into api-v3
2015-11-15 14:57:41 -06:00
Blade Barringer
a127bb8711
Switch to babel-core form babel.
...
Babel includes the CLI, which we don't need.
2015-11-15 08:59:57 -06:00
Blade Barringer
4a38c36cce
Register babel in gruntfile
2015-11-14 21:51:02 -06:00
Blade Barringer
1ae9b7aff0
Correct path to i18n
2015-11-13 18:40:46 -06:00
Blade Barringer
6e8e1648d9
Merge branch 'develop' into api-v3
2015-11-13 07:38:24 -06:00
Blade Barringer
7559f14f4d
Remove coffee from files
2015-11-11 20:40:26 -06:00
Blade Barringer
25ae2e4252
Move browserify task to gulp
2015-11-11 20:32:17 -06:00
Blade Barringer
bab41be646
Correct gruntfile to use babel require hook
2015-11-09 08:05:51 -06:00
Matteo Pagliazzi
ed0e4c6d20
Reorganize files under /src, separate express app in two apps, one for api v1 and v2 and the other \
...
for the upcoming api v3
Reorganize files under /src, separate express app in two apps, one for api v1 and v2 and the other for the upcoming api v3
move api v2 routes in a separate folder, rename apiv1 file for better readability, remove auth routes for api v1
move api-v2 controllers in subdirectory
move unorganized files to /libs
fix gulp requires and separate server in old (api v1 and v2) and new (api v3) app
fix require paths
fix require paths
fix require paths
put api v1 back
Reorganize files under /src and separate express app in one for api v1 and v2 and the other for v3
2015-11-02 17:43:32 +01:00
Anil Anar
a08fd12aa1
add new favicon with 192x192 resolution, meta tag for android:chrome.
2015-10-18 03:56:17 +02:00
Sabe Jones
6d6f0f597b
feat(world-boss): Dry run
2015-09-24 15:39:16 -04:00
Blade Barringer
c2eb916be1
Add cssmin task to build:dev
2015-09-12 11:19:56 -05:00
Blade Barringer
d3d365a74a
Move sprites task to gulp
2015-09-11 19:59:06 -05:00
Blade Barringer
a85116540c
Move run:dev task to gulp
2015-09-08 15:45:09 -05:00
Blade Barringer
bc9c12f253
Move static new stuff task to gulp
2015-09-04 15:32:08 -05:00
Blade Barringer
cfae45a5f7
Move build task to gulp
2015-09-04 15:30:44 -05:00
Blade Barringer
20148be288
Watch js files in common folder
2015-07-18 16:00:05 -05:00
Andy Martin
24f35d84e7
add imagemin task to grunt, to shrink file size after spritesmith
2015-06-27 00:13:03 -06:00
Blade Barringer
62f12cf8b5
Correct path of translations mock
2015-06-13 13:39:21 -05:00
Blade Barringer
615c3f18a5
Adjust gruntfile regex and recompile
2015-05-26 22:19:45 -05:00
hairlessbear
958068c2b0
Rebased to resolve merge conflicts
2015-05-26 00:19:35 -04:00
Blade Barringer
a270b6d931
Compile shared when changes are made to coffee files
2015-05-18 08:52:28 -05:00
Blade Barringer
5c00bde701
remove changelog
2015-05-08 20:46:54 -05:00
Alys
ab6d8d0821
Merge pull request #4950 from gisikw/force-latest-bailey
...
Ensure Bailey always displays the most recent message.
2015-04-04 01:29:32 +10:00
Blade Barringer
9f6f5ed3e6
Update Gruntfile.js
...
Changed number of spritesheets from 6 to 7
2015-03-31 22:12:58 -05:00
Kevin Gisi
79606736a1
Ensure Bailey always displays the most recent message.
...
* Added a Grunt task to precompile website/views/shared/new-stuff.jade to a
static html file.
* Updated the new-stuff.jade modal template to use a $rootScope property.
* Added a special case to openModal for the newStuff template, by which it
fetches the flat file, marks it as trusted HTML, and sets it to the
$rootScope property before rendering the modal.
2015-03-31 20:38:15 -04:00
Kevin Gisi
7bed1efb21
Revised Grunt translations task to use build:test
...
* Added build:test task to generate translation JS for tests.
* Removed test/spec/translations.js from the repository, added to .gitignore.
* Updated test/run_tests.sh to run build:test, and accept an optional argument
to run a particular test suite.
2015-03-24 21:39:03 -04:00
Kevin Gisi
09b6401794
Add translations to Karma specs
...
* Added a task to Gruntfile to use website/src/i18n.js to generate a small JS file to be loaded in Karma env which sets window.env.translations to the i18n.translations['en'].
* Added new Grunt task to build:dev
* Updated Karma specs to reenable testing where possible, updating comments where not.
2015-03-24 21:39:03 -04:00
Blade Barringer
7cf8745375
Corrected gruntfile to use process.env.NODE_ENV
2015-02-13 09:43:28 -06:00
Blade Barringer
ca50c31bc0
Adjusted grunt command so it behaves differently on production and
...
development
2015-02-13 09:31:56 -06:00
Blade Barringer
9f6d74b2bd
Removed compile sprites from prod build step
2015-02-11 16:15:28 -06:00
Blade Barringer
85bf2aced8
Wrote task to minify and concatenate spritesheet styles
2015-02-10 17:12:17 -06:00
Blade Barringer
557ccc7ec0
Added sprites build to build:prod task
2015-02-09 23:07:28 -06:00
Blade Barringer
fa5c0dd75c
Added sprite task back in
2015-02-09 13:55:59 -06:00
Blade Barringer
0f45b1d8dd
Corrected path to habitrpg. Added grunt-browserify
2015-02-09 13:17:19 -06:00
Blade Barringer
0ebb9c874b
Worked on gruntfile
2015-02-08 20:19:54 -06:00
Blade Barringer
157a635a0c
Restored Grunt tasks
2015-02-06 21:13:26 -06:00
Blade Barringer
1dfdffd51f
Removed converted grunt tasks
2015-02-06 16:05:55 -06:00
Blade Barringer
dca2f13dda
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
...
Conflicts:
bower.json
public/manifest.json
src/controllers/auth.js
2015-02-05 11:20:40 -06:00
Matteo Pagliazzi
01d695cae5
fix(grunt): allow caching of spritesheets, fix #4542
2015-01-29 17:59:30 +01:00
Matteo Pagliazzi
8f19f225f1
fix(misc): some styles & translations
2014-02-14 18:35:21 +01:00
Matteo Pagliazzi
bb6931fe83
refactor(grunt): cache gifs
2014-02-12 18:08:17 +01:00
Matteo Pagliazzi
8fdc5327e9
refactor(grunt and caching): cache icon fonts, spritesmith and use icons from spritesmith for coins notification
2014-02-12 15:10:22 +01:00
Matteo Pagliazzi
fb496de42f
refactor(caching): only 1 css file, use grunt-contrib-cssmin to rewrite urls
2014-02-12 14:34:50 +01:00
Matteo Pagliazzi
fbe3ecc033
refactor(grunt): simplify run:dev task
2014-02-12 13:59:13 +01:00
Cole Gleason
441c3cf1d7
chore(logging): ignore *.log when running nodemon to avoid loop
2014-02-01 02:00:49 -06:00
