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

54 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Andre Casey
b3c3aeab05 Fixes #1556. Removed HTML code in popover for now. 2013-10-03 16:49:15 -07:00
Matteo Pagliazzi
8540e2f59b show group gems popover 2013-09-19 19:04:32 +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
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
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
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
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
812ba3a339 [#1430] fix guild gems (math error) 2013-09-05 23:28:30 -04:00
Tyler Renelle
3417e3a76b some NPC wording updates 2013-09-02 21:44:00 -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
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