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

321 commits

Author SHA1 Message Date
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
Dušan Juretić
602c78c1be show egg and potion count in inventory 2013-09-28 11:52:51 -04:00
Shane Lister
91c9e5627f Update profile.jade 
Reorder and add new skin choices.
 2013-09-26 23:23:30 -07:00
Matteo Pagliazzi
8540e2f59b show group gems popover 2013-09-19 19:04:32 +02:00
Matteo Pagliazzi
86b3ca5d6b remove duplicate tooltip 2013-09-18 17:41:23 +02:00
Dušan Juretić
c6472bc615 fix hardcoded total pets count 2013-09-18 11:07:23 -03:00
Dušan Juretić
daa06943ab fix user profile websites show/hide conditions 2013-09-16 22:59:08 -03:00
Dušan Juretić
64edf31eb4 show hatching potion selector after buying an egg 2013-09-15 16:40:20 -03:00
Matteo Pagliazzi
0786fe90f9 add market prices, fix #1511 2013-09-12 19:16:01 +02:00
Matteo Pagliazzi
bf83291e0a add fix for joining guild 2013-09-11 16:32:56 +02:00
Matteo Pagliazzi
8e377d7343 fix various guilds issues 2013-09-11 16:28:14 +02:00
Tyler Renelle
a7e99d0ac0 [#1396] add ability to show tour at any time. Also add ability to show 
Bailey at any time
 2013-09-10 18:36:10 -04:00
Tyler Renelle
ddf700d930 misc chat-box tweaks 2013-09-09 18:28:46 -04:00
Tyler Renelle
8cc96422f6 inline modal for tavern too 2013-09-09 18:04:42 -04:00
Tyler Renelle
e1828153dd [#1489] add edit-gropu server route, basic editing of group info for now (with markdown!) 2013-09-09 17:09:45 -04:00
Tyler Renelle
f5b1748d60 [#1489] use always-visible modals (what will be Panels in BS3) instead of 
accordion. Accordions giving me headache
 2013-09-09 16:34:41 -04:00
Tyler Renelle
09963ee30a [#1489] WIP start adding group edit. remove angular-ui-bootstrap accordion as it 
was causing problems.
 2013-09-09 16:15:57 -04:00
Tyler Renelle
774fa4f645 use marked instead of showdown, it's more performant and allows us to 
sanitize the content
 2013-09-09 14:06:36 -04:00
Tyler Renelle
6e800ea2d9 use markdown for profile-editing. Add save button. will remove linky 
once everything's in markdown
 2013-09-09 13:27:25 -04:00
Tyler Renelle
3929c789d1 [#1479] fix to modals showing your own achievemetns (controller-scoping issue) 2013-09-09 10:30:17 -04:00
Tyler Renelle
55dffcc317 [#1476] re-order "you already have this combo" message to bail early 2013-09-08 22:42:59 -04:00
Tyler Renelle
5e51148f8e [#1477] port settings modals to jade, implemented restore 2013-09-08 13:23:37 -04:00
Tyler Renelle
aad034564e [#1459] add profile-editing (note, it requires bluring the input fields for 
changes to go through - this is a pretty assuming solution, but I doubt it
will cause problems)
 2013-09-08 12:28:06 -04:00
Tyler Renelle
0b34b41bbe fix to toggle helm 2013-09-08 11:39:30 -04:00
Matteo Pagliazzi
c9f3d3029c delete chat message 2013-09-08 17:22:03 +02:00
Tyler Renelle
a960d310f7 [#1465] allow clicking self for modal 2013-09-07 13:59:49 -04:00
Tyler Renelle
69faa27f68 [#1465] bug fixes to achievements listing 2013-09-07 13:38:43 -04:00
Tyler Renelle
91d1cdf361 [#1465] add member modals back in. Not all info is present, just a bit more 
work. Can now click guild & tavern members! does lazy-loading of members
so we don't have to load all their information at once
 2013-09-07 12:45:39 -04:00
Tyler Renelle
de0cdda833 remove extra "npc" from chat message 2013-09-06 21:18:41 -04:00
Tyler Renelle
5113ed192a add GET /groups/:gid, champ/elite/master tiers, chat sync button 2013-09-06 21:03:44 -04:00
Tyler Renelle
997b2b8ae4 Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite 2013-09-06 09:55:36 -04:00
Tyler Renelle
e6d61d1145 [#1446] add change-password back in 2013-09-06 09:55:24 -04:00
Matteo Pagliazzi
b477b0768a add space between user, message and data in tavern 2013-09-06 09:58:18 +02:00
Tyler Renelle
4ea6a8e57f [#1439] target='_blank' on links 2013-09-06 00:39:29 -04:00
Tyler Renelle
56d44887d4 [#1439] add highlight back in for chat. use ngSanitize linky to add links in chat 2013-09-06 00:36:05 -04:00
Tyler Renelle
ef69309b0c [#1431] add temporary server-based pet-purchasing mechanism. Lotsa cleanup / 
refactoring to be had here
 2013-09-06 00:28:18 -04:00
Tyler Renelle
812ba3a339 [#1430] fix guild gems (math error) 2013-09-05 23:28:30 -04:00
Matteo Pagliazzi
bb4c0d2d69 non working market 2013-09-05 15:35:34 +02:00
Matteo Pagliazzi
f7d1159e06 fix inventory bugs 2013-09-05 14:26:35 +02:00
Tyler Renelle
512e891dc3 add cerberus to pets 2013-09-04 23:03:20 -04:00
Matteo Pagliazzi
6b4d3db6bb delete old pets.html 2013-09-04 19:09:48 +02:00
Matteo Pagliazzi
ced69cb4d5 working inventory 2013-09-04 19:06:31 +02:00
Matteo Pagliazzi
a5e8817c85 initial inventory 2013-09-04 17:13:42 +02:00
Matteo Pagliazzi
b69ce1b5d6 remove tooltip from rare pet 2013-09-03 12:08:54 +02:00
Matteo Pagliazzi
e41efa98e4 working stable 2013-09-03 12:05:54 +02:00
Matteo Pagliazzi
3fd290a3e1 non working stable choosePet 2013-09-03 10:32:06 +02:00
Tyler Renelle
3417e3a76b some NPC wording updates 2013-09-02 21:44:00 -04:00
Tyler Renelle
d70c2c4040 coming soon notes 2013-09-02 20:16:08 -04:00
Tyler Renelle
687da68d52 rewrite: add read-only inventory. fix empty pet issue, it was the wrong 
casting type UserSchema.items.eggs.type
 2013-09-02 14:26:59 -04:00
Matteo Pagliazzi
ddd312d530 enable rest 2013-09-02 15:47:44 +02:00
Tyler Renelle
834e2438b9 add a search option on guilds page 2013-09-01 22:32:32 -04:00
Tyler Renelle
f5f6c957de groups: try to update GroupsCtrl scope to notify of joined / left 
groups, not working
 2013-09-01 21:31:38 -04:00
Tyler Renelle
d0c915f58a fix create-guild 2013-09-01 21:03:05 -04:00
Tyler Renelle
010995b38b api: createGroup 2013-09-01 20:50:36 -04:00
Tyler Renelle
ac992ea865 groups: misc groups fixes 2013-09-01 20:24:44 -04:00
Tyler Renelle
8142241544 rewrit: bug fix to chat not posting. this may cause perf issues, revisit 2013-09-01 19:23:16 -04:00
Tyler Renelle
6efd789e6d rewrite: fix user avatar stats 2013-09-01 13:55:45 -04:00
Tyler Renelle
633d6fdb52 api: group invitations, leave, join 2013-09-01 11:33:39 -04:00
Tyler Renelle
2672b7f6ab rewrite: chat & leave-group bug fixes 2013-08-31 23:41:01 -04:00
Tyler Renelle
14ddad958e join & leave guilds 2013-08-31 23:35:53 -04:00
Tyler Renelle
bc4798b354 groups: big changes here i may decide to revert. GET /api/v1/groups 
optionally takes ?type=guilds (guilds, party, tavern, public). this
allows us to incrementally load the app as they click through the tabs,
because guilds is really large (1.5mb!) - gotta cut this down
somehow. The big issue is requireing return values as an array, so
ngResource can work with the response (subsequent group.$postChat(),
group.$join(), etc.). The array format doesn't really work out that
well, so I may scrap
 2013-08-31 22:59:35 -04:00
Tyler Renelle
524457b5d7 chat: keyup to trigger send message. ng-model on chat box is painfully 
slow! using jquery as workaround for now
 2013-08-31 20:52:41 -04:00
Tyler Renelle
e069718da7 rewrite: add basic chat functionality, `POST 
/api/v1/groups/:gid/chat` (which returns chat list). Some bugs present
 2013-08-31 19:14:58 -04:00
Tyler Renelle
62ebd9aae6 rewrite: misc. fixes, & back to bootstrap-vanilla tabs for 
options. angular-bootstrap tabs were too slow
 2013-08-31 18:17:57 -04:00
Tyler Renelle
45383a9630 rewrite & api: use mongoose populate to replace group.members array with 
popualte member objects. this puts a load on the front-end, we'll need
to optimize! also added some duplicates sanitization.
 2013-08-31 17:47:03 -04:00
Tyler Renelle
10ff61be91 rewrite: use vanilla bootstrap tabs for now, keep an eye on https://github.com/angular-ui/bootstrap/issues/783 2013-08-31 14:52:13 -04:00
Tyler Renelle
17a9469370 rewrite: start implementing groups. Note angular-bootstrap 0.4.0 required for nested tabs 2013-08-29 22:11:52 -04:00
Tyler Renelle
b1b9728642 rewrite: beastmaster & drops-enabled modals (need to revisit & verify) 2013-08-29 19:11:07 -04:00
Tyler Renelle
fce194275e rewrite: fix up some settings page stuff 2013-08-28 19:20:47 -04:00
Tyler Renelle
de7b46b14d rewrite: fix show/hide header 2013-08-28 19:11:29 -04:00
Tyler Renelle
b77021e745 rewrite: prep for adding filters, restructured html to allow separate 
options / tasks
 2013-08-28 18:11:00 -04:00
Tyler Renelle
42f4e6f69c rewrite: add achievements 2013-08-28 16:04:17 -04:00
Tyler Renelle
9adb17510e rewrite2 basice read-only settings page 2013-08-27 22:56:07 -04:00
Tyler Renelle
c9d3f6247d rewrite2 add customizations options 2013-08-27 21:54:11 -04:00
Tyler Renelle
7bfaac80a7 rewrite2 big one: add ngRoute for /#/tasks & /#/options. requires 2 
/partial routes on server. code cleanup & reorganization, remove a lot
of return statements (coffeescript compiled)
 2013-08-27 21:13:05 -04:00
Tyler Renelle
176a5a3583 rewrite2: avatar working. need to revisit avatar:avater, make sure I got everything 2013-08-25 09:12:25 -04:00
Tyler Renelle
3c45220e1f rewrite2 WIP 2013-08-24 23:54:08 -04:00