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

3275 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
42534b5233 [#1792] put purchased limited skins back on avatar tab 2013-11-11 08:21:29 -08:00
Tyler Renelle
cde96bf28b halloween: take down halloween skins 2013-11-11 00:27:20 -08:00
Tyler Renelle
72f64fa85c [#1751] /challenges/:cid/:mid task filtering by "in this challenge" at 
application level, not Mongo. $elemMatch doesn't support returning
multiple items, see http://goo.gl/MxmWdQ & http://goo.gl/Iku44w
 2013-11-10 23:41:42 -08:00
Tyler Renelle
9fbb45c253 halloween: bailey notif for last day of spooky skins 2013-11-10 18:13:22 -08:00
Matteo Pagliazzi
e711258ced advanced options not shown for rewards, shown but not editable for challenges 2013-11-10 17:35:29 +01:00
Tyler Renelle
ddd45d76d4 contrib: fix to upping lvl 0 contrib 2013-11-09 13:24:03 -08:00
Tyler Renelle
66041442da Merge pull request #1770 from snicker/develop 
updated README to show initial seeding tasks, and fixed a small typo
 2013-11-09 13:19:31 -08:00
Tyler Renelle
be7a686657 Merge pull request #1777 from HabitRPG/sabe_tweak 
Challenges are no longer an upcoming feature!
 2013-11-09 12:25:31 -08:00
Sabe Jones
ce1461f0e9 Challenges are no longer an upcoming feature! 
Wording tweaks to guild creation text.
 2013-11-09 13:34:14 -06:00
Matteo Pagliazzi
de1f056af8 typo 2013-11-09 19:32:47 +01:00
Matteo Pagliazzi
e198bac475 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-09 19:31:50 +01:00
Matteo Pagliazzi
aff43acc84 fix #1769 2013-11-09 19:31:28 +01:00
Tyler Renelle
8c83bc6ad2 challenges: "close" => "end challenge", move outside of edit 2013-11-09 09:37:31 -08:00
Nick Gordon
d802c502b0 updated README to show initial seeding tasks, and fixed a small typo 2013-11-09 08:48:38 -08:00
Tyler Renelle
20cac379cf pretty up our bailey notifs 2013-11-08 20:05:12 -08:00
Tyler Renelle
f868bcae66 contrib: more enticing bailey announcement 2013-11-08 19:42:13 -08:00
Tyler Renelle
14be0b11c6 contrib: add bailey announcement 2013-11-08 19:28:07 -08:00
Tyler Renelle
242bcda96a contrib: remove gems from admin section, update automatically when they 
increase a level
 2013-11-08 19:28:07 -08:00
Tyler Renelle
c0d36f13ef contrib: links to wikia in tavern & popup 2013-11-08 19:28:07 -08:00
Tyler Renelle
5d6b6c1f2a Merge pull request #1768 from bobbyroberts99/develop 
Minor edits to stable.jade
 2013-11-08 18:21:43 -08:00
Bob Steffes
8773e8ee88 Minor edits 
Fix a runon sentence, add a space after a comma and change adventure to
venture by your side.

Happy note, I finally got my local copy running. Needed to edit
config.json with my actual settings.
 2013-11-08 17:40:23 -08:00
Bob Steffes
dd2e8144bb Revert "Minor edits" 
This reverts commit 43bb1bf485.
 2013-11-08 17:15:03 -08:00
Bob Steffes
43bb1bf485 Minor edits 
Add a space at of sentence and fix run.
 2013-11-08 17:01:24 -08:00
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