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

2910 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matteo Pagliazzi
190c617d4c fix #1045 2013-09-18 17:02:17 +02:00
Tyler Renelle
205b646cfc Merge pull request #1550 from djuretic/pet_count 
Don't hardcode total pets count
 2013-09-18 07:15:24 -07:00
Dušan Juretić
c6472bc615 fix hardcoded total pets count 2013-09-18 11:07:23 -03:00
Tyler Renelle
9ec3c4aaed fix so admins can delete chat msgs 2013-09-18 09:06:51 -04:00
Tyler Renelle
35945f0a44 change bailey links to her twitter 2013-09-17 15:40:20 -04:00
Tyler Renelle
e62007e74e add jquery.cookie for tour (suddenly required?) 2013-09-17 15:20:09 -04:00
Tyler Renelle
5006cda946 [#1394] fix customizationsNotification issue 2013-09-17 14:59:06 -04:00
Tyler Renelle
402e2aedb0 [#1397 #1543 #1540] misc bug fixes 2013-09-17 14:44:02 -04:00
Tyler Renelle
082bfd46da Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-09-17 14:16:11 -04:00
Tyler Renelle
5ab3ea7311 [#1397 #1543 #1540]use justin in popovers instead of indicator icons (may want to revisit) 2013-09-17 14:15:57 -04:00
Tyler Renelle
36b3a77877 [#1397 #1543 #1540] start adding in unlock notifications (working for some, not for all). Also some tour & header fixes 2013-09-17 14:10:10 -04:00
Matteo Pagliazzi
66a8af5959 Merge pull request #1545 from djuretic/develop 
Profile: allow deletion of websites
 2013-09-17 10:50:04 -07:00
Tyler Renelle
1c7081495f misc cleanup 2013-09-17 12:52:51 -04:00
Tyler Renelle
f26b0a2cf5 [#1394] add drop notifications back in 2013-09-17 12:16:16 -04:00
Tyler Renelle
9d633eceaf [#1394] bug fixes 2013-09-17 12:04:46 -04:00
Tyler Renelle
0fc413f3b7 [#1394] move notifications from controller to service, lots of notification 
fixes, put streak notification back in
 2013-09-17 11:43:05 -04:00
Tyler Renelle
1d3728ea77 spacing cleanup 2013-09-17 10:50:24 -04:00
Dušan Juretić
daa06943ab fix user profile websites show/hide conditions 2013-09-16 22:59:08 -03:00
Dušan Juretić
2c8a5b5ff8 remove website in edit profile page works 2013-09-16 22:58:20 -03:00
Tyler Renelle
bb2b17b24e Merge pull request #1538 from djuretic/develop 
Do not allow empty task names when editing tasks
 2013-09-16 13:33:38 -07:00
Matteo Pagliazzi
081d4c559c Merge pull request #1542 from djuretic/hatching_bug 
Can't select hatching potion to use after buying an egg
 2013-09-16 05:46:38 -07:00
Dušan Juretić
64edf31eb4 show hatching potion selector after buying an egg 2013-09-15 16:40:20 -03:00
Dušan Juretić
72c4733a0f do not allow empty task names when editing tasks 2013-09-14 21:38:50 -03:00
Tyler Renelle
c54c383c5a [#1534] add some more starter test code, still no tests 2013-09-13 21:19:02 -04:00
Tyler Renelle
6708d46107 [#1534] initialize karma tests using generator-karma (yeoman) 2013-09-13 20:00:35 -04:00
Tyler Renelle
dbe47ad510 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-09-13 15:10:52 -04:00
Tyler Renelle
dc303f83c1 [#1221] misc bug fixes on backer.* doesn't exist in chat, default backer & 
preference attrs in user model
 2013-09-13 15:10:47 -04:00
Matteo Pagliazzi
98fa007f36 do not trigger validation error on float number, fix #1463 2013-09-13 20:01:22 +02:00
Matteo Pagliazzi
2523643dd5 Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-09-13 18:31:16 +02:00
Matteo Pagliazzi
8748907841 update angular to 1.2.0-rc.2 2013-09-13 18:24:32 +02:00
Matteo Pagliazzi
89d102aa1f do not show border on if habit has only + action 2013-09-13 18:23:02 +02:00
Tyler Renelle
0d8e1f2043 cleanup on end tour 2013-09-12 16:51:49 -04:00
Tyler Renelle
d3ddbae767 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-09-12 16:43:18 -04:00
Tyler Renelle
d432397c27 [#1514] missing veteran achievement 2013-09-12 16:42:48 -04:00
Matteo Pagliazzi
e6021d9cf8 show tour only once 2013-09-12 19:24:04 +02:00
Matteo Pagliazzi
0786fe90f9 add market prices, fix #1511 2013-09-12 19:16:01 +02:00
Tyler Renelle
e754670733 small fix to `heroku[router]: at=error code=H17 desc="Poorly formatted 
HTTP response" method=GET path=/splash.html host=habitrpg.com
fwd="" dyno=web.3 connect=1ms service=3ms status=503 bytes=0`
 2013-09-11 17:47:51 -04:00
Tyler Renelle
bf032ce808 Merge branch 'origin-paglias-fix-guilds' into develop 
Conflicts:
	public/css/index.styl
 2013-09-11 17:18:36 -04:00
Tyler Renelle
2f8c9fea78 [#1516] fixes to handling user.invitations.guilds - both accept & reject 2013-09-11 17:16:23 -04:00
Tyler Renelle
9b78e4e7fa [#1520] add defaults to items.lastDrop date & count 2013-09-11 16:51:18 -04:00
Matteo Pagliazzi
dc96df43cc add margin-right to all .btn, typo in stylus, add build to .nodemonignore 2013-09-11 20:36:57 +02:00
Matteo Pagliazzi
48c078a6ea various fixed 2013-09-11 20:08:53 +02:00
Matteo Pagliazzi
1342a2cb89 fix reject guild function 2013-09-11 17:07:38 +02:00
Matteo Pagliazzi
46363785c8 rever to query 2013-09-11 16:51:39 +02:00
Matteo Pagliazzi
9966d06c5a use slice 2013-09-11 16:47:57 +02:00
Matteo Pagliazzi
bf83291e0a add fix for joining guild 2013-09-11 16:32:56 +02:00
Matteo Pagliazzi
8e377d7343 fix various guilds issues 2013-09-11 16:28:14 +02:00
Matteo Pagliazzi
1bc5f0eb0c add margin to buttons in setting page 2013-09-11 15:42:11 +02:00
Tyler Renelle
01ac814b17 typo 2013-09-10 19:10:58 -04:00
Tyler Renelle
c46bfa64ea typo 2013-09-10 18:49:37 -04:00