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

45 commits

Author SHA1 Message Date
Blade Barringer
d0e1f25c0b Added one time binding 2015-02-26 13:23:30 -06:00
Blade Barringer
fa31023830 Changed ng-show to an ng-if so that table striping would be correct 2015-02-26 13:22:24 -06:00
Blade Barringer
a905f481e8 Added join button to top. Closes #3408 2015-02-25 15:07:54 -06:00
Blade Barringer
cb2af51faa Corrected ng-click to join 2015-02-25 14:45:04 -06:00
Blade Barringer
0d7b6b445e Added buttons for joining and leaving group. 2015-02-25 14:34:24 -06:00
Sabe Jones
d4f8acd0ef feat(mystery): February 2015 2015-02-24 20:15:31 -06:00
Blade Barringer
33bd640bdb Fixes #3054 won't show pets as able to be fed if egg has noMount propery 2015-02-24 19:10:45 -06:00
Matteo Pagliazzi
6d637e89a2 new bailey 2015-02-24 19:29:00 +01:00
Blade Barringer
21ef62481d Removed step attribue from contributor input 2015-02-23 09:41:27 -06:00
Bryce Wojtowicz
44478d3792 Fixes #4645 
Fixes Gem Display in modals to say [Gem] You have [n] Gems
Modified code to use a translatable string!
Thanks for the tip :)
 2015-02-22 13:35:50 +08:00
Matteo Pagliazzi
397a293ca8 change text for recapture emails settings 2015-02-20 18:15:47 +01:00
Blade Barringer
78e124c576 Updated path to models on Github. Closes #4720 2015-02-19 15:49:26 -06:00
Blade Barringer
a2783400ab Merge pull request #4716 from chimericdream/bulk-add-tasks 
Bulk add tasks - auto-focus task box when toggling
 2015-02-19 14:31:55 -06:00
Blade Barringer
bdef56f7ae Changed api key input to password so password managers can recognize it 2015-02-19 14:07:28 -06:00
Bill Parrott
98c6526cf7 add auto-focus when single/multiple is toggled 2015-02-19 08:46:45 -06:00
Blade Barringer
c215b90869 Merge pull request #4699 from chimericdream/bulk-add-tasks 
Bulk add tasks (first version; seeking review & feedback)
 2015-02-18 16:41:31 -06:00
Blade Barringer
3784927ddb Added additional line breaks under date 2015-02-18 14:42:43 -06:00
Blade Barringer
87893ced0d Updated dates on terms and privacy pages 2015-02-18 14:39:06 -06:00
Blade Barringer
e25f9cb183 Changed privacy link to relative link 2015-02-18 14:24:44 -06:00
Blade Barringer
c24d85c21c Updated email and address 2015-02-18 14:23:53 -06:00
Blade Barringer
dd6a8d35db Updated link to privacy policy 2015-02-18 13:52:20 -06:00
Bill Parrott
3599eaefaf Merge branch 'develop' into bulk-add-tasks 2015-02-17 22:32:28 -06:00
Sabe Jones
47f3122c2d chore(news): Pet rocks Bailey 
Also fixes incorrectly named golden rocks.
 2015-02-17 20:39:04 -06:00
Sabe Jones
0608ac5caa feat(quest): Pet Rocks 2015-02-17 20:02:06 -06:00
Blade Barringer
78430b1910 Collapsed 3 strings into single string 2015-02-17 15:26:42 -06:00
Bill Parrott
7042c97d5d removing export functionality to move to its own branch 2015-02-17 14:23:55 -06:00
Bill Parrott
4563d22bf0 minor updates from code review 2015-02-17 14:05:09 -06:00
remmz0r
2e98185c5d fixes #4670 
removed target="_blank" from archery link
 2015-02-18 00:03:37 +08:00
remmy poos
cfabb12b04 fixes #4670 
Replaced archery links in index.jade and tavern.jade

Let me know if this isn't all the links

Cheers
- remmz0r
 2015-02-17 23:52:48 +08:00
Blade Barringer
a5ce3f58b1 Removed original user text from veteran achievement 2015-02-17 08:42:43 -06:00
Blade Barringer
48e688d815 Merge branch 'bulk-add-tasks' of https://github.com/chimericdream/habitrpg into bulk-add 2015-02-17 08:05:36 -06:00
Bill Parrott
2de3a5dd55 first draft of bulk add 2015-02-17 00:25:56 -06:00
remmz0r
7a08ff360f possibly fixed - can't test it as I can't figure out how to make a user an 'originalUser' on mongodb 2015-02-17 13:36:12 +08:00
Bill Parrott
b1b478bc74 add task export functionality 2015-02-16 21:21:49 -06:00
remmz0r
feb1e01c4d Fixed original user code in achievements.jade 2015-02-17 10:48:27 +08:00
Sabe Jones
130261dacf feat(event): End Valentine's 2015-02-16 18:15:09 -06:00
Blade Barringer
477d3d6085 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-02-12 13:32:23 -06:00
Blade Barringer
a6a0282c82 Corrected common image paths 2015-02-12 12:05:38 -06:00
Blade Barringer
85817b2b4e Corrected path to habitrpg logo 2015-02-12 11:50:55 -06:00
Blade Barringer
8ac9dc3ced Merge branch 'develop' into common-convert 2015-02-10 16:27:46 -06:00
Blade Barringer
6548db8095 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-02-09 22:41:52 -06:00
Blade Barringer
75c9b5a978 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	src/controllers/groups.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/models/user.js
 2015-02-09 22:21:27 -06:00
Blade Barringer
dca2f13dda Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	bower.json
	public/manifest.json
	src/controllers/auth.js
 2015-02-05 11:20:40 -06:00
Blade Barringer
cc767efa20 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	src/controllers/auth.js
	src/controllers/challenges.js
	src/controllers/groups.js
	src/controllers/members.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/middleware.js
	src/models/user.js
 2015-02-03 21:13:55 -06:00
Blade Barringer
8a8ce8d80d Moved folders to website directory 2015-02-03 14:10:55 -06:00