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

342 commits

Author SHA1 Message Date
Tyler Renelle
6c57ce7da4 trying for some saner writes (maybe whole-sale overwrite isn't the 
best either)
 2013-01-22 11:49:53 -05:00
Tyler Renelle
3153299ea8 almost there with dom-resetting 2013-01-21 17:21:57 -05:00
Tyler Renelle
c7f2f81985 try offloading everythign to the client 2013-01-21 17:21:55 -05:00
Tyler Renelle
81e673b81a remove some server load 2013-01-21 17:21:54 -05:00
Tyler Renelle
af7fa5633b just refresh page for now, view.render(model) borks <!--$id--> dom references (maybe need to clear somehow, but view.clear() isn't working as expected) 2013-01-21 17:21:53 -05:00
Tyler Renelle
3325161092 just refresh page for now, view.render(model) borks <!--$id--> dom 
references (maybe need to clear somehow, but view.clear() isn't
working as expected)
 2013-01-21 17:21:51 -05:00
Tyler Renelle
016072c687 completed list bug fix, return if cron not run 2013-01-21 17:21:49 -05:00
Tyler Renelle
1fd3aa015e en-mass cron on client 2013-01-21 17:21:46 -05:00
Tyler Renelle
f2e47e9e4e en-masse revive & reset 
Conflicts:
	src/app/index.coffee
 2013-01-21 17:21:42 -05:00
Tyler Renelle
a9b79440ab weapons and armor fix, revive en-masse 2013-01-21 11:48:18 -05:00
Tyler Renelle
2ddab98c82 just wrap scoring.cron in a try/catch, i'm sick of this 2013-01-21 00:23:56 -05:00
Tyler Renelle
fb0d4d6d44 infinite death on cron bug 2013-01-21 00:02:46 -05:00
Tyler Renelle
b9e479e589 hp now docking on cron 2013-01-20 23:22:02 -05:00
Tyler Renelle
95b5324329 fixed cron bug using underscore instead of lodash 2013-01-20 19:35:46 -05:00
Tyler Renelle
4d93f51d55 bug fixes 2013-01-20 19:35:45 -05:00
Tyler Renelle
607740aa23 bug fixes 2013-01-20 18:06:34 -05:00
Tyler Renelle
ca91a3a07d move some more client setup to browser.coffee 2013-01-20 17:55:45 -05:00
Tyler Renelle
ff2fb0f643 casper fixes. remove cron from browser since it's run on server, will 
add in an HP animation later
 2013-01-20 17:49:30 -05:00
Tyler Renelle
77072909f0 move notifications to browser.coffee 2013-01-20 16:53:24 -05:00
Tyler Renelle
86402f05bd mass update scoring#cron 2013-01-20 16:37:29 -05:00
Tyler Renelle
3dc9bad6ae redirect when userObj not present (that should never be happening, but 
it is - diagnosing)
 2013-01-20 12:11:20 -05:00
Tyler Renelle
dce251a767 check armor/weapon on userObj (shouldnt have to?) 2013-01-18 21:42:43 -05:00
Tyler Renelle
25227abce9 user balance part of schema 2013-01-18 21:38:29 -05:00
Tyler Renelle
ff3eadb1f6 kickstarter check on userobj 2013-01-18 18:20:34 -05:00
Tyler Renelle
ef980102ba mass assignment on server #3 2013-01-18 17:40:09 -05:00
Tyler Renelle
3c8d18e55e mass assignment on server #2 (@WIP) 2013-01-18 17:29:28 -05:00
Tyler Renelle
7f0d4ee1ec mass assignment on the server (@WIP) 2013-01-18 17:11:45 -05:00
Tyler Renelle
b95e063543 remove aws notification 2013-01-18 12:11:06 -05:00
Tyler Renelle
7d640db6b1 comment out force ssl 2013-01-18 12:10:54 -05:00
Tyler Renelle
4b48336098 aws notification 2013-01-18 12:10:15 -05:00
Tyler Renelle
f1bfe7ae69 Revert "remove duplicates, also remove grey / empty tasks" 
This reverts commit 89dcc25364.
 2013-01-15 21:38:00 -05:00
Tyler Renelle
d03b4b5477 Revert "woops, typo with last commit" 
This reverts commit 172afc5f13.
 2013-01-15 21:28:56 -05:00
Tyler Renelle
172afc5f13 woops, typo with last commit 2013-01-15 21:24:49 -05:00
Tyler Renelle
89dcc25364 remove duplicates, also remove grey / empty tasks 2013-01-15 21:02:30 -05:00
Tyler Renelle
f5a07f0a1c use stripe v2 for easier checkout form 2013-01-15 14:35:25 -05:00
Tyler Renelle
4702b64fe4 reset armor & weapon on too 2013-01-14 18:54:57 -05:00
Tyler Renelle
d3b5cd454d show kickstarter for everyone 2013-01-12 12:27:59 -05:00
Tyler Renelle
2ec926dff3 no more tokens on death 2013-01-11 14:04:07 -05:00
Tyler Renelle
860b89cdb1 show kickstarter notification 2013-01-10 22:06:53 -05:00
Tyler Renelle
4e9c0def68 reset balance when user clicks reset 2013-01-08 09:48:11 -05:00
Tyler Renelle
e4afeb9b8e move from underscore to lodash so don't need extra clone module 2013-01-02 12:27:36 -05:00
Tyler Renelle
5546031ddb test username first, before facebook 2013-01-01 20:29:39 -05:00
Tyler Renelle
c4099f8519 duplicates bug: _.uniq was expected list to be sorted, they're not sorted 2013-01-01 19:12:45 -05:00
Tyler Renelle
77f938a9ba re-order createApp / .use 2012-12-31 16:09:36 -05:00
Tyler Renelle
57122e9ebe update to latest derby#master, including necessary changes from https://github.com/codeparty/derby/issues/187 2012-12-27 13:02:58 -05:00
Tyler Renelle
b41b5d3603 upgrade bootstrap-tour to use html 2012-12-12 20:29:28 -07:00
Tyler Renelle
b8d4a9d6a2 move all javascript file loading (/public/js/* and external scripts) 
from html file to javascript load function. This way we can utilize
require() for concatenation & faster page load, and $.getScript() for
async script-loading
 2012-12-05 08:09:27 -08:00
Tyler Renelle
07a614259f username/password registration now available 2012-12-04 15:18:59 -08:00
Tyler Renelle
c20552b99f only set unique idlists if there were duplicates to begin with 2012-11-15 23:14:59 -05:00
Tyler Renelle
c828593cac remove set _loggedIn , handled by derby-auth 2012-11-15 22:44:23 -05:00
Tyler Renelle
96d0681063 put cron back to timeout 1s, revisit later 2012-11-15 14:19:19 -05:00
Tyler Renelle
2bece89b37 fix legacy facebook name bug 2012-11-15 13:10:59 -05:00
Tyler Renelle
f1912635b0 *sigh* 2012-11-15 11:33:38 -05:00
Tyler Renelle
c3f6671004 heroku is having trouble with derby-auth/node_modules/guid 2012-11-15 11:26:05 -05:00
Tyler Renelle
5310bb0908 redirect purl to /users/:uid for compatibility with derby-auth. still 
legacy, will remove eventually
 2012-11-15 10:26:35 -05:00
Tyler Renelle
91364e19b6 gut custom everyauth code & replace with derby-auth 2012-11-15 00:47:58 -05:00
Tyler Renelle
fb1fc7eb80 setting up for syncing private & public branches 2012-11-14 17:37:38 -05:00
Tyler Renelle
322963c898 try going back to underscore and node.clone, heroku doesn't like lodash 2012-10-28 15:32:08 -04:00
Tyler Renelle
86251bd794 Revert "Revert "add reset button"" 
This reverts commit 8deebf293d12bfaf7cf68e4a27ff76abd76b0ffa.

Conflicts:
	lib/app/index.js
 2012-10-28 15:31:53 -04:00
Tyler Renelle
82fabb17cc Revert "add reset button" 
This reverts commit 023f7ab28ad5a216f752e9f93d99ba876e17dfc0.

Conflicts:
	lib/app/index.js
 2012-10-28 15:31:39 -04:00
Tyler Renelle
677266acf5 add reset button 
Conflicts:
	lib/app/index.js
 2012-10-28 15:31:18 -04:00
Tyler Renelle
d5cc627c74 remove duplicates on the server instead 
Conflicts:
	lib/app/index.js
 2012-10-18 00:08:15 -04:00
Tyler Renelle
2e2d09a7d1 better routes delegation in /:uid? 2012-10-12 11:53:58 -04:00
Tyler Renelle
b672a07632 ssl round 4 2012-10-12 08:48:32 -04:00
Tyler Renelle
6a42b681e3 a bunch of small fixes 2012-10-12 07:11:06 -04:00
Tyler Renelle
cb42e88f13 cleaner date format in graphs 2012-10-11 12:52:40 -04:00
Tyler Renelle
f78cd64218 bug fix on missing task 2012-09-24 21:29:53 -04:00
Tyler Renelle
9d165a0ff7 async + user aggregate hp loss 2012-09-24 21:23:29 -04:00
Tyler Renelle
ce901f7b93 back to syncronous calls on the client 2012-09-24 20:10:49 -04:00
Tyler Renelle
893b0bd383 try running cron on the server instead 2012-09-24 19:40:18 -04:00
Tyler Renelle
33f8c43e93 more bug-fixing on async cron, using lodash instead of underscore 2012-09-24 16:45:37 -04:00
Tyler Renelle
baf689a8d1 scoring function refactoring & testing 2012-09-24 14:23:11 -04:00
Tyler Renelle
d929905c48 use model events to handle stats notifications. not perfect, need to 
fix handling of "undo exp/gp" operation
 2012-09-24 09:56:34 -04:00
Tyler Renelle
0ba7ccd370 move scoring functions around 
Conflicts:

	lib/app/index.js
	src/app/index.coffee
 2012-09-24 09:56:25 -04:00
Tyler Renelle
cffc3aef75 minor tweaks 
Conflicts:

	lib/app/index.js
 2012-09-24 09:52:22 -04:00
Tyler Renelle
8480ef3564 some bugs which are a result of user not being tested as already dead. 
using scoring.setUser() so we don't have to pass user all over the
place, there's probably a better approach -- revisit
 2012-09-20 10:57:32 -04:00
Tyler Renelle
be9d419313 Quarters system, generalized modal dialogs, bug fixes 2012-09-18 21:37:49 -04:00
Tyler Renelle
3f045e0604 add facebook login image, logout link, settings modal with user id 2012-09-15 20:27:50 -04:00
Tyler Renelle
bde52a01a9 Pull in changes from private branch, including many bug fixes and - 
drumrole - functioning facebook auth!!
 2012-09-15 15:06:51 -04:00
Tyler Renelle
10c5fecb75 Merge branch 'master' of https://github.com/lefnire/habitrpg 2012-09-07 19:35:24 -04:00
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
ee2c4663d5 Pull in a bunch of changes from private branch, initial everyauth code 2012-09-07 17:23:31 -04:00
Tyler Renelle
9fd4367a8a pull in some changes from private branch 2012-09-06 15:33:06 -04:00
Tyler Renelle
79cf7d2bb9 use linear growth TNL algorithm 2012-09-06 12:28: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
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
91711aad07 use heart & star icons instead of HP / Exp 
Conflicts:

	lib/app/index.js
 2012-09-04 16:09:54 -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
06e96407d3 Fix firefox by removing the document.execCommand('useCSS', false, true) stuff 2012-09-04 14:28:48 -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
1dea15f551 prevent long-standing red tasks from being deleted by hurting on delete 2012-09-01 19:15:26 -04:00
Tyler Renelle
91e4a50179 divide tibia TNL by 5, make leveling easier 2012-09-01 16:46:44 -04:00
Tyler Renelle
b711ccfc03 Move purl authentication to server/index.js and don't redirect. keep 
them on that url
 2012-08-26 16:02:42 -04:00
Tyler Renelle
56570351af add comment about @on('render') 2012-08-24 10:34:09 -04:00
Tyler Renelle
e4524e0958 temporary fix on _purl, using $().val() instead of view binding 2012-08-23 22:54:18 -04:00
Tyler Renelle
29acf91e03 some typos and bugs, though didn't seem to fix anything 2012-08-09 11:02:56 -04:00
Tyler Renelle
b2cd9c0d0f use Addthis, some other attempts at fixing the weird bug 2012-08-08 09:57:32 -04:00
Tyler Renelle
73e857049e use page.redirect('/') after setting session, so don't have to use 
middleware (don't need to use purl the whole time)
 2012-08-06 16:55:51 -04:00
Tyler Renelle
e3700bc183 attempt fix using _.each in place of for loops 2012-08-06 16:04:49 -04:00
Tyler Renelle
203632b6a1 try using setTimeout to fix poormanscron-on-load issue 2012-08-06 13:39:27 -04:00
Tyler Renelle
6d204fb08c remove poormanscron() from refresh for now, only in setInterval 2012-08-06 12:34:54 -04:00
Tyler Renelle
2e3e99e366 small passed.cron bug fix 2012-08-06 10:15:58 -04:00
Tyler Renelle
0f013d2ef3 DRY daysPassed with helpers.daysBetween 2012-08-06 09:48:18 -04:00
Tyler Renelle
364641740a use node.extend module to deep-copy schema.userSchema when creating 
new users - was a bug that duplicated initial tasks for each new user
 2012-08-02 22:51:39 -04:00
Tyler Renelle
e2c5096311 removing accesscontrol for now, but at least only subscribing to the 
necessary data
 2012-08-02 14:36:55 -04:00
Tyler Renelle
71a4430efc almost got accessControl working, getting errors in createWriteGuard 2012-08-02 14:12:17 -04:00
Tyler Renelle
595ad960f3 attempts at purlMiddleware - using server/index.js to set 
session.userId so can properly handle access paths
 2012-07-31 19:21:45 -04:00
Tyler Renelle
630a6bf9ce Remove loading of a bunch of external javascript files if usign mobile device 2012-07-31 12:59:42 -04:00
Tyler Renelle
b2c9035ca9 convert viewHelpers to helpers, for other util functions in there. 
some template code for next schema update
 2012-07-30 17:25:04 -04:00
Tyler Renelle
035a705805 put stuff in viewHelpers file 2012-07-28 17:02:09 -04:00
Tyler Renelle
3895d0610a many bug fixes regarding schema updates 2012-07-28 16:26:06 -04:00
Tyler Renelle
994efb5f79 Add clear-completed button 2012-07-28 00:01:58 -04:00
Tyler Renelle
8c50969899 Add a schema and schema-updating mechanism. not ideal the way it is, 
but bette than nothing
 2012-07-27 23:10:20 -04:00
Tyler Renelle
05121a2d18 Finished _todoList/_completedList transfering. instead of remove/push 
on lists, just splice/push to todoIds and completedIds
 2012-07-27 22:29:02 -04:00
Tyler Renelle
33c5acf5ec use 'passed' parameter to ignore *.completed on cron 2012-07-27 21:56:21 -04:00
Tyler Renelle
b9a9239bbd moved tally functionality into scoring file 2012-07-27 21:11:53 -04:00
Tyler Renelle
52a96eb5e3 fix for *.completed on dailies 2012-07-27 20:47:59 -04:00
Tyler Renelle
1eae25ae54 _completedList working properly for todos, messes up dailies 2012-07-27 20:35:05 -04:00
Tyler Renelle
aff781ad3d Attempt at _completedList. still has race condition with setting *.copmleted 2012-07-27 19:38:28 -04:00
Tyler Renelle
bcc3c488bb Use racer.uuid() instead of Guid.raw() 2012-07-20 21:45:53 -04:00
Tyler Renelle
0b58c24e58 Moved scoring functionality into score.coffee, separate it out so i 
can start implementing services
 2012-07-20 21:39:29 -04:00
Tyler Renelle
2f008533bc more comment on accessControls not being called 2012-07-19 14:59:45 -04:00
Tyler Renelle
d53668065d comment on accessControl failing 2012-07-19 14:52:03 -04:00
Tyler Renelle
2bb4af286e All the setup necessary to get accessControl working (theoretically), 
still doesn't work
 2012-07-19 14:48:49 -04:00
Tyler Renelle
1afdfaaa53 remove some debugging code 2012-07-18 08:59:29 -04:00
Tyler Renelle
5bed0351af Update model.session.userId for next requests 2012-07-17 18:10:17 -04:00
Tyler Renelle
7f1693b425 fixed initial tasks not havign .id 2012-07-17 16:35:26 -04:00
Tyler Renelle
39329dba3a Almost fixed saved session management 2012-07-17 15:55:36 -04:00
Tyler Renelle
bc6b30ee5a better defaultTasks implementation 2012-07-17 15:45:05 -04:00
Tyler Renelle
4261ff82c7 Closer to getting initial contentn imported properly 2012-07-17 15:33:08 -04:00
Tyler Renelle
036badb3e4 Step towards working with new middleware, still broken 2012-07-17 14:47:19 -04:00
Tyler Renelle
98e824eb2e Remove tyler defaults & "toggle debug" button 2012-07-16 18:10:01 -05:00
Tyler Renelle
e6e8f87d3d try using "for in []" isntead of underscore for cron debugging 2012-07-16 18:01:18 -05:00
Tyler Renelle
961d06a5ee Remove hp & exp logging 2012-07-16 17:06:44 -05:00
Tyler Renelle
3a155fb306 Trying (new Date) instead of new Date() due to multiple crons on 1 day bug 2012-07-13 09:43:53 -05:00
Tyler Renelle
2620b25ffb Check at least if url is a guid, better to check if model exists but 
that's not working
 2012-07-11 20:14:29 -04:00
Tyler Renelle
2fa58da27e purl bug fix 2012-07-11 20:07:54 -04:00
Tyler Renelle
584dd1c4b0 Note on a purl error that is bound to happen, properly link purl text 2012-07-11 19:44:52 -04:00
Tyler Renelle
08632bd17a Add persistent URL for accessing data accross multiple 
browsers (temporary solution to no authentication)
 2012-07-11 19:27:53 -04:00
Tyler Renelle
42610f189e And removing it, dangerous 2012-07-11 16:24:58 -04:00
Tyler Renelle
186bcac166 Adding loadUserSession debugging 2012-07-11 16:24:41 -04:00
Tyler Renelle
8417e8fd62 Add cron to debugging buttons 2012-07-11 15:58:17 -04:00
Tyler Renelle
03b5361be9 history charts: use date.toDateString() when done debugging 2012-07-11 15:38:01 -04:00
Tyler Renelle
25d42f078f remove console.log on previous 2012-07-11 15:26:27 -04:00
Tyler Renelle
095865ff2e lastCron: set as midnight using new Date().toDateString() 2012-07-11 15:24:23 -04:00
Tyler Renelle
8f43f7d0c7 lastCron: setting as difference between two dates on midnight, 
currently a bug where it calculates the difference in 24h between two
dates
 2012-07-11 15:13:08 -04:00
Tyler Renelle
48f26edfb7 use math.floor, not math.round, when computing daysPassed on cron 2012-07-11 14:37:47 -04:00
Tyler Renelle
e4257766a6 poormanscron: run once ever hour on client 2012-07-11 10:17:47 -04:00
Tyler Renelle
b974d98f36 Add "revive" modal on death 2012-07-08 23:29:54 -04:00
Tyler Renelle
9f671548b5 implemented exp & hp modifiers based on lvl & armor/weapon 2012-07-08 22:23:57 -04:00