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

25741 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Stan Lindsey
1a99f0e6dc Merge pull request #959 from w13/translations 
Partial translation into Urdu
 2013-05-28 03:46:37 -07:00
Stan Lindsey
25f4a09036 Merge pull request #1008 from Hjalmberi/translations 
Edited Russian translation, added missing phrases
 2013-05-28 03:45:11 -07:00
Stan Lindsey
d6fbacb79f Merge pull request #1029 from tcsantini/translations 
Starts Portuguese translation.
 2013-05-28 03:43:41 -07:00
Stan Lindsey
38e4370e30 Merge pull request #1074 from maggick/patch-5 
change 3 letters days
 2013-05-28 03:42:57 -07:00
Stan Lindsey
fc4c2bdbf0 Merge pull request #1073 from maggick/patch-3 
minor change
 2013-05-28 03:27:13 -07:00
Matthieu Keller
75edbc5746 minor spell corrections 2013-05-28 10:52:37 +02:00
Matthieu Keller
9b887d8ffd change 3 letters days 2013-05-28 11:29:03 +03:00
Matthieu Keller
850ebc9f6a minor change 2013-05-28 11:23:01 +03:00
Stan Lindsey
bf72b1e797 Merge pull request #1072 from maggick/patch-4 
oeuf -> œuf
 2013-05-28 01:08:25 -07:00
Stan Lindsey
1aa97cf5a0 Merge pull request #1065 from Czuken/translations 
Update app.json
 2013-05-28 00:54:17 -07:00
Matthieu Keller
b4861b2470 oeuf -> œuf 2013-05-28 07:49:08 +02:00
Tyler Renelle
2666ebb1fc guilds: generic handling of invitations (incl. accept, reject, invite, etc) 2013-05-28 00:48:35 +01:00
Czuken
6572cb1b9d Update app.json 2013-05-28 00:55:21 +03: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
Stan Lindsey
df3693e6d6 Merge pull request #1056 from neameta/translations 
Update of french translation
 2013-05-27 12:49:33 -07: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
4e7233f100 Merge branch 'master' into challenges 2013-05-27 14:44:52 +01:00
Tyler Renelle
0360de2505 Merge branch 'master' of github.com:lefnire/habitrpg 2013-05-27 14:43:06 +01:00
Tyler Renelle
fe86a11854 Merge branch 'master' of github.com:HabitRPG/habitrpg-shared 2013-05-27 14:38:24 +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
66290274b2 cron cleanup (removing shouldCron) 2013-05-27 14:37:31 +01:00
neameta
b5a7f1b4ba Update of translation 
Some words were badly chosen and some mistakes remained, so i review the entire text to change them.
 2013-05-27 15:31:22 +02: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
41da6c2162 pull in taskClasses changes for the website challenges branch 2013-05-26 15:22:49 +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
Tyler Renelle
5afe1d9cc1 Merge pull request #7 from SyntaxPickax/master 
Spelling: Enforced Shield -> Reinforced Shield
 2013-05-26 02:54:23 -07:00
Brandon McPhail
389314b325 Enforced Shield -> Reinforced Shield 
Changed spelling
 2013-05-26 00:37:11 -06:00
Brandon McPhail
8f6fe2456a Enforced Shield -> Reinforced Shield 
Renamed.
 2013-05-26 00:29:31 -06:00
Tyler Renelle
f0c50e1cfe fix api + tests 2013-05-25 19:42:59 +01:00