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

8327 commits

This branch
This branch
All branches
Author SHA1 Message Date
Blade Barringer
bf4f2299e2 Moved src to website/src (again) 2015-02-10 16:04:17 -06:00
Blade Barringer
feae63051f Checked out develop's src 2015-02-10 16:03:59 -06:00
Blade Barringer
e243887563 Deleted website/src 2015-02-10 16:03:11 -06:00
Blade Barringer
534aa2b780 REmoved build process from procfile 2015-02-10 08:49:29 -06:00
Blade Barringer
d46dd91d08 Added in grunt karma 2015-02-10 08:39:17 -06:00
Blade Barringer
fcb7f717fc Added build step to postinstall (correctly 2015-02-10 08:24:41 -06:00
Blade Barringer
557ccc7ec0 Added sprites build to build:prod task 2015-02-09 23:07:28 -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
1f9d1756fa Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert 2015-02-09 22:40:49 -06:00
Blade Barringer
4b8b7bc87d Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-09 22:40:15 -06:00
Blade Barringer
b1d535874d Updated last revised date 2015-02-09 22:38:06 -06:00
Blade Barringer
7f29503ff2 Corrected names 2015-02-09 22:29:36 -06:00
Blade Barringer
64f24f051b Merge branch 'community-guidelines-updates-#4557' of https://github.com/ojintoad/habitrpg into comm-guide 2015-02-09 22:28:56 -06:00
Blade Barringer
14fd4ca3b6 Merge pull request #465 from ojintoad/community-guidelines-updates-#4557 
Community guidelines updates #4557
 2015-02-09 22:23:34 -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
45d1fb4c6e Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 
Conflicts:
	common/dist/scripts/habitrpg-shared.js
 2015-02-09 22:18:22 -06:00
ojintoad
5489c37a1e Updating blacksmiths list 2015-02-09 21:50:46 -05:00
ojintoad
1c3873647b Spacing out paragraphs 2015-02-09 21:45:09 -05:00
Lisa Marie
24a6b2f4cc migration(plans): sample code for plans which didn't get applied 2015-02-09 19:39:05 -07:00
Blade Barringer
a1568b0c32 Corrected title on readme 2015-02-09 19:10:59 -06:00
Blade Barringer
fe6579937c Editted common readme 2015-02-09 19:06:13 -06:00
Blade Barringer
c8124f28ed Set it so compiled js and sprites are not ignored 2015-02-09 16:04:25 -06:00
Blade Barringer
fa5c0dd75c Added sprite task back in 2015-02-09 13:55:59 -06:00
Blade Barringer
ac4dbf6eec Added /register. Required for newer version of coffee-script module 2015-02-09 13:37:30 -06:00
Blade Barringer
59a203e05c Corrected path to moment locale files 2015-02-09 13:36:15 -06:00
Blade Barringer
8a25a5a744 Corrected paths 2015-02-09 13:32:56 -06:00
Blade Barringer
6efae8a044 Reverted start task back to grunt 2015-02-09 13:17:28 -06:00
Blade Barringer
0f45b1d8dd Corrected path to habitrpg. Added grunt-browserify 2015-02-09 13:17:19 -06:00
Matteo Pagliazzi
8bd116f2c5 fix gems gifting 2015-02-09 19:31:18 +01:00
Matteo Pagliazzi
f303a71e66 site can be used when sessionPartyInvite is invalid 2015-02-09 19:11:14 +01:00
Matteo Pagliazzi
fb72b10e3d chore(i18n): update locales 2015-02-09 18:21:09 +01:00
Matteo Pagliazzi
9dfe18bc70 typo 2015-02-09 17:43:14 +01:00
ojintoad
f05e10858a moves dupes to the severe infractions list 2015-02-09 00:14:29 -05:00
ojintoad
4ba7f9f7c8 moves dupes to the severe infractions list 2015-02-09 00:14:05 -05:00
ojintoad
2b0f667368 Adds language to Address PMs, explicitly forbid spamming, list sexism in the public spaces inappropriate behaviors, define duplicate accounts as severe infractions. 2015-02-09 00:08:36 -05:00
ojintoad
3fc15149b7 Adds language to Address PMs, explicitly forbid spamming, list sexism in the public spaces inappropriate behaviors, define duplicate accounts as severe infractions. 2015-02-09 00:05:58 -05:00
ojintoad
a6106dc6ca removed space 2015-02-08 23:33:15 -05:00
ojintoad
d3054a3c7b Adding blade to moderators list and graphic 2015-02-08 23:26:27 -05:00
ojintoad
3fda4dc2d2 Adding mod info 'on Github' descriptor 2015-02-08 23:24:30 -05:00
Blade Barringer
e5e9f054d1 Compiled coffeescript 2015-02-08 20:32:14 -06:00
Blade Barringer
0ebb9c874b Worked on gruntfile 2015-02-08 20:19:54 -06:00
Sabe Jones
4b96ee83b6 chore(news): 2/8 Bailey 2015-02-08 15:21:43 -06:00
Matteo Pagliazzi
8b88b34475 correctly redirect after authentication 2015-02-08 21:45:30 +01:00
Matteo Pagliazzi
58cec5259a enable quest invitation email 2015-02-08 20:33:03 +01:00
Matteo Pagliazzi
7d139b4adc add quest invitation email (disabled for now) and fixes 2015-02-07 22:20:16 +01:00
Matteo Pagliazzi
cb4da8b91e add strings 2015-02-07 22:00:02 +01:00
Matteo Pagliazzi
4f66d30441 implement quest started email 2015-02-07 21:36:38 +01:00
Matteo Pagliazzi
9aca6c26c6 chore(i18n): update locales 2015-02-07 19:22:00 +01:00
Alice Harris
468f414710 Merge pull request #4644 from Alys/develop 
database script to identify and remove duplicate tasks for one user - use with caution!
 2015-02-07 14:04:58 +10:00
Alice Harris
734227c472 improve spacing 2015-02-07 14:00:21 +10:00