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

2507 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
15d76d93f4 return delta bug fix 2013-05-30 14:35:07 -04:00
Tyler Renelle
91c5331a28 challenges: couple bug fixes 2013-05-30 08:41:07 +01:00
Tyler Renelle
9ec369ea7a challenges: add in challenge prize, just for show-purposes for now 2013-05-29 23:40:13 +01:00
Tyler Renelle
ea8f245b84 challenges: edit challenge title & description 2013-05-29 23:33:47 +01:00
Tyler Renelle
b34caaabd6 challenges: view.fn bug fix 2013-05-29 23:23:17 +01:00
Tyler Renelle
64a99e734f challenges: use bootstrap accordiong, much cleaner 2013-05-29 23:18:44 +01:00
Tyler Renelle
5de2269157 hotfix: getting a lot of "DERBY is not defined" 2013-05-29 23:07:01 +01:00
Tyler Renelle
48e3027638 hotfix: getting a lot of "DERBY is not defined" 2013-05-29 23:06:07 +01:00
Tyler Renelle
8ad2bf5687 groups: don't show websites twice when editing 2013-05-29 22:55:20 +01:00
Tyler Renelle
a213d6e997 groups: accordion information on left side, more edit options for 
group information
 2013-05-29 22:47:07 +01:00
Tyler Renelle
88ff245aec challenges: add taskInChallenge() view helper and broken task.challenge link 2013-05-29 20:53:57 +01:00
zeroos
dbdb4911af Breaking long words in task-text 
Previously, if you inputted a long word in your task it overflew the box.
 2013-05-29 20:00:17 +02:00
zeroos
838e81fd58 Fixed bug related to padding of addtask-field 
The field was too wide and because of that the text from the end of the input
was below "+" button.
 2013-05-29 19:47:57 +02:00
Tyler Renelle
cce03c8312 guilds: prettier group-creation 2013-05-29 18:19:38 +01:00
Tyler Renelle
1063a0e223 Merge branch 'develop' into challenges 
Conflicts:
	src/app/misc.coffee
	src/app/party.coffee
 2013-05-29 15:54:59 +01:00
Tyler Renelle
e9ac76cd81 merge character.coffee into profile.coffee, remove unecessary requires 2013-05-29 11:59:56 +01:00
Tyler Renelle
3cd23857ce Merge branch 'develop' into challenges 
Conflicts:
	src/app/index.coffee
 2013-05-29 11:27:25 +01:00
Tyler Renelle
4c684502f2 batch: add convenience batch.set / batch.get for updating paths simultaneously 2013-05-29 11:02:23 +01:00
Tyler Renelle
1745ae6205 update batchTxn to be a callback instead of object, put batch 
operations back in for scoring & cron. hoping this will cut back on
the 4000ms issue, quite an emergency that
 2013-05-29 10:23:23 +01:00
Tyler Renelle
bd18667420 convert task-editing state to private path so we don't have 
conflicting ids
 2013-05-28 16:43:16 +01:00
Tyler Renelle
21b6cd952d challenges: guild listings in tabs, just like guilds-groups 2013-05-28 12:47:41 +01:00
Tyler Renelle
12fccbc99d challenges: move challenge-creation to their respective tabs, instead of separate "create" tab 2013-05-28 12:42:42 +01:00
Tyler Renelle
60bdc3666e challenges: fix public-challnege creation 2013-05-28 11:59:19 +01:00
Tyler Renelle
21a6ea19f5 challenges: remove "mine" challenges tab 2013-05-28 11:59:09 +01:00
Tyler Renelle
2fbff2a0bc challenges: lock down editing capabilities on certain task properties, 
instead showing the challenge's properties (in case they change
challenge-side).This includes editing the tag name
 2013-05-28 11:52:32 +01:00
Tyler Renelle
2666ebb1fc guilds: generic handling of invitations (incl. accept, reject, invite, etc) 2013-05-28 00:48:35 +01:00
Tyler Renelle
fa9e6f5453 challenges: migrated drop groups collection if exists (mostly for debugging) 2013-05-27 21:14:22 +01:00
Tyler Renelle
e9eb509682 challenges: generalized listings for groups/parties/public 2013-05-27 21:14:04 +01:00
Mickael
4d6ca749af double bracket on user id and token 
for the qrcode
 2013-05-27 20:52:09 +01:00
Tyler Renelle
1a0d9772a7 Merge branch 'develop' into challenges 2013-05-27 18:54:51 +01:00
Mickael
695bb301f4 Adding a QRCode with the user's information 
QRCode retrieved from Google APIs, and parsed with json like that:
{address:"",user:"",key:""}
 2013-05-27 18:40:26 +01:00
Tyler Renelle
89160919f4 achievements: add "Helped Habit Grow" badge, including bailey notify 2013-05-27 16:10:55 +01:00
Tyler Renelle
2c8112cd61 Merge branch 'develop' into challenges 2013-05-27 15:15:18 +01:00
Tyler Renelle
67643f796a challenges: underscore => lodash 2013-05-27 15:14:21 +01:00
Tyler Renelle
3d6dafb368 set derby-ui-boot dependency to 
f04ba2c7e7b3a8f1462a6e70fe4f81055d74c4b2 (new versions are for racer 0.5)
 2013-05-27 14:51:56 +01:00
Tyler Renelle
0360de2505 Merge branch 'master' of github.com:lefnire/habitrpg 2013-05-27 14:43:06 +01:00
Tyler Renelle
fc14eadc08 habitrpg-shared: fix cron, so it doesn't run fully for new users 2013-05-27 14:37:57 +01:00
Tyler Renelle
d3dd20cdf8 guilds: allow clicking guild-members for stats. needed to include 
_membersArray in model ref
 2013-05-26 22:36:30 +01:00
Tyler Renelle
d4275867cc guilds: html & store.coffee bug fixes 2013-05-26 22:26:25 +01:00
Tyler Renelle
ff35cbf1e7 guilds: generalize more groups stuff, creation invitation leaving, 
etc. also fixes party invite bugs
 2013-05-26 21:32:21 +01:00
Tyler Renelle
619b92563e guilds: rename party.coffee => groups.coffee 2013-05-26 20:25:15 +01:00
Tyler Renelle
0f8dbd044e guilds: got all groups html generalized (using same party html as 
tavern, will add guilds soon)
 2013-05-26 20:21:07 +01:00
Tyler Renelle
e32ee04baa guilds: bug fix on _tavern => _habitRPG 2013-05-26 15:38:49 +01:00
Tyler Renelle
9dfdb52c98 challenges: rename party.html to groups.html 2013-05-26 15:33:01 +01:00
Tyler Renelle
35049f7752 Merge branch 'develop' into challenges-tmp 
Conflicts:
	src/app/helpers.coffee
	src/app/index.coffee
 2013-05-26 15:29:59 +01:00
Tyler Renelle
079e7eb30f challenges: fix up htmls to use new party-member subscription methods 2013-05-26 15:09:41 +01:00
Tyler Renelle
03c40c1571 challenges: migration & store: rename parties to groups, create habitrpg guild, move tavern into habitrpg, overhaul of motifs and subscriptions 2013-05-26 15:09:21 +01:00
Tyler Renelle
3499b436f4 Merge pull request #1046 from SyntaxPickax/master 
Spelling: Enforced Shield -> Reinforced Shield
 2013-05-26 02:54:52 -07:00
Brandon McPhail
389314b325 Enforced Shield -> Reinforced Shield 
Changed spelling
 2013-05-26 00:37:11 -06:00
Tyler Renelle
f0c50e1cfe fix api + tests 2013-05-25 19:42:59 +01:00