 Blade Barringer
|
75c9b5a978
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
src/controllers/groups.js
src/controllers/payments/index.js
src/controllers/user.js
src/models/user.js
|
2015-02-09 22:21:27 -06:00 |
|
|
Blade Barringer
|
45d1fb4c6e
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
common/dist/scripts/habitrpg-shared.js
|
2015-02-09 22:18:22 -06:00 |
|
|
Lisa Marie
|
24a6b2f4cc
|
migration(plans): sample code for plans which didn't get applied
|
2015-02-09 19:39:05 -07:00 |
|
|
Blade Barringer
|
a1568b0c32
|
Corrected title on readme
|
2015-02-09 19:10:59 -06:00 |
|
|
Blade Barringer
|
fe6579937c
|
Editted common readme
|
2015-02-09 19:06:13 -06:00 |
|
|
Blade Barringer
|
c8124f28ed
|
Set it so compiled js and sprites are not ignored
|
2015-02-09 16:04:25 -06:00 |
|
|
Blade Barringer
|
fa5c0dd75c
|
Added sprite task back in
|
2015-02-09 13:55:59 -06:00 |
|
|
Blade Barringer
|
ac4dbf6eec
|
Added /register. Required for newer version of coffee-script module
|
2015-02-09 13:37:30 -06:00 |
|
|
Blade Barringer
|
59a203e05c
|
Corrected path to moment locale files
|
2015-02-09 13:36:15 -06:00 |
|
|
Blade Barringer
|
8a25a5a744
|
Corrected paths
|
2015-02-09 13:32:56 -06:00 |
|
|
Blade Barringer
|
6efae8a044
|
Reverted start task back to grunt
|
2015-02-09 13:17:28 -06:00 |
|
|
Blade Barringer
|
0f45b1d8dd
|
Corrected path to habitrpg. Added grunt-browserify
|
2015-02-09 13:17:19 -06:00 |
|
|
Matteo Pagliazzi
|
8bd116f2c5
|
fix gems gifting
|
2015-02-09 19:31:18 +01:00 |
|
|
Matteo Pagliazzi
|
f303a71e66
|
site can be used when sessionPartyInvite is invalid
|
2015-02-09 19:11:14 +01:00 |
|
|
Matteo Pagliazzi
|
fb72b10e3d
|
chore(i18n): update locales
|
2015-02-09 18:21:09 +01:00 |
|
|
Matteo Pagliazzi
|
9dfe18bc70
|
typo
|
2015-02-09 17:43:14 +01:00 |
|
|
Blade Barringer
|
e5e9f054d1
|
Compiled coffeescript
|
2015-02-08 20:32:14 -06:00 |
|
|
Blade Barringer
|
0ebb9c874b
|
Worked on gruntfile
|
2015-02-08 20:19:54 -06:00 |
|
|
Sabe Jones
|
4b96ee83b6
|
chore(news): 2/8 Bailey
|
2015-02-08 15:21:43 -06:00 |
|
|
Matteo Pagliazzi
|
8b88b34475
|
correctly redirect after authentication
|
2015-02-08 21:45:30 +01:00 |
|
|
Matteo Pagliazzi
|
58cec5259a
|
enable quest invitation email
|
2015-02-08 20:33:03 +01:00 |
|
|
Matteo Pagliazzi
|
7d139b4adc
|
add quest invitation email (disabled for now) and fixes
|
2015-02-07 22:20:16 +01:00 |
|
|
Matteo Pagliazzi
|
cb4da8b91e
|
add strings
|
2015-02-07 22:00:02 +01:00 |
|
|
Matteo Pagliazzi
|
4f66d30441
|
implement quest started email
|
2015-02-07 21:36:38 +01:00 |
|
|
Matteo Pagliazzi
|
9aca6c26c6
|
chore(i18n): update locales
|
2015-02-07 19:22:00 +01:00 |
|
|
Alice Harris
|
468f414710
|
Merge pull request #4644 from Alys/develop
database script to identify and remove duplicate tasks for one user - use with caution!
|
2015-02-07 14:04:58 +10:00 |
|
|
Alice Harris
|
734227c472
|
improve spacing
|
2015-02-07 14:00:21 +10:00 |
|
|
Alice Harris
|
ef8b783f2b
|
add script that helps a database admin find and remove tasks with duplicated IDs for a single user
|
2015-02-07 13:51:22 +10:00 |
|
|
Blade Barringer
|
157a635a0c
|
Restored Grunt tasks
|
2015-02-06 21:13:26 -06:00 |
|
|
Blade Barringer
|
71a2382b67
|
Added grunt tasks back in
|
2015-02-06 20:58:38 -06:00 |
|
|
Blade Barringer
|
1dfdffd51f
|
Removed converted grunt tasks
|
2015-02-06 16:05:55 -06:00 |
|
|
Blade Barringer
|
6cf1ce7f67
|
Wrote copy task
|
2015-02-06 16:05:06 -06:00 |
|
|
Blade Barringer
|
1846dacd5f
|
Used event-stream for stylus task
|
2015-02-06 15:13:18 -06:00 |
|
|
Matteo Pagliazzi
|
419b6bf611
|
Merge pull request #460 from negue/fullTranslation
add a locale var to all translations
|
2015-02-06 18:47:17 +01:00 |
|
|
Blade Barringer
|
4339fd7982
|
Simplified stylus task
|
2015-02-06 10:50:18 -06:00 |
|
|
Blade Barringer
|
12ae9957ad
|
Corrected paths on gulp tasks
|
2015-02-05 20:39:45 -06:00 |
|
|
Tyler Renelle
|
2d44783d80
|
fix(tour): don't restart tour on userUpdated, fixes #4632
|
2015-02-05 15:46:20 -07:00 |
|
|
Blade Barringer
|
67f478bb0e
|
Adjusted paths to files
|
2015-02-05 16:37:22 -06:00 |
|
|
Blade Barringer
|
4572900a59
|
Wrote first version of hashing task
|
2015-02-05 13:34:14 -06:00 |
|
|
Blade Barringer
|
05bbd8dd31
|
Added gulp-hash to package json
|
2015-02-05 11:58:19 -06:00 |
|
|
Blade Barringer
|
1fd7048ac0
|
Fixed semicolon -> comma
|
2015-02-05 11:58:08 -06:00 |
|
|
Blade Barringer
|
0fdd2faaa2
|
cleaned up processes a bit
|
2015-02-05 11:43:07 -06:00 |
|
|
Blade Barringer
|
851a79ede6
|
Separated out tasks from build
|
2015-02-05 11:39:11 -06:00 |
|
|
Blade Barringer
|
cd4225bdb7
|
refactored paths for build
|
2015-02-05 11:32:57 -06:00 |
|
|
Blade Barringer
|
9adcc37dc4
|
Changed to dot notation
|
2015-02-05 11:22:42 -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 |
|
|
Blade Barringer
|
3897266ba6
|
Removed trailing comma from .jshintrc
|
2015-02-05 11:15:01 -06:00 |
|
|
Blade Barringer
|
3f064ee1bf
|
Merge pull request #4566 from Verabird/fixDateFormat
Fix date format for charts (#4558)
|
2015-02-04 21:59:00 -06:00 |
|
|
Tyler Renelle
|
63320d3fe7
|
refactor(tour): small cleanup
|
2015-02-04 19:40:06 -07:00 |
|
|
Tyler Renelle
|
3916346308
|
fix(tour): misc tour fixes. uses backdrop, next/prev (important we've
found in user test vids), etc
|
2015-02-04 18:55:29 -07:00 |
|