 Sabe Jones
|
47f3122c2d
|
chore(news): Pet rocks Bailey
Also fixes incorrectly named golden rocks.
|
2015-02-17 20:39:04 -06:00 |
|
|
Sabe Jones
|
0608ac5caa
|
feat(quest): Pet Rocks
|
2015-02-17 20:02:06 -06:00 |
|
|
Blade Barringer
|
78430b1910
|
Collapsed 3 strings into single string
|
2015-02-17 15:26:42 -06:00 |
|
|
remmz0r
|
2e98185c5d
|
fixes #4670
removed target="_blank" from archery link
|
2015-02-18 00:03:37 +08:00 |
|
|
remmy poos
|
cfabb12b04
|
fixes #4670
Replaced archery links in index.jade and tavern.jade
Let me know if this isn't all the links
Cheers
- remmz0r
|
2015-02-17 23:52:48 +08:00 |
|
|
Blade Barringer
|
a5ce3f58b1
|
Removed original user text from veteran achievement
|
2015-02-17 08:42:43 -06:00 |
|
|
remmz0r
|
7a08ff360f
|
possibly fixed - can't test it as I can't figure out how to make a user an 'originalUser' on mongodb
|
2015-02-17 13:36:12 +08:00 |
|
|
remmz0r
|
feb1e01c4d
|
Fixed original user code in achievements.jade
|
2015-02-17 10:48:27 +08:00 |
|
|
Sabe Jones
|
130261dacf
|
feat(event): End Valentine's
|
2015-02-16 18:15:09 -06:00 |
|
|
Blade Barringer
|
477d3d6085
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
|
2015-02-12 13:32:23 -06:00 |
|
|
Blade Barringer
|
a6a0282c82
|
Corrected common image paths
|
2015-02-12 12:05:38 -06:00 |
|
|
Blade Barringer
|
85817b2b4e
|
Corrected path to habitrpg logo
|
2015-02-12 11:50:55 -06:00 |
|
|
Blade Barringer
|
8ac9dc3ced
|
Merge branch 'develop' into common-convert
|
2015-02-10 16:27:46 -06:00 |
|
|
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
|
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
|
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
|
8a8ce8d80d
|
Moved folders to website directory
|
2015-02-03 14:10:55 -06:00 |
|