Commit graph

369 commits

Author SHA1 Message Date
Tyler Renelle
598f2f6c46 habitrpg-shared: don't cloneDeep our user object for the time being. we can't access __proto__ objects as a result (see https://github.com/codeparty/racer/issues/116), the negative side-effect is this cause certain notifications not to show, because model.on() listeners can't tell the difference between $spec object properties & model.get() 2013-05-22 11:08:05 +01:00
Tyler Renelle
2230ce6688 habitpg-shared: move viewHelpers to misc, add hydrate() function (see https://github.com/codeparty/racer/issues/116) to prevent data-loss on user.get() 2013-05-22 00:40:54 +01:00
Tyler Renelle
f412a20203 habitrpg-shared: cron bug-fixes 2013-05-20 10:56:38 +01:00
Tyler Renelle
83ac2adb79 habithabitrpg-shared: cron mostly working wiht habitrpg-shared 7805a2ba26 2013-05-20 01:15:33 +01:00
Tyler Renelle
0b445df909 habitrpg-shared: *almost* working wth new scoring (c0cf9780fe) - need to fix for cron, API, and other misc bugs 2013-05-19 23:50:41 +01:00
Tyler Renelle
6a36f4bd1d habitrpg-shared: helpers now working d42ac5d53c 2013-05-19 18:53:13 +01:00
Tyler Renelle
92b178b4a4 huge cron fixes which should solve streak, dayStart, "timezone" issues 2013-05-14 17:39:42 +01:00
Daniel Saewitz
ce6914f0c8 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-12 14:00:33 -04:00
Daniel Saewitz
445a968a9b Merge 2013-05-12 13:58:50 -04:00
Tyler Renelle
2164e7322b _partyMembers fetch as async to final 3-part subscription. test on
beta first
2013-05-12 00:56:02 +01:00
Tyler Renelle
0421c2e61b back to double _party - fetch then subscribe, separatated
subscriptions seem to be causing problems
2013-05-11 13:08:09 +01:00
Tyler Renelle
e701d98bd7 make solo-user subscription a callback of unsubscribe 2013-05-11 12:32:36 +01:00
Tyler Renelle
747b6e7930 BREAKING CHANGE - fetch _partyMembers, subscribe to _party, _user,
_tavern. Could cut back substantially on subscription overhead. fetch
is async to the subscriptions, need to test on beta that this is kosher
2013-05-11 12:13:48 +01:00
Daniel Saewitz
58d6c39be8 Allow translations to be set from local model 2013-05-09 13:07:54 -04:00
Tyler Renelle
da4738ac1a move the subscriptions setup into index.coffee 2013-05-08 15:14:41 +01:00
Tyler Renelle
a3003a758d Merge branch 'tags' into develop
Conflicts:
	src/app/index.coffee
	src/app/tasks.coffee
	styles/app/index.styl
	views/app/index.html
	views/app/settings.html
	views/app/tasks.html
2013-05-06 14:01:43 +01:00
Tyler Renelle
c3eadab4dc notify of new chat messages 2013-05-02 20:23:50 +01:00
Tyler Renelle
c0bfd84be0 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-04-26 22:28:45 +01:00
Tyler Renelle
8ae5716f40 move app-creation below library components #864 2013-04-26 22:27:20 +01:00
scroll lock
130b6ccdc4 Started Bulgarian translations. 2013-04-24 15:58:32 -04:00
Tyler Renelle
08f7367e17 Revert "move task-corruption cleanup to the browser" 2013-04-18 19:15:59 -04:00
Tyler Renelle
878bf3f72a remove commented-out force-ssl, since we're handling it in nginx. refer back here if needed again 2013-04-18 16:55:04 -04:00
Tyler Renelle
3772672e95 move task-corruption cleanup to the browser. @yangit see if this fixes
the freeze on your end?
2013-04-18 16:52:47 -04:00
Tyler Renelle
47d2e299db only do batch.commit() for corruptedTasks if corruption was found 2013-04-18 16:32:30 -04:00
Tyler Renelle
7e0329ef3a move all feature-unlocking popover notifications into unlock.coffee,
so we can better manage from one location and share some code. @switz
notice my change to scoring.coffee - see the comment added for the
reasoning. This before/after checking change is required for the
API
2013-04-16 13:46:44 -04:00
Tyler Renelle
3b3d4d243a better wasCorrupted test 2013-04-11 11:49:55 -04:00
Tyler Renelle
81eb2afd9d some more comments on corrupt tasks 2013-04-11 11:39:54 -04:00
Tyler Renelle
8ed72ae2aa back to transction for corruptTasks 2013-04-11 11:33:50 -04:00
Tyler Renelle
570f376421 more fixes to task corruption 2013-04-10 19:24:27 -04:00
Tyler Renelle
b736713624 alright, i give up. put the full restore/cleanup function back in.
refLists...
2013-04-10 18:32:38 -04:00
Tyler Renelle
761aeef8cf move task corruption cleanup back to server to solve #803. This might
pose a problem for #769, but it seems that websockets / nginx version
was the real culprit there.
2013-04-10 17:30:50 -04:00
Joshua Appelman
6ae8504be0 Adds Dutch Translations.
These are a ridumentary first pass, as according to
https://github.com/lefnire/habitrpg/wiki/Translations the localization
implementation is still in a state of flux. Hopefully these can serve
a temporary use in the meanwhile.
2013-04-09 02:04:41 +02:00
Tyler Renelle
f6e53a377f some bug-fixes & cleanup on removal of _view.* 2013-04-08 11:24:45 -04:00
Tyler Renelle
9222b56777 move task-corruption cleanup to cron, restore missing tasks to list -
let's see if this fixes #777
2013-04-07 20:38:28 -04:00
Tyler Renelle
6522badaa6 rename _view.* to _* - don't know why I did that whole _view.* thing
in the first place, but whatevs
2013-04-07 20:29:13 -04:00
Tyler Renelle
584759bd25 shift some require() statements around, attempt to get things out of
app.coffee top-level scope - working towards mem leak fix
2013-04-04 16:44:54 -04:00
Tyler Renelle
1c2cc06a6e BREAKING CHANGE! this removes list cleanup / re-establishment. In the past, id-lists in refLists were being completely emptied (see #85 & #86). I'm still not sure why (see https://github.com/codeparty/racer/issues/101 or https://github.com/codeparty/derby/issues/237 possibly?). This commit reverts working around that issue, but potentially fixes #769. Going to test this on heroku a bit before merging in 2013-04-04 16:24:13 -04:00
Tyler Renelle
0abbc98b1c move all view helpers out of their respective files and into
helpers.coffee. we need viewHelpers at top-level scope, but nothing
else per se - this is preparation for memory leak fixing
2013-04-04 16:17:30 -04:00
Tyler Renelle
f6b2c08a60 Merge branch 'develop' into pets
Conflicts:
	views/app/rewards.html
2013-03-26 17:54:31 -07:00
Daniel Saewitz
8107200105 i18n implemented 2013-03-23 16:03:12 -04:00
Tyler Renelle
3ce2686662 Merge branch 'develop' into switz-inventory
Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html
Merge branch 'develop' into switz-inventory

Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html
2013-03-21 13:51:38 -06:00
Tyler Renelle
f332c5d9a8 Merge branch 'develop' into toebu-tags-filters
Conflicts:
	src/app/index.coffee
	src/app/tasks.coffee
	styles/app/index.styl
	views/app/index.html
	views/app/tasks.html
2013-03-18 17:09:42 -04:00
Tyler Renelle
0c1151b123 don't add bootstrap css files in when instantiating derby-ui-boostrap,
instead compile in with the css. index.coffee directives are run
against static pages too, which overwrites our bootstrap
responsive (which we need) with the app's custom responsive styles. We
may change this, but for now this commit allows us to keep the
marketing site and main site styles separate
2013-03-17 09:11:19 -04:00
Tyler Renelle
4614e48cdc Adding first rudimentary version of tagging and filtering. New users get three tags: morning, afternoon and evening. At the moment, one can not change these tags or add new ones. There are also some problems: tagging a newly added task, also tags one of the existing tasks. Also, when having an active filter and removing the corresponding tag from a task, that task is immediately hidden, although you are still editing it. 2013-03-17 09:10:27 -04:00
Daniel Saewitz
7083e7a103 yarr, fix all teh bugs 2013-03-16 16:30:45 -04:00
Daniel Saewitz
510bcda47c wip 2013-03-08 12:44:21 -05:00
Zachary Kain
ce19fed852 remove responsive from bootstrap includes. Rolling our own! 2013-03-06 00:50:38 -05:00
Tyler Renelle
bd19e09fcf possible fix for #324 - shuffle some function placement to be sure
definition precedes function call. put re-rendering
functionality (setupSortable, setupTour, etc) into app.on('render')
2013-03-04 11:17:17 -05:00
Tyler Renelle
d20fccea75 pass model by reference to scoring functions 2013-03-02 23:38:31 -05:00
Tyler Renelle
9b20d8ceba move scoring to its own class (attempt to remove model from hanging
around in closure on server, which is what's causing our memory leak -
see http://goo.gl/7Gt0M)
2013-02-26 16:51:00 -05:00