Blade Barringer
|
6548db8095
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
|
2015-02-09 22:41:52 -06:00 |
|
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
|
a1568b0c32
|
Corrected title on readme
|
2015-02-09 19:10: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
|
67f478bb0e
|
Adjusted paths to files
|
2015-02-05 16:37:22 -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
|
28b9ad11cb
|
Added paths for common scripts
|
2015-02-04 13:22:41 -06:00 |
|
Blade Barringer
|
5d9cda3b76
|
Corrected some paths to serve files directly from comon
|
2015-02-04 12:25:14 -06:00 |
|
Blade Barringer
|
a617bac139
|
Moved config.json.example to website folder
|
2015-02-04 10:18:42 -06:00 |
|
Blade Barringer
|
cc767efa20
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
src/controllers/auth.js
src/controllers/challenges.js
src/controllers/groups.js
src/controllers/members.js
src/controllers/payments/index.js
src/controllers/user.js
src/middleware.js
src/models/user.js
|
2015-02-03 21:13:55 -06:00 |
|
Blade Barringer
|
08daed21ce
|
Removed register task from coffee script require
|
2015-02-03 19:40:23 -06:00 |
|
Blade Barringer
|
44a89dd0bd
|
Corrected sprite task
|
2015-02-03 19:29:22 -06:00 |
|
Blade Barringer
|
bf6fdf8d9d
|
Updated paths
|
2015-02-03 18:55:17 -06:00 |
|
Blade Barringer
|
5ddb44a65b
|
Corrected path to common module
|
2015-02-03 16:45:53 -06:00 |
|
Blade Barringer
|
277f7347ab
|
Updated coffee script parser to parse the common scripts
|
2015-02-03 16:45:43 -06:00 |
|
Blade Barringer
|
53b81ec0e8
|
corrected public directory path
|
2015-02-03 14:41:22 -06:00 |
|
Blade Barringer
|
220942fb9d
|
Corrected path to common files
|
2015-02-03 14:17:21 -06:00 |
|
Blade Barringer
|
8a8ce8d80d
|
Moved folders to website directory
|
2015-02-03 14:10:55 -06:00 |
|
Blade Barringer
|
9f420d0e7a
|
Made symlink to audio folder
|
2015-02-03 14:06:04 -06:00 |
|
Blade Barringer
|
d2eafdd021
|
Started moving public folder stuff back to website
|
2015-02-03 14:02:34 -06:00 |
|