sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 09:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2700 commits 3 branches 0 tags 1.6 GiB
Commit graph

884 commits

Author SHA1 Message Date
Tyler Renelle
35039e6af6 support legacy _user.auth.facebook.name in index.html 2012-11-15 11:50:43 -05:00
Tyler Renelle
91364e19b6 gut custom everyauth code & replace with derby-auth 2012-11-15 00:47:58 -05:00
Tyler Renelle
4a6ce103a6 update footer links with new wiki pages 2012-11-09 13:48:33 -05: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
bc460e5ecd Saewitz fix 2012-10-28 12:24:21 -04:00
Tyler Renelle
489e61c4e4 add github-btns back in, as local clone into /public files 2012-10-12 08:48:25 -04:00
Tyler Renelle
80922c1047 setting up iframes to remove ssl errors: addthis as https, removing 
github-btns for now (will add back in when I can do it with https)
 2012-10-11 17:31:45 -04:00
Tyler Renelle
bad2f6f5b3 Revert "Just pass in task object to taskClasses view helper", this was 
breaking deleting tasks - revisit later

This reverts commit d04140977f.
 2012-10-11 11:15:39 -04:00
Tyler Renelle
d04140977f Just pass in task object to taskClasses view helper 2012-09-29 18:03:47 -04:00
Tyler Renelle
4866fe602d remove moment.js, included with require 2012-09-25 22:19:50 -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
0ba7ccd370 move scoring functions around 
Conflicts:

	lib/app/index.js
	src/app/index.coffee
 2012-09-24 09:56:25 -04:00
Tyler Renelle
6c32f42bb1 user-tokens as uneditable-input instead of well 2012-09-20 10:57:39 -04:00
Tyler Renelle
53659d7ac8 use github's social-count classes for token-cost 2012-09-19 09:50:41 -04:00
Tyler Renelle
5f771ef830 rename quarters to tokens 2012-09-19 09:50:39 -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
47eb7dc606 copyright & gittip 2012-09-15 15:15:59 -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
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
3cb7fd75c8 smaller bookmark button 2012-09-06 12:28:05 -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
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
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
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
c201921dc1 cleaner footer html 2012-09-04 14:28:46 -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
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
68079f5bfc send growl notifications for points gained/lossed & level up 
Conflicts:

	src/app/scoring.coffee
 2012-09-01 14:26:12 -04:00
Tyler Renelle
928c951b1c Addthis refers to domain (https://github.com/lefnire/habitrpg/issues/1) 2012-08-29 09:16:29 -04:00
Tyler Renelle
a4cbe3886d Have to use absolute positioning on .progress-text instead of float, 
with bootstrap 2.1. upgrade bootstrap-responsive.styl
 2012-08-23 23:53:40 -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
c5bbc67f05 some script cleanup 2012-08-09 12:16:33 -04:00
Tyler Renelle
c928ef4c9d put github button back in with new spec 2012-08-09 11:32:33 -04:00
Tyler Renelle
4b28ab9235 only use google analyatics in production 2012-08-09 11:22:44 -04:00
Tyler Renelle
47a451b578 Disable git follow button for now, needs to be fixed with "star" instead 2012-08-09 11:20:52 -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
630a6bf9ce Remove loading of a bunch of external javascript files if usign mobile device 2012-07-31 12:59:42 -04:00
Tyler Renelle
6f0520a5e4 Use twitter instead of addthis. now just github & twitter. can't 
decide on stuff
 2012-07-30 20:23:59 -04:00
Tyler Renelle
216a8a7fad put addthis loadscripts in <Tail>, comment out gittip for now 2012-07-30 19:55:11 -04:00
Tyler Renelle
1819ac6a9d Merge branch 'sticky-footer' into derby 2012-07-30 19:43:31 -04:00
Tyler Renelle
9343d0cd37 move optional/slow-loading scripts to <Tail:> 2012-07-30 17:32:36 -04:00
Tyler Renelle
88cd49fa0d Adding sticky footer code & social-links 2012-07-30 17:26:06 -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
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
ad2bce0db9 bring underscore back 2012-07-27 19:37:16 -04:00
Tyler Renelle
ddd691df24 remove demo.html 2012-07-25 20:02:28 -04:00
Tyler Renelle
2b3f1707b8 Add SEO text so google doesn't get strange copy 2012-07-25 19:51:05 -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
9437da73d1 Add google analytics 2012-07-18 22:02:22 -04:00
Tyler Renelle
6cdac47ab5 use nav-pills instead of nav-tabs 2012-07-18 13:38:30 -04:00
Tyler Renelle
a8499b125a Fix save button 2012-07-18 13:21:00 -04:00
Tyler Renelle
70a78767fc fixed todo chart-selector 2012-07-18 10:06:34 -04:00
Tyler Renelle
d823a762b0 Upgraded external js files: bootstrap-tour, jquery-ui.min, 
jquery.cookie, jquery.min
 2012-07-18 10:04:09 -04:00
Tyler Renelle
c4b34a2d93 move scripts to /public/js, downloaded google's jsapi there (so don't 
have to load)
 2012-07-18 09:51:19 -04:00
Tyler Renelle
b9fb4fc39e Fixd experience history click 2012-07-18 09:00:32 -04:00
Tyler Renelle
7f1693b425 fixed initial tasks not havign .id 2012-07-17 16:35:26 -04:00
Tyler Renelle
98e824eb2e Remove tyler defaults & "toggle debug" button 2012-07-16 18:10:01 -05:00
Tyler Renelle
89f4e228c2 don't need underscore now 2012-07-16 18:01:53 -05:00
Tyler Renelle
682d0d1180 space next to Bugs 2012-07-11 21:24:14 -04:00
Tyler Renelle
ccbd28726d Add 'bugs' link in footer 2012-07-11 19:46:19 -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
788646aac9 Add footer link to old site 2012-07-09 12:45:28 -04:00
Tyler Renelle
7cd42ef518 restored browserquest folder, moved mods to habitrpg_mods 2012-07-09 00:24:37 -04:00
Tyler Renelle
7b28af5617 Placeholder text 2012-07-09 00:12:56 -04:00
Tyler Renelle
1743eb95b7 remove unescaped :task.text 2012-07-09 00:07:39 -04:00
Tyler Renelle
c8a5a2507e larger revive button 2012-07-08 23:42:46 -04:00
Tyler Renelle
7df7f13939 Prettier dead modal 2012-07-08 23:34:20 -04:00
Tyler Renelle
b974d98f36 Add "revive" modal on death 2012-07-08 23:29:54 -04:00
Tyler Renelle
4120a39df5 fix popover bug (they didn't show aftre editing stuff) , model.on 
'set', * which isn't very efficient, revisit
 2012-07-08 21:51:25 -04:00
Tyler Renelle
87f832be12 Implemented re-roll 2012-07-08 21:35:32 -04:00
Tyler Renelle
c71f1d9424 more bug fixes, store still messed up when final armor & weapon purchased 2012-07-08 21:20:30 -04:00
Tyler Renelle
f58cd5609a many bug fixes, but weapon is still tripping out 2012-07-08 19:56:55 -04:00
Tyler Renelle
ecc3bdee2d purchasing weapons & armor now updates the images 2012-07-08 19:37:36 -04:00
Tyler Renelle
3305697a4e Can buy items, storing to user now. many bug fixes 2012-07-08 18:58:11 -04:00
Tyler Renelle
2ddbe61141 put unlockedMessage in content.coffee, some prep for purchase button 2012-07-08 18:06:13 -04:00
Tyler Renelle
72dc25a604 exp text bug fix 2012-07-08 17:59:59 -04:00
Tyler Renelle
2d8f0ee39b Popover telling user they've unlocked Items Store 2012-07-08 17:59:50 -04:00
Tyler Renelle
3b4a3f27d4 refactored so user = {stats: {hp, lvl, exp, money}, items = {weapon, 
armor, ..}, tasks, ...}
 2012-07-08 16:59:07 -04:00
Tyler Renelle
6761a7f89e Adding images as icons for static rewards 2012-07-08 14:50:56 -04:00
Tyler Renelle
74513509bb Static rewards in content.coffee. displayed as such in index.html & index.coffee 2012-07-07 23:43:35 -04:00
Tyler Renelle
217224429f Basic setup for static rewards 2012-07-07 22:43:49 -04:00
Tyler Renelle
fdad916872 remove contenteditable, already have a method for editing 2012-07-07 17:58:32 -04:00
Tyler Renelle
99b17a4ab1 Add responsive.css 2012-07-07 17:53:57 -04:00
Tyler Renelle
4a34a41f0d Add footer (static right/bottom 0 0, need to fix this) 2012-07-07 17:03:58 -04:00
Tyler Renelle
a4675defec Default tasks are now the rest of the tour, removing the helpIcons 
from task columns
 2012-07-07 13:58:56 -04:00
Tyler Renelle
64f071a94c Placed helpIcon & task columns in <app:taskColumn> component 2012-07-07 13:08:36 -04:00
Tyler Renelle
a45cb18db2 Help icons 2012-07-07 12:58:34 -04:00
Tyler Renelle
7fb26ab7c5 Adding bootstrap-tour with some initial steps 2012-07-07 12:31:51 -04:00
Tyler Renelle
16c8ba8370 Sortable is working!!!!!!!! 2012-07-07 00:07:30 -04:00
Tyler Renelle
5377681559 exp-chart in <td> 2012-07-06 23:10:37 -04:00
Tyler Renelle
623db84502 Generalized exports.toggleChart function that takes data- attributes 
for arguments
 2012-07-06 22:46:22 -04:00
Tyler Renelle
5fefd4df2b only show exp-chart if _user.history.exp 2012-07-06 22:20:36 -04:00
Tyler Renelle
9332d9c175 Fix bug on 0 lvl exp-chart 2012-07-06 17:21:36 -04:00
Tyler Renelle
97478120ff Add user-experience chart (need to put it in a modal or popover or something) 2012-07-06 16:54:57 -04:00
Tyler Renelle
626b44bc66 Add undescore library 2012-07-06 16:44:09 -04:00
Tyler Renelle
bb37272c07 Add debugging buttons if _debug=true 2012-07-06 15:22:47 -04:00
Tyler Renelle
94bf8e3188 Save button bug 2012-06-29 16:31:32 -04:00
Tyler Renelle
412f7bf50b lastCron bug fix (still buggy though) 2012-06-29 10:16:02 -04:00
Tyler Renelle
459f0ce91a total todos tally chart 2012-06-29 09:45:50 -04:00
Tyler Renelle
2ca050d61e Bug fixes on endOfDayTally, put it back into htlm for testing purposes 2012-06-29 09:04:35 -04:00
Tyler Renelle
7189a8fcfb And we have charts! easier than i thought it would be :o 2012-06-29 04:33:09 -04:00
Tyler Renelle
bed2c2e9f6 General <taskMeta:> component for handling charts, edit, and whatever 
else might come along
 2012-06-28 22:32:19 -04:00
Tyler Renelle
18e8472099 Add task.history = [], updated on cron. this will be used for charts later 2012-06-28 21:22:24 -04:00
Tyler Renelle
d4aee014b0 poormanscron() which is run on refresh, and performs endOfDayTally() 
for every day missed. TODO: put this in a proper cron location
 2012-06-28 19:15:46 -04:00
Tyler Renelle
7f00846af0 endOfDayTally is implemented, but is not working for 
model.at('_users') and is not on cron, it's on click of <a>. come back
to this
 2012-06-28 18:03:51 -04:00
Tyler Renelle
3a3829bb10 remove class="input-medium" 2012-06-27 11:04:10 -04:00
Tyler Renelle
b89f4347e4 Add class='well' to panels. looks a bit nicer 2012-06-27 10:56:48 -04:00
Tyler Renelle
b9c3d4d4b5 Use <pre> for list styling. it's much prettier, but it's meant for 
code formatting, so this might cause issues in the future - revert if so
 2012-06-27 10:54:04 -04:00
Tyler Renelle
b51522b159 Remove money style 2012-06-27 10:09:04 -04:00
Tyler Renelle
3946e2b68c user lvl is badge 2012-06-27 10:07:16 -04:00
Tyler Renelle
57476d1e3f prettier edit form, & x-bind form instead of <a> 2012-06-27 09:48:47 -04:00
Tyler Renelle
4c6bd8bc84 Implemented Remaining | Completed tabs by having two identical lists 
with each <li> hidden based on model.get('_hideCompleted') - which is
set by tab clicks. This sucks, revisit when I understand managing
refLists better
 2012-06-27 09:37:36 -04:00
Tyler Renelle
4b95476cb8 float reward & todo h1s 2012-06-26 16:55:41 -04:00
Tyler Renelle
2369b05108 ul.{type} instead of {type} ul, but still not working 2012-06-26 12:01:57 -04:00
Tyler Renelle
15dda64aab Add class={type} back in for sort (sort still not working) 2012-06-26 11:44:37 -04:00
Tyler Renelle
29b6a982a1 span3 instead 2012-06-26 11:28:03 -04:00
Tyler Renelle
fa6014d275 Fixed purchases by renaming both "score" and "price" to "value" 2012-06-26 11:02:29 -04:00
Tyler Renelle
971a18da9f buy-link 2012-06-26 10:59:37 -04:00
Tyler Renelle
1733bdd658 fixed checkbox vote 2012-06-26 10:55:24 -04:00
Tyler Renelle
3c4e7d082f Add <hr/> 2012-06-26 10:42:07 -04:00
Tyler Renelle
058cc7e264 inline up/down checkboxes 2012-06-26 10:41:18 -04:00
Tyler Renelle
3a4432b4c8 edit icon instead of text 2012-06-26 10:41:08 -04:00
Tyler Renelle
0d16eb1e3c better new-todo placement 2012-06-26 10:41:02 -04:00
Tyler Renelle
c2a093c0f9 proper textarea 2012-06-26 10:32:56 -04:00
Tyler Renelle
4faad8c474 use local jquery.min.js & jquery-ui.min.js for now 2012-06-26 10:26:34 -04:00
Tyler Renelle
472f510931 Add bootstrap.min.js requirement 2012-06-26 10:25:27 -04:00
Tyler Renelle
ed459e5451 removed <taskList:> and inserted inline. didn't save much, and 
couldnt' customize
 2012-06-26 10:22:01 -04:00
Tyler Renelle
9a34bfd9be reorganize html 2012-06-26 09:24:12 -04:00
Tyler Renelle
0104e50309 put header in <Head:> 2012-06-26 09:23:16 -04:00
Tyler Renelle
964ce8ed22 progress-text in progress-bar 2012-06-26 09:19:26 -04:00
Tyler Renelle
6168752673 don't need overlay 2012-06-26 09:10:02 -04:00
Tyler Renelle
bf1efdebb4 inline add form 2012-06-26 08:56:57 -04:00
Tyler Renelle
5ffcaa55aa submit button uses bootstrap 2012-06-26 08:25:38 -04:00
Tyler Renelle
6d62baeafe Support task.score in css classes 2012-06-26 08:02:16 -04:00
Tyler Renelle
30cc513f54 Changes to habits.stly to support tasks 2012-06-26 07:55:43 -04:00
Tyler Renelle
a8126ec487 popover notes instead of tooltip 2012-06-24 22:39:01 -04:00
Tyler Renelle
59e565170c Better save button 2012-06-24 22:34:45 -04:00
Tyler Renelle
e6b4fe4d9d Reward price & save/delete button 2012-06-24 22:12:06 -04:00
Tyler Renelle
4d3b882b89 screw it. not using modal or popover for now, just hidden div like pivotal 2012-06-24 21:51:13 -04:00
Tyler Renelle
d1ecf7d772 Got modal edit working 2012-06-24 20:51:42 -04:00
Tyler Renelle
d0f31a62f4 remove alert from html (since it's in /ui), add some bootstrap scripts 2012-06-20 21:28:33 -04:00
Tyler Renelle
aafcfbbb69 Add ui connection alert 2012-06-20 20:47:08 -04:00
Tyler Renelle
699fc9ab1b Moved html comments 2012-06-20 19:20:47 -04:00
Tyler Renelle
fd792801e6 Attempt at popover with bootstrap (doesn't work) 2012-06-20 19:20:39 -04:00
Tyler Renelle
f55cf4d906 stray html comment 2012-06-20 18:59:10 -04:00
Tyler Renelle
0621901669 Still some confusion about .localAttr vs localAttr, especially re: 
vote up & down. but temporary fix
 2012-06-20 18:58:04 -04:00
Tyler Renelle
ea8491e10d Comment out footer for now 2012-06-20 18:44:15 -04:00
Tyler Renelle
399ecd1e99 Rename 2012-06-20 18:42:48 -04:00
Tyler Renelle
541ab5c656 progress bars using bootstrap 2012-06-20 18:34:15 -04:00
Tyler Renelle
9e9823c10f begin using derby-ui-boot 2012-06-20 18:15:38 -04:00
Tyler Renelle
b6d8c279b9 habit stats 2012-06-20 17:30:21 -04:00
Tyler Renelle
fbcfc041e5 round, gold, silver, and users status 2012-06-20 17:30:10 -04:00
Tyler Renelle
4e2d80fbab Cleanup instances of tnl() 2012-06-20 17:14:22 -04:00
Tyler Renelle
52b26c3f94 at least onclick calls :s 2012-06-09 21:16:11 -04:00
Tyler Renelle
ba09af4c39 Adding in habits.js.ejs 2012-06-09 20:57:35 -04:00
Tyler Renelle
5e475d3649 initial sloppy merge of index.html from application.erb 2012-06-09 20:28:58 -04:00
Tyler Renelle
58d9f929eb DRY view complete! still need to get rid of "type" attribute on task 
and put in a view helper somehow
 2012-06-09 20:15:33 -04:00
Tyler Renelle
cf7a271eb6 DRY addTask function 2012-06-09 14:25:10 -04:00
Tyler Renelle
d49dcc4ace Lists sortable, but not persisting 2012-06-08 15:19:11 -04:00
Tyler Renelle
8019ec3472 un-DRYing index.html again. causes too many issues. also note you 
can't use {{{var}}} in component IDs
 2012-06-08 14:57:27 -04:00
Tyler Renelle
cd17e7a540 DRY x-bind form 2012-05-31 20:07:47 -04:00
Tyler Renelle
015c8a87af DRY <dragList:> 2012-05-31 20:02:17 -04:00
Tyler Renelle
4c2fad407e remove floating </div> 2012-05-09 12:26:30 -04:00
Tyler Renelle
e959013a1e Adding habit, daily, todo, & reward basic html components 2012-05-03 18:05:25 -04:00
Tyler Renelle
ee90208bad Adding basic functionality for adding the different habit types, & in html 2012-05-02 21:07:36 -04:00
Tyler Renelle
5ea976ad0b Replacing current app (app/index.coffee, views/app/index.coffee) with 
todo.js example
 2012-04-27 13:04:44 -04:00
Tyler Renelle
d02f890b6f Copying index.html & index.coffee to demo.*, backup for reference 2012-04-27 12:41:44 -04:00
Tyler Renelle
2f8b80b74e Adding empty derby project 2012-04-26 22:03:01 -04:00