sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-01 23:40:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3529 commits 3 branches 0 tags 1.6 GiB
Commit graph

3529 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Matteo Pagliazzi
fadce5b3be remove sticky that is not used it seems 2013-11-04 19:45:03 +01:00
Matteo Pagliazzi
c16fa8ccf2 add restangular 2013-11-04 19:36:45 +01:00
Matteo Pagliazzi
2fb83c5b6f bower remove jquery cookie & reorganize 2013-11-04 19:32:16 +01:00
Tyler Renelle
15d9e33252 [#1745] task.date as string instead of date 2013-11-04 09:12:32 -08:00
Tyler Renelle
7161ddf70e bug fix on saving chal 2013-11-04 09:08:30 -08:00
Matteo Pagliazzi
63b4e5152e better fix #1740 2013-11-04 15:21:05 +01:00
Matteo Pagliazzi
774ded9fb2 fix #1740 2013-11-04 15:17:09 +01:00
Tyler Renelle
f467dcb3c9 [#1712] restore streaks, values, dates, tags that got lost in the 
challenges migration
 2013-11-04 01:41:23 -08:00
Tyler Renelle
4f52c7e15d [#1722] have to click twice for options.profile.profile 2013-11-04 00:41:16 -08:00
Tyler Renelle
b7479e7839 use $elemMatch for better performance on fetching challenge participants 2013-11-04 00:27:44 -08:00
Tyler Renelle
0d6d20b939 [#1740] temp workaround to chat duplication 2013-11-03 23:39:09 -08:00
Tyler Renelle
c9776b8857 fix to deleting chat message 2013-11-03 23:30:09 -08:00
Tyler Renelle
aa8cdfb198 bug fix to challenge.tasks._id out of sync 2013-11-03 22:47:20 -08:00