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
3578 commits 3 branches 0 tags 1.6 GiB
Commit graph

226 commits

Author SHA1 Message Date
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
bfbc907fa1 mounts: show when selectedFood by green-circle highlighting pets 2013-11-10 22:53:20 -08:00
Tyler Renelle
e6f524fce2 mounts: much cleaner inventory interface. Replace text (underneath) with 
gem cost. Use popover instead of tooltip, show item.text & item.notes
for more details than before (especially useful for saddle). Screenshot: http://goo.gl/0AfLfG
 2013-11-10 20:03:54 -08:00
Tyler Renelle
543635dd37 mounts: change growth-points requirement to 50 (@lemoness) 2013-11-10 19:20:34 -08:00
Tyler Renelle
05c3e71a92 mounts: fixes to starter food css 2013-11-10 19:18:06 -08:00
Tyler Renelle
4f2a4b1f02 mounts: rare mounts html fix 2013-11-10 17:17:24 -08:00
Tyler Renelle
244fe63bdd mounts: add support for rare mounts 2013-11-10 14:36:40 -08:00
Tyler Renelle
284114c056 mounts: counting bug fixes, put pets & mounts in tabs 2013-11-10 12:28:08 -08:00
Tyler Renelle
085919c000 mounts: update all html & javascript to support UserSchema overhaul (60421a8). Also add very basic feeding & saddling mounts functionality. use progress bars to indicate pet feeding progress 2013-11-10 11:04:41 -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
Tyler Renelle
8c83bc6ad2 challenges: "close" => "end challenge", move outside of edit 2013-11-09 09:37:31 -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
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
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
4e668a7de4 contrib: heroic at (8) 2013-11-08 08:51:33 -08:00
Tyler Renelle
06d1f77ce5 contribu: cleanup tavern, add legend for contrib tiers 2013-11-07 17:25:58 -08:00
Tyler Renelle
962cf9a3be contrib: add name-tag colors based on contributor level 2013-11-07 12:23:12 -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
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
ffd119b16d invited consistent with members 2013-11-06 20:31:00 +01:00
Matteo Pagliazzi
774ded9fb2 fix #1740 2013-11-04 15:17:09 +01:00
Tyler Renelle
427a70e76d [#1731] update guild gems wording 2013-11-03 18:30:50 -08:00
Tyler Renelle
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
Tyler Renelle
646a5c942b [#1716 #1705] working modal for challenge.participants.stats! also don't 
scroll to top of page. We'll want to test that this doesn't break
anything else in the app, @paglias looks like the guys on that thread
felt pretty dirty about this workaround for some reason
 2013-11-02 16:07:12 -07:00
Matteo Pagliazzi
9454a3a629 should help performances, it inserted the whole group leader object into the profile attr 2013-11-02 12:40:36 +01:00
Tyler Renelle
8ae75e09c5 [#1716] use ui-router to collapse challenge participants (WIP) 2013-11-01 23:46:14 -07:00
Tyler Renelle
65b18f3af1 [#1711] limit number of members that get sent down with group, limit profile 
fields sent down
 2013-11-01 19:27:08 -07:00
Matteo Pagliazzi
f7dba5f323 avoid reloading for group operations 2013-11-01 21:08:36 +01:00
Tyler Renelle
4b4a043a5f [#1685] add help popover to explain challenge task coloring / charts 2013-11-01 11:09:49 -07:00
Matteo Pagliazzi
3562079ba6 small design tweaks, fix #1682 2013-11-01 18:33:50 +01:00
Tyler Renelle
dfeae89a07 challenges: minimum 1 gem for public challenges 2013-10-31 19:30:07 -07:00
Tyler Renelle
58fa97fb19 challenges: shortcode for tag names & task tooltips 2013-10-31 18:18:34 -07:00
Tyler Renelle
b3804c4d1f [#1675] fixes to populating Group.challenges, and display challenges in party 
page. I'm not sure about having challenges as a subdoc anymore, i think
it will be better performance and maintenance if we just reference
Challenge.group/members and remove User.challenges & Group.challenges
 2013-10-31 16:20:48 -07:00
Tyler Renelle
14b5044fd7 [#1695] add access control to update/deleting challenges 2013-10-31 15:32:30 -07:00
Tyler Renelle
39821752fa challenges: move options/challenges to options/social/challenges 2013-10-31 14:37:04 -07:00
Tyler Renelle
012dabf8b6 challenges: visually collapse members list (still loads the full thing, revisit later) 2013-10-31 14:26:48 -07:00
Tyler Renelle
4a442d924e challenge: small tweaks on descriptions 2013-10-31 14:16:01 -07:00
Tyler Renelle
d5e78266e5 challenge prize: various fixes. Woo, challenge prizes work now! 
@sabrecat @lemoness @wc8 (still some bugs & cleanup, but it's mostly there)
 2013-10-31 14:06:18 -07:00
Tyler Renelle
f6ebd9997e challenge gems: popover for closing (delete or select winner) 2013-10-31 13:26:18 -07:00
Tyler Renelle
13fa947c57 challenge prize: add to challenge creation form (including min/max validation) 2013-10-31 11:44:50 -07:00
Tyler Renelle
6c63608f83 [#1681] add chal.description on creation form 2013-10-31 10:46:25 -07:00
Tyler Renelle
0892f93b75 [#1683] typo 2013-10-31 10:21:36 -07:00
Tyler Renelle
398c52f3b0 [#1683] ugly workaround to fix save/delete/cancel flashing. Problem is 
$scope.challenge isn't resolved yet, so ._locked isn't set
immediately. Well we could use $state.resolve instead of
$state.controller, but it's just not resolving (ui-router not working
with ng-resoure?)
 2013-10-31 10:14:46 -07:00
Tyler Renelle
1420fe8c03 Merge pull request #1694 from bobbyroberts99/patch-1 
Clarify pet hatching instructions
 2013-10-31 09:39:38 -07:00
Matteo Pagliazzi
904677e3a6 try to limit need to refresh after party operations, @lefnire this is only for parties and I got it working only for removeMember and leave party because I could not get join & create working 2013-10-31 17:35:04 +01:00
bobbyroberts99
5b09bd30b4 Clarify pet hatching instructions 
This is my first PR. Hope I'm in the right place.
 2013-10-31 09:34:43 -07:00
Shane Lister
afcd2b3803 Rare Pets Layout 
Shows rare pets header always.

Shows golden missing rare pet graphic if Hydra not obtained with link to how to obtain it.
 2013-10-30 23:10:03 -07:00
Tyler Renelle
28cdeb0ac6 challenges: fixed joining / leaving groups. Back to the old method of Group.query({type:'public'}), etc - since ngResource can only work with top-level objects. This approach is bad performance (two calls), I'll fix when I can think of a better way of organizing groups requested at GET /groups 2013-10-30 14:50:49 -07:00
Matteo Pagliazzi
2cd4bbb0ec use profile.name for invited users 2013-10-30 15:54:39 +01:00
Tyler Renelle
ea54f0aa75 challenges: implement basic filters on challenges tab 2013-10-30 01:21:44 -07:00
Tyler Renelle
d116ac7b81 challenges: lots of misc. bug fixes 2013-10-29 22:30:58 -07:00
Tyler Renelle
6e71a76e22 challenges: back to dealing with taskLists from scopes, rather than the 
habitrpg-tasks directive. Was having trouble accessing it by reference
otherwise. Would love to move off of the directive entirely and use
ng-include instead, but some scope issues with lists
 2013-10-29 19:07:39 -07:00
Tyler Renelle
02ebc536ca challenges: get Challenges (mostly) working along the same ui-router 
principles as groups. Having some $scope variable resolution timing issues
 2013-10-29 17:49:49 -07:00
Tyler Renelle
77fee06fdb gMerge branch 'challenges' into develop 
Conflicts:
	migrations/20131028_cleanup_deleted_tags.js
	src/controllers/groups.js
	views/options/groups/group.jade
	views/options/profile.jade
 2013-10-29 15:38:47 -07:00
Tyler Renelle
d9d769a0e1 challenges: much better implemntation of ui-router for nested groups. No 
need to specify fields or populate members at /groups - instead, provide
that functionality at /groups/:gid
 2013-10-29 15:25:50 -07:00
Tyler Renelle
be657a76e0 challenges: pass down if user is member of group (group._isMember) for 
performance. some bug fixes
 2013-10-29 12:26:13 -07:00
Matteo Pagliazzi
fd952701db groups, list users invited with ability to remove their invitation, @lefnire i used group.invites from Group Schema which was already defined but not used by anything, fix #1523 2013-10-29 18:01:01 +01:00
Matteo Pagliazzi
6af71f0e44 better group invite handling 2013-10-29 16:50:28 +01:00
Tyler Renelle
219318b405 challenges: remove username(), since we're now using user.profile.name 2013-10-28 18:20:21 -07:00
Tyler Renelle
c5671550f1 challenges: add group.memberCount and ability to specifiy field projections in GET request /api/v1/groups?type=guild&fields=name,description,chat 2013-10-28 18:20:02 -07:00
Matteo Pagliazzi
633ce62313 set back some derby code 2013-10-28 22:24:13 +01:00
Matteo Pagliazzi
36229ac44c port assign group leader 2013-10-28 22:21:18 +01:00
Matteo Pagliazzi
5744146ff6 port group websites 2013-10-28 21:58:38 +01:00
Tyler Renelle
35c4a62de0 challenges: switch from ngRoute to ui-router 2013-10-28 11:34:08 -07:00
Tyler Renelle
f178eb2322 challenges: better lock-down on member's tasks (remove actionable items 
except stats)
 2013-10-28 11:34:08 -07:00
Tyler Renelle
d62586ef0a challenges: stats setup 2013-10-28 11:34:08 -07:00
Tyler Renelle
a078889d58 challenges: sync score to challenge, lotsa bug fixes 2013-10-28 11:34:07 -07:00
Tyler Renelle
e52d0a156a challenges: better syncing of new, updated, & deleted tasks from 
challenge to user. start with task.challenge.broken code
 2013-10-28 11:34:07 -07:00
Tyler Renelle
d60a56432f challenges: better unlinkig of tasks on unsubscribe 2013-10-28 11:34:07 -07:00
Tyler Renelle
fa25f3d300 challenges: WIP beginning challenges feature. some basic CRUD & some 
basic subscribe / unsubscribe functional (but buggy)
 2013-10-28 11:34:07 -07:00
Tyler Renelle
e45d8307e7 Subdocs & script templates. Migrate the API from User.tasks => 
User.habits/dailys/todos/rewards. Move /#/tasks & /#/options page
loading from server-sent html to everything loaded in the page as script
templates (including necessary fixes for adsense). NOTE: this commit
won't work, it depends a bit on the *next* commit with Challenges
functionality, but I wanted to separate it out a bit for clarity
 2013-10-28 11:34:07 -07:00
Tyler Renelle
e81193ef28 challenges: pull in updates from the old 0.5 branch 2013-10-28 11:34:07 -07:00
Matteo Pagliazzi
e0c95b3a86 port member modal to group members list, fix #1656 2013-10-28 18:27:03 +01:00
Matteo Pagliazzi
23c3bcfa32 add ability to group leader to remove members, fix #1639 2013-10-28 17:10:29 +01:00
Shane Lister
d7b24883b4 Update pets.jade 2013-10-27 19:21:40 -07:00
Shane Lister
d2af7a442a Add Contributor Only Pet Choice 
This PR https://github.com/HabitRPG/habitrpg-shared/pull/33 should completed before this one.
 2013-10-26 19:56:18 -07:00
Shaners
5fa398780f Adds red hair option for web. 2013-10-24 00:03:09 -07:00
Tyler Renelle
619a15b316 gem icon for unlock-set as well 2013-10-22 19:33:55 -07:00
Tyler Renelle
077850b172 halloween: explicit gems instead of 'G' 2013-10-22 19:22:32 -07:00
Tyler Renelle
e7886e00b4 halloween: highlght limited skins, add description about limited, rename 
to "rainbow" and "spooky" @lemoness
 2013-10-22 17:56:46 -07:00
Tyler Renelle
2c1d8e1688 halloween: functional new skins for female sprites (requires habitrpg-shared@d7482fe) 2013-10-22 14:32:51 -07:00
Tyler Renelle
6f32ac2a24 halloween: purchase full set 2013-10-22 13:59:30 -07:00
Tyler Renelle
d184237c79 halloween: begin adding mechanic for the special skins 2013-10-22 13:24:31 -07:00
Tyler Renelle
2cf814acd6 drops: description on combining eggs/potions, selling to 
alex. de-selectable drops. sell in a button of alex's dialog
 2013-10-19 23:44:03 -07:00
Tyler Renelle
c882525150 eggs: add ability to sell potions / eggs 2013-10-19 20:04:26 -07:00
Tyler Renelle
017398eb83 eggs: some cleanup and passing around of $index so we can retrieve 
egg/pot value
 2013-10-19 19:58:11 -07:00
Tyler Renelle
378d158a44 pegs: restructure inventory/market html so we market is aware of 
inventory and we can sell items
 2013-10-19 19:36:59 -07:00
Tyler Renelle
be624a03b0 pets: basic framework for selecting both eggs & potions. now it shows which is hatchable with green background, setting up for selling eggs 2013-10-19 19:30:39 -07:00
Matteo Pagliazzi
066364e3c9 fix refresh chat button sending message 2013-10-16 21:36:56 +02:00
Matteo Pagliazzi
a56242d1a7 working chat refresh button 2013-10-16 21:02:57 +02:00
Matteo Pagliazzi
68426c7ccb profile edits saved only on click 2013-10-13 20:47:59 +02:00
Matteo Pagliazzi
c3086c6194 fix not showing veteran wolf 2013-10-13 19:40:07 +02:00
Tyler Renelle
43be09a5d5 Merge pull request #1575 from Shaners/newSkin 
New skin tones
 2013-10-04 15:27:09 -07:00
Andre Casey
b3c3aeab05 Fixes #1556. Removed HTML code in popover for now. 2013-10-03 16:49:15 -07:00
Matteo Pagliazzi
bb8bbe4e0f remove stable flickering, fixes #1557 2013-09-29 16:43:01 +02:00