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

132 commits

Author SHA1 Message Date
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
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
19433f7100 remove old code 2013-10-28 22:22:33 +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
Matteo Pagliazzi
6ee1b14e97 dismissable errors and warnings, fix #1580 2013-10-28 20:16:40 +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
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
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
9e21974108 revert previous commit, reload after party invite accept 2013-10-28 16:24:40 +01:00
Matteo Pagliazzi
e8173a4962 remove need to refresh after having accepted party invite 2013-10-28 16:21:53 +01:00
Matteo Pagliazzi
cd97cc1e24 hotfix for streak bonus being given when selling item for gold 2013-10-27 13:44:04 +01:00
Matteo Pagliazzi
24f3ba7b5c fix for gems not removed after guild creation, fix #1186 2013-10-27 13:03:03 +01:00
Matteo Pagliazzi
a5af52a275 correctly award ultimategear achievement 2013-10-27 12:11:59 +01:00
Tyler Renelle
ef972bf70d [#1540] add restore option for streak achievement 2013-10-24 11:04:35 -07:00
Matteo Pagliazzi
1f8915f5de add api.deleteTag to batch update operations 2013-10-24 18:21:34 +02:00
Matteo Pagliazzi
211433858c correctly remove tag from task 2013-10-24 17:50:35 +02:00
Matteo Pagliazzi
715e4e42a5 remove console.log 2013-10-24 17:50:24 +02:00
Tyler Renelle
b23ce8426b fix to editing profile: "TypeError: Cannot call method 'toString' of undefined" 2013-10-23 10:25:43 -07:00
Matteo Pagliazzi
fe52731393 fix small error on startup 2013-10-23 18:49:14 +02:00
Matteo Pagliazzi
20f2d75bbf add streak achievement notification 2013-10-23 17:57:02 +02:00
Matteo Pagliazzi
f56b76b5ae Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-10-23 16:38:37 +02:00
Matteo Pagliazzi
0c7ba32c6b fix #1635 2013-10-23 16:38:05 +02:00
Tyler Renelle
44cb797063 migrate: flags.ads -> purchased.ads (boolean); flags.newStuff to boolean 2013-10-22 18:50:50 -07:00
Tyler Renelle
c40697761b halloween: fix to transient skin set 2013-10-22 18:16:23 -07:00
Tyler Renelle
f59d5b056c Merge branch 'halloween' into develop 2013-10-22 17:57:57 -07:00
Tyler Renelle
ec50c7d0ec halloween fix to 401 error 2013-10-22 14:46:58 -07:00
Tyler Renelle
6f32ac2a24 halloween: purchase full set 2013-10-22 13:59:30 -07:00
Tyler Renelle
619c00fb5c halloween: some unlocking bug fixes (appears a markModified was required) 2013-10-22 13:37:55 -07:00
Tyler Renelle
d184237c79 halloween: begin adding mechanic for the special skins 2013-10-22 13:24:31 -07:00
Matteo Pagliazzi
c4882942d6 fix chart shown below task edit form 2013-10-21 20:41:19 +02: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
e4f2a4386d eggs: bug fixes on selling potions 2013-10-19 20:22:12 -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
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
Tyler Renelle
c52bbc8f0d graphs: hack 300px width on charts because I can't figure out how to 
make 100% work
 2013-10-19 16:42:29 -07:00
Tyler Renelle
cef8431af0 charts: port toggleChart back in (functional, but it's not getting the 
right width)
 2013-10-19 16:15:48 -07:00
Matteo Pagliazzi
08fd4a865a better code for last fix 2013-10-16 20:24:32 +02:00
Matteo Pagliazzi
28e8955379 do not reset user\ eggs if they are already there 2013-10-16 20:22:22 +02:00