 Tyler Renelle
|
f35df8a47f
|
[#1726] remove updateTasks() batch api route. That's not how we're using
batch (we'll create a proper batch route & document later), and we
shouldn't support this route
|
2013-11-08 14:01:29 -08:00 |
|
|
Tyler Renelle
|
5f9d3991ac
|
[#1766] remove "trigger next day" option
|
2013-11-08 13:54:29 -08:00 |
|
|
Matteo Pagliazzi
|
daf33f9174
|
remove console.log
|
2013-11-08 22:37:40 +01:00 |
|
|
Matteo Pagliazzi
|
9f326e7433
|
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
|
2013-11-08 22:34:28 +01:00 |
|
|
Matteo Pagliazzi
|
3a332c4c45
|
port beastMaster achievement, @lefnire shown client side but not set, using user.pre("save") for setting
|
2013-11-08 22:33:48 +01:00 |
|
|
Tyler Renelle
|
8e8d88376c
|
Merge pull request #1765 from Shaners/patch-4
Update Inventory Hatching Instructions
|
2013-11-08 12:40:45 -08:00 |
|
|
Shane Lister
|
64ed414ae6
|
Update inventory.jade
|
2013-11-08 10:53:28 -08:00 |
|
|
Shane Lister
|
30e4dbcb98
|
Update Hatching Instructions
On behalf of @bobbyroberts99
|
2013-11-08 10:43:22 -08:00 |
|
|
Tyler Renelle
|
4b35551afc
|
confirm "trigger new day"
|
2013-11-08 09:18:03 -08:00 |
|
|
Tyler Renelle
|
4e668a7de4
|
contrib: heroic at (8)
|
2013-11-08 08:51:33 -08:00 |
|
|
Matteo Pagliazzi
|
4a1ed7006e
|
remove comment
|
2013-11-08 17:49:30 +01:00 |
|
|
Matteo Pagliazzi
|
daac0a4b04
|
show but disable challenge daily days, fix #1758
|
2013-11-08 17:42:45 +01:00 |
|
|
Matteo Pagliazzi
|
d419db68f2
|
typo, fix #1761
|
2013-11-08 17:23:17 +01:00 |
|
|
Matteo Pagliazzi
|
03905ef90b
|
solve conflicts 3
|
2013-11-08 17:09:06 +01:00 |
|
|
Matteo Pagliazzi
|
e1b86c64a6
|
solve conflicts 2
|
2013-11-08 17:08:23 +01:00 |
|
|
Matteo Pagliazzi
|
02651d52a4
|
solve conflict
|
2013-11-08 17:05:03 +01:00 |
|
|
Matteo Pagliazzi
|
a78297f129
|
update chat if necessary after new message posted or deleted
|
2013-11-08 17:03:10 +01:00 |
|
|
Tyler Renelle
|
06d1f77ce5
|
contribu: cleanup tavern, add legend for contrib tiers
|
2013-11-07 17:25:58 -08:00 |
|
|
Tyler Renelle
|
4454cc502b
|
contrib: only show contrib alert if they've gained, not lost
|
2013-11-07 14:22:56 -08:00 |
|
|
Tyler Renelle
|
ade25c47c1
|
Merge branch 'contrib' into develop
|
2013-11-07 13:52:04 -08:00 |
|
|
Tyler Renelle
|
7c94b4b6d3
|
contrib: add contributor achievement modal
|
2013-11-07 13:42:29 -08:00 |
|
|
Tyler Renelle
|
7fe4f31a16
|
contrib: show profile._id in modal so admins can assign contrib status
|
2013-11-07 13:05:34 -08:00 |
|
|
Tyler Renelle
|
a886c178b2
|
contrib: add migration to help me start porting existing contribs
|
2013-11-07 12:47:33 -08:00 |
|
|
Tyler Renelle
|
962cf9a3be
|
contrib: add name-tag colors based on contributor level
|
2013-11-07 12:23:12 -08:00 |
|
|
Matteo Pagliazzi
|
a5999a7be3
|
fix tests
|
2013-11-07 20:27:21 +01:00 |
|
|
Tyler Renelle
|
f61c35975a
|
contrib: award profile Dragon-Hydra if admin sets level >= 6
|
2013-11-06 17:47:00 -08:00 |
|
|
Tyler Renelle
|
e387ee9d13
|
Merge remote-tracking branch 'Shaners/patch-3' into contrib
Conflicts:
views/options/pets.jade
|
2013-11-06 17:40:02 -08:00 |
|
|
Tyler Renelle
|
8646783aa1
|
contrib: equipped functions to use habitrpg-shared@959024d
|
2013-11-06 17:16:17 -08:00 |
|
|
Tyler Renelle
|
d679fa1e62
|
contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor
|
2013-11-06 15:59:56 -08:00 |
|
|
Matteo Pagliazzi
|
3b18c322bc
|
return whole group.chat after chat message is sent
|
2013-11-06 21:27:24 +01:00 |
|
|
Matteo Pagliazzi
|
5ebab59780
|
return 204 on group.update
|
2013-11-06 21:19:23 +01:00 |
|
|
Matteo Pagliazzi
|
36e45a36a2
|
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
|
2013-11-06 20:33:10 +01:00 |
|
|
Matteo Pagliazzi
|
a4951e151c
|
use $resource class methods to avoid sending whole model to server & reduce some responses
|
2013-11-06 20:31:39 +01:00 |
|
|
Matteo Pagliazzi
|
ffd119b16d
|
invited consistent with members
|
2013-11-06 20:31:00 +01:00 |
|
|
Matteo Pagliazzi
|
0e48cb483a
|
put route for group.update
|
2013-11-06 20:30:29 +01:00 |
|
|
Matteo Pagliazzi
|
abbf09eaaa
|
remove console.log
|
2013-11-06 20:18:59 +01:00 |
|
|
Matteo Pagliazzi
|
21509047bb
|
ops, jquery.cookie is used by bootstrap-tour!
|
2013-11-06 20:12:58 +01:00 |
|
|
Tyler Renelle
|
22b70b9a0a
|
add message about clearing completed todos if length>100
|
2013-11-05 18:40:23 -08:00 |
|
|
Tyler Renelle
|
3dde30076c
|
[#1726] fix PUT /api/v1/user/tasks/:tid . Something was really strange
when fully overriding an embedded mongoose doc, still don't know what
the issue was...
|
2013-11-05 17:43:43 -08:00 |
|
|
Tyler Renelle
|
188db745fc
|
allow users to trigger "missed day" manually from Restore modal
|
2013-11-05 17:43:43 -08:00 |
|
|
Tyler Renelle
|
1d5296880b
|
Merge pull request #1750 from HabitRPG/paglias/build-manifest
Paglias/build manifest
|
2013-11-05 10:29:12 -08:00 |
|
|
Matteo Pagliazzi
|
fbf57bde66
|
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
|
2013-11-05 19:24:36 +01:00 |
|
|
Matteo Pagliazzi
|
5b9002820f
|
replace express.bodyParser with express.json & express.urlencoded since it is deprecated in connect 3.0
|
2013-11-05 19:24:11 +01:00 |
|
|
Tyler Renelle
|
2c2613ce42
|
allow editing tag & task.tag even if in challenge
|
2013-11-05 09:49:01 -08:00 |
|
|
Tyler Renelle
|
ee35d16f4d
|
temporary log-suppressing so i can diagnose live a bit better
|
2013-11-05 09:34:09 -08:00 |
|
|
Tyler Renelle
|
cde3bb4c69
|
user._v & group._v fixes
|
2013-11-04 13:43:24 -08:00 |
|
|
Matteo Pagliazzi
|
d0c29eba78
|
move js & css files to public/manifest.json, allow for stylus files editing without restarting server on development, removed hashres from dev build
|
2013-11-04 22:13:03 +01:00 |
|
|
Tyler Renelle
|
c6634b5539
|
temp migration to remove invalid due dates since npmjs is down
|
2013-11-04 12:19:56 -08:00 |
|
|
Tyler Renelle
|
3e6eaf6f2f
|
sanitize challenge update
|
2013-11-04 12:19:40 -08:00 |
|
|
Matteo Pagliazzi
|
54225d38f1
|
re-add angular-resource
|
2013-11-04 20:29:30 +01:00 |
|