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

8465 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matteo Pagliazzi
de4e0606dc Merge pull request #4672 from SabreCat/valentines 
Valentine's Day
 2015-02-12 19:29:20 +01:00
Matteo Pagliazzi
b3463c83f8 chore(i18n): update locales 2015-02-12 19:27:58 +01:00
Blade Barringer
a6b786a8e5 Compiled sprite css 2015-02-12 12:13:23 -06:00
Blade Barringer
3c60e7e079 Corrected paths to common folders in css 2015-02-12 12:10:19 -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
Sabe Jones
e28651f645 chore(grunt): grunt full 2015-02-12 07:54:34 -06:00
Sabe Jones
de21ec8cf5 fix(event): Card notif display 2015-02-12 07:52:52 -06:00
Sabe Jones
37ae50a77a fix(event): Correct card notifs 2015-02-12 07:45:47 -06:00
Sabe Jones
4bdace64fc feat(event): Card notifs 2015-02-12 07:39:42 -06:00
Sabe Jones
a5052b1f51 feat(event): Card notifs 2015-02-12 07:39:10 -06:00
Sabe Jones
dd1809cd78 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-shared into valentines 2015-02-12 07:24:01 -06:00
Sabe Jones
894b3bf15e Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into valentines 2015-02-12 07:21:18 -06:00
Blade Barringer
9f6d74b2bd Removed compile sprites from prod build step 2015-02-11 16:15:28 -06:00
Blade Barringer
be59a676c5 Moved somg devdependencies to production 2015-02-11 15:36:25 -06:00
Sabe Jones
9a44ab76ec fix(event): Line breakage II 2015-02-10 20:56:46 -06:00
Sabe Jones
281e3fdbb5 fix(event): Line breakage II 2015-02-10 20:56:19 -06:00
Sabe Jones
358b421330 fix(event): Line breakage 2015-02-10 20:51:49 -06:00
Sabe Jones
9fddb08aeb fix(event): Localize poems 2015-02-10 20:47:40 -06:00
Sabe Jones
432eee750f fix(event): Valentine's strings 2015-02-10 20:46:31 -06:00
Sabe Jones
8fb84a0410 feat(event): Valentine's cards 2015-02-10 20:30:47 -06:00
Sabe Jones
6a6a4a0e57 feat(event): Valentine's cards 2015-02-10 20:30:20 -06:00
Blade Barringer
85bf2aced8 Wrote task to minify and concatenate spritesheet styles 2015-02-10 17:12:17 -06:00
Blade Barringer
6e82557df8 Put bower install first in postinall, since Grunt copies files from it 2015-02-10 16:51:48 -06:00
Blade Barringer
8ac9dc3ced Merge branch 'develop' into common-convert 2015-02-10 16:27:46 -06:00
Blade Barringer
17032a4f13 Reverted changes back into website/src 2015-02-10 16:06:32 -06:00
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
Matteo Pagliazzi
9c6fc78a2f invite friend to guild: pass guild name 2015-02-10 22:07:36 +01:00
Matteo Pagliazzi
be27646143 correctly fetch group.type 2015-02-10 21:53:26 +01:00
Matteo Pagliazzi
0d23ef94da fix when second email not defined 2015-02-10 21:42:43 +01:00
Matteo Pagliazzi
40210b8a4d Merge pull request #4664 from HabitRPG/paglias/invites-reworking 
Invites refactor
 2015-02-10 19:57:30 +01:00
Matteo Pagliazzi
06561bf70f finash invites reworking 2015-02-10 19:40:15 +01:00
Matteo Pagliazzi
fdf0c1d3ec bring client side changes and cleanup 2015-02-10 17:35:50 +01:00
Matteo Pagliazzi
b069529fe8 add todos 2015-02-10 17:35:50 +01:00
Matteo Pagliazzi
291b5eb1e7 partial 2015-02-10 17:35:49 +01: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