Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,895 Commits 64 Branches 1,256 Tags
f26b0a2cf52f950e1e8e784a2c5edf57002d2800
Commit Graph

2895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Tyler Renelle a7e99d0ac0 [#1396] add ability to show tour at any time. Also add ability to show 
Bailey at any time
 2013-09-10 18:36:10 -04:00
Tyler Renelle 964eb91799 update tour to conform to guidelines at #1507 2013-09-10 18:31:26 -04:00
Tyler Renelle 16a4e87fea [#1396] Add justin to tour bubbles 2013-09-10 18:20:10 -04:00
Tyler Renelle 598c4445ff [#1396] setup tour, using user.flags.showTour now instead of 
localStorage. double check with #1507
 2013-09-10 18:06:16 -04:00
Tyler Renelle b7107aa874 Merge pull request #1507 from lefnire/paglias/build2 
File caching & better compression for css
 2013-09-10 14:00:11 -07:00
Matteo Pagliazzi af910a5026 fix stylus watching 2013-09-10 22:57:34 +02:00
Matteo Pagliazzi c9212d76d8 add padding to gem wallet 2013-09-10 15:30:38 +02:00
Matteo Pagliazzi 6e8a57004f exclude build in nodemonignore 2013-09-10 14:54:23 +02:00
Matteo Pagliazzi 940861ad67 small comment fix 2013-09-10 14:43:30 +02:00
Matteo Pagliazzi 21823564c2 add caching 2013-09-10 14:40:00 +02:00
Matteo Pagliazzi f71590449c add hash to build files & correct minor fix 2013-09-10 12:39:17 +02:00
Matteo Pagliazzi 9cc92ccb25 serve all css minimized & static files from /build 2013-09-10 12:29:43 +02:00
Tyler Renelle a6590e7d84 [#1505] add memberServices into static. I'm adding way too many deps to the 
static page, I need to separate out authServices bare-bones & only use
that in static
 2013-09-09 21:25:45 -04:00
Tyler Renelle 23045fb72f formatting 2013-09-09 19:12:16 -04:00
Tyler Renelle 20354c7d8a member-since and last-logged-in 2013-09-09 19:04:46 -04:00