Commit Graph

532 Commits

Author SHA1 Message Date
Tyler Renelle a0611297fa necessary changes to get everyauth working (since can't run
model.fetch() on the server). revisit, this might not be the case
2012-09-07 19:34:40 -04:00
Tyler Renelle 9fd4367a8a pull in some changes from private branch 2012-09-06 15:33:06 -04:00
Tyler Renelle da6b3d32af Updated README.md 2012-09-06 09:29:09 -07:00
Tyler Renelle 1111697123 Merge branch 'master' of https://github.com/lefnire/habitrpg 2012-09-06 12:28:16 -04:00
Tyler Renelle 79cf7d2bb9 use linear growth TNL algorithm 2012-09-06 12:28:06 -04:00
Tyler Renelle 3cb7fd75c8 smaller bookmark button 2012-09-06 12:28:05 -04:00
Tyler Renelle fe1ee2636f adding screenshot 2012-09-06 12:28:03 -04:00
Tyler Renelle 603f687ced Updated README.md 2012-09-05 11:20:45 -07:00
Tyler Renelle cecb590ede Updated README.md 2012-09-05 10:45:41 -07:00
Tyler Renelle 198193fae2 Updated README.md 2012-09-05 10:25:36 -07:00
Tyler Renelle baddaae0b3 Updated README.md 2012-09-05 10:21:50 -07:00
Tyler Renelle b7ee3d8388 Updated README.md 2012-09-05 10:12:48 -07:00
Tyler Renelle e95b7e3d76 README.md - link to auth progress 2012-09-05 10:10:29 -07:00
Tyler Renelle 1613fc7181 Updated README.md 2012-09-05 10:01:33 -07:00
Tyler Renelle c439a95c9d README.md - better screenshot 2012-09-04 20:21:59 -07:00
Tyler Renelle c9226b34bd Revert "temporarily disable accessControl so i can run schema update"
This reverts commit 01159545d8492831f4048235c2ab633a7d2d4905.
2012-09-04 23:08:11 -04:00
Tyler Renelle 79f1c635ca temporarily disable accessControl so i can run schema update 2012-09-04 23:08:06 -04:00
Tyler Renelle 9c58a7809f Beginnings of toggling days-of-week for repeatable dailies
Conflicts:

	lib/app/index.js
	package.json
	src/app/index.coffee
2012-09-04 23:07:58 -04:00
Tyler Renelle 33c285c398 widdled jquery-ui down without error 2012-09-04 18:01:46 -04:00
Tyler Renelle 681c3e219a put full jquery-ui back in. something to lost in the pipework trying
to minimize it to just the sortable component (custom build), giving
TypeError: 'undefined' is not a function (evaluating 'a.curCSS(this,"overflow",1)')
2012-09-04 18:01:45 -04:00
Tyler Renelle 051b28253c latest jquery-ui & jquery (1.8.0 of jquery, for compatibility) 2012-09-04 18:01:44 -04:00
Tyler Renelle f68dcbf469 add trash icon, remove delete button (people aren't deleting the same
tasks, maybe this will help them). add a bunch of tooltips on the
controls. prevent accidental deletes
2012-09-04 18:01:42 -04:00
Tyler Renelle 2febd15ba4 move experience chart below table 2012-09-04 18:01:40 -04:00
Tyler Renelle 2ee1eda827 Bars width 100% 2012-09-04 18:01:27 -04:00
Tyler Renelle 91711aad07 use heart & star icons instead of HP / Exp
Conflicts:

	lib/app/index.js
2012-09-04 16:09:54 -04:00
Tyler Renelle 9146f2f3fe move notifications to the right. eventually i'll want it above the mouse 2012-09-04 16:08:47 -04:00
Tyler Renelle 1100c865f8 Center avatar on the page (does this look better? I'll have to AB test
or something)
2012-09-04 16:08:35 -04:00
Tyler Renelle 0391cee8a5 in fact, remove shortcuts altogether - we're not using formatting yet,
and it's borking firefox
2012-09-04 14:28:52 -04:00
Tyler Renelle 8930be1356 upgrade jquery 2012-09-04 14:28:51 -04:00
Tyler Renelle e615e16891 upgrade bootstrap growl 2012-09-04 14:28:49 -04:00
Tyler Renelle 06e96407d3 Fix firefox by removing the document.execCommand('useCSS', false, true) stuff 2012-09-04 14:28:48 -04:00
Tyler Renelle c201921dc1 cleaner footer html 2012-09-04 14:28:46 -04:00
Tyler Renelle 4aa21e03d9 remove console.log on accessControl
Conflicts:

	src/server/setupStore.coffee
2012-09-04 14:27:53 -04:00
Tyler Renelle 4c29c93864 bug fix on accessControl for variable-length arguments (was getting
writeAccess error)

Conflicts:

	lib/server/setupStore.js
	src/server/setupStore.coffee
2012-09-04 11:45:34 -04:00
Tyler Renelle 2008fceaf7 add twitter via @lefnire 2012-09-03 00:11:04 -04:00
Tyler Renelle b88a86636d contact page bug 2012-09-03 00:01:42 -04:00
Tyler Renelle 1eae48f39e Use bootstrap's homepage-style footer. revert here if causes problems,
i don't know what i'm doing
2012-09-03 00:01:12 -04:00
Tyler Renelle 1f17fff6c1 reorganize readme.md, add astrid mention 2012-09-02 21:00:23 -07:00
Tyler Renelle 365994e938 terms modification 2012-09-02 23:05:16 -04:00
Tyler Renelle 8a4185815f move terms & privacy to staticPages
Conflicts:

	lib/server/index.js
	src/server/index.coffee
	views/app/index.html
2012-09-02 23:01:14 -04:00
Tyler Renelle 14f9036f7b Adding privacy & terms 2012-09-02 22:59:06 -04:00
Tyler Renelle ac2fc49e12 reset hp on level up (thought i did already..) 2012-09-02 16:37:05 -04:00
Tyler Renelle 881019f4e9 update item costs, they were too expensive
Conflicts:

	src/app/content.coffee
2012-09-01 19:31:51 -04:00
Tyler Renelle 1dea15f551 prevent long-standing red tasks from being deleted by hurting on delete 2012-09-01 19:15:26 -04:00
Tyler Renelle 7a8a7d4566 don't use growl on server (woops) 2012-09-01 17:59:11 -04:00
Tyler Renelle c434072504 yellow warning for undoing a mistake checkbox 2012-09-01 17:45:31 -04:00
Tyler Renelle 91e4a50179 divide tibia TNL by 5, make leveling easier 2012-09-01 16:46:44 -04:00
Tyler Renelle f0aa6299ea fix money/hp buying difference 2012-09-01 16:32:25 -04:00
Tyler Renelle e78cb66f9c add icons to the notifications 2012-09-01 16:32:20 -04:00
Tyler Renelle 68079f5bfc send growl notifications for points gained/lossed & level up
Conflicts:

	src/app/scoring.coffee
2012-09-01 14:26:12 -04:00