03905ef90b
solve conflicts 3
2013-11-08 17:09:06 +01:00
e1b86c64a6
solve conflicts 2
2013-11-08 17:08:23 +01:00
02651d52a4
solve conflict
2013-11-08 17:05:03 +01:00
a78297f129
update chat if necessary after new message posted or deleted
2013-11-08 17:03:10 +01:00
4454cc502b
contrib: only show contrib alert if they've gained, not lost
2013-11-07 14:22:56 -08:00
7c94b4b6d3
contrib: add contributor achievement modal
2013-11-07 13:42:29 -08:00
962cf9a3be
contrib: add name-tag colors based on contributor level
2013-11-07 12:23:12 -08:00
f61c35975a
contrib: award profile Dragon-Hydra if admin sets level >= 6
2013-11-06 17:47:00 -08:00
d679fa1e62
contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor
2013-11-06 15:59:56 -08:00
3b18c322bc
return whole group.chat after chat message is sent
2013-11-06 21:27:24 +01:00
5ebab59780
return 204 on group.update
2013-11-06 21:19:23 +01:00
a4951e151c
use $resource class methods to avoid sending whole model to server & reduce some responses
2013-11-06 20:31:39 +01:00
0e48cb483a
put route for group.update
2013-11-06 20:30:29 +01:00
abbf09eaaa
remove console.log
2013-11-06 20:18:59 +01:00
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
1d5296880b
Merge pull request #1750 from HabitRPG/paglias/build-manifest
...
Paglias/build manifest
2013-11-05 10:29:12 -08:00
fbf57bde66
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-05 19:24:36 +01:00
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
ee35d16f4d
temporary log-suppressing so i can diagnose live a bit better
2013-11-05 09:34:09 -08:00
cde3bb4c69
user._v & group._v fixes
2013-11-04 13:43:24 -08:00
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
3e6eaf6f2f
sanitize challenge update
2013-11-04 12:19:40 -08:00
15d9e33252
[ #1745 ] task.date as string instead of date
2013-11-04 09:12:32 -08:00
7161ddf70e
bug fix on saving chal
2013-11-04 09:08:30 -08:00
774ded9fb2
fix #1740
2013-11-04 15:17:09 +01:00
b7479e7839
use $elemMatch for better performance on fetching challenge participants
2013-11-04 00:27:44 -08:00
0d6d20b939
[ #1740 ] temp workaround to chat duplication
2013-11-03 23:39:09 -08:00
c9776b8857
fix to deleting chat message
2013-11-03 23:30:09 -08:00
aa8cdfb198
bug fix to challenge.tasks._id out of sync
2013-11-03 22:47:20 -08:00
452c4e1ece
[ #1729 ] move most chal-user syncing logic to their models rather than
...
controllers. don't sync task.value or task.history over to user on
challenge.join()! some work-arounds for the task._id/id mismatch (still
not perfect, need to work on some more)
2013-11-03 22:33:53 -08:00
7060f75c83
[ #1741 ] remove _id from TaskSchema (we're too deep in our legacy task.id
...
requirement, we can revisit later)
2013-11-03 21:17:33 -08:00
14fac02a52
[ #1738 ] add due date to taskSchema
2013-11-03 17:53:51 -08:00
7e811b9998
safety-check task removal
2013-11-02 18:29:53 -07:00
62012a1052
fix adding challenges as subdoc to groups. write migration to restore those that have been created. Also in migration fix missing task.ids (taskSchema issue)
2013-11-02 18:05:14 -07:00
c5d3d142d9
[ #1711 ] taskSchema back to doc so we can use .id(). The performacne hit isn't
...
drastic, it was the history entries that was hurting us
2013-11-02 17:09:24 -07:00
e84aa13d62
fix reroll
2013-11-02 16:58:24 -07:00
ba8a8d2494
add .id back to task schema
2013-11-02 16:40:00 -07:00
8a9059aabf
[ #1723 ] send down pets array for clicked members for now (we'll eventually want to just
...
send count(items.pets) for better performance)
2013-11-02 16:22:42 -07:00
989bdc245b
challenges: fix adding new tasks on update
2013-11-02 15:19:56 -07:00
838108d579
[ #1711 ] got it! task.*.history & user.history as defined schemas was the
...
problem, since they're arrays of >100 each
2013-11-02 12:49:08 -07:00
01536a2e29
Revert "[ #1711 ] back to Schema.Types.Mixed for user.tasks, this makes me sad :("
...
This reverts commit c0292d0842
2013-11-02 12:24:05 -07:00
c0292d0842
[ #1711 ] back to Schema.Types.Mixed for user.tasks, this makes me sad :(
2013-11-02 11:41:34 -07:00
f784e2a0d2
remove blank line
2013-11-02 15:55:28 +01:00
567b69a0f1
fix #1669
2013-11-02 15:54:10 +01:00
3fa023452f
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-02 09:56:32 +01:00
0a6eefe5c1
[ #1718 ] order of operations on group check. (false && false || true) ==
...
true... am I just a n00b?
2013-11-02 01:54:54 -07:00
b08a30a76b
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-02 09:54:44 +01:00
5a103db716
upgrade lodash to 2.2.1
2013-11-02 09:52:48 +01:00
08498e37ac
[ #1718 ] don't 404 for group not found
2013-11-02 01:38:51 -07:00
8ae75e09c5
[ #1716 ] use ui-router to collapse challenge participants (WIP)
2013-11-01 23:46:14 -07:00
Matteo Pagliazzi