 kholliday
|
11f61c2732
|
Add functionality to dequip all Battle Gear or Cosutme.
|
2015-03-05 09:40:37 -06:00 |
|
|
kholliday
|
f28bc31a2c
|
Added dequip ability per ticket: 3730
|
2015-03-04 21:43:17 -06:00 |
|
|
Blade Barringer
|
cbc49829c8
|
Merge branch 'food_tray_padding' of https://github.com/kangabell/habitrpg into food-tray
|
2015-02-26 14:08:17 -06:00 |
|
|
Blade Barringer
|
e9b72ad40d
|
Merge pull request #4721 from crookedneighbor/fix-challenge-select-ios
Fixes #4719. Guild select for challenges pre-populates with first group
|
2015-02-23 22:09:17 -06:00 |
|
|
Matteo Pagliazzi
|
4da8eb1d58
|
fix(typo)
|
2015-02-23 21:51:15 +01:00 |
|
|
Matteo Pagliazzi
|
4151b0733f
|
add ability to unsubscribe from a single event using a dedicated link
|
2015-02-23 21:25:01 +01:00 |
|
|
Blade Barringer
|
98ecd4b457
|
Fixes #4719. Guild select for challenges pre-populates with first group
|
2015-02-19 16:53:15 -06:00 |
|
|
Bill Parrott
|
98c6526cf7
|
add auto-focus when single/multiple is toggled
|
2015-02-19 08:46:45 -06:00 |
|
|
Bill Parrott
|
3599eaefaf
|
Merge branch 'develop' into bulk-add-tasks
|
2015-02-17 22:32:28 -06:00 |
|
|
Blade Barringer
|
44b9ac7215
|
Fixed path to audio files. Closes #4704
|
2015-02-17 13:53:32 -06:00 |
|
|
Blade Barringer
|
6c85cd18a9
|
Adjusted style of bulk tasks
|
2015-02-17 08:37:26 -06:00 |
|
|
Blade Barringer
|
48e688d815
|
Merge branch 'bulk-add-tasks' of https://github.com/chimericdream/habitrpg into bulk-add
|
2015-02-17 08:05:36 -06:00 |
|
|
Bill Parrott
|
2de3a5dd55
|
first draft of bulk add
|
2015-02-17 00:25:56 -06:00 |
|
|
Bill Parrott
|
b1b478bc74
|
add task export functionality
|
2015-02-16 21:21:49 -06:00 |
|
|
Sabe Jones
|
130261dacf
|
feat(event): End Valentine's
|
2015-02-16 18:15:09 -06:00 |
|
|
Blade Barringer
|
0858b871ff
|
Closes #4693
|
2015-02-16 16:04:51 -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
|
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
|
a1568b0c32
|
Corrected title on readme
|
2015-02-09 19:10:59 -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
|
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
|
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
|
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 |
|