sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1453 commits 3 branches 0 tags 1.6 GiB
Commit graph

380 commits

Author SHA1 Message Date
Tyler Renelle
63bef37e98 fixes to gold / silver. Add copper, but not using it in the html (it's 
currently always calculated at 00)
 2013-02-08 16:41:04 -05:00
Tyler Renelle
0c6e51e6c7 avatar for party members 2013-02-08 15:18:15 -05:00
Tyler Renelle
e0d3b4fe3e CAN customize if not registered, but CAN'T join parties 2013-02-08 14:11:18 -05:00
Tyler Renelle
4ac5d5e24d put debugging in if in debugging environment 2013-02-08 13:57:00 -05:00
Tyler Renelle
2be5136a2f shop items now working. really crappy css (@Pandoro save me?) but it works 2013-02-08 13:43:57 -05:00
Tyler Renelle
5160595354 add @Pandoro's new sprites to /styl, clean up 2013-02-08 13:22:09 -05:00
Tyler Renelle
9250b8b2b5 some more fixes on "nextItem" 2013-02-08 12:50:37 -05:00
Tyler Renelle
1bcd4a3fbd some more half-backed changes for the new customization engine 2013-02-08 01:04:38 -05:00
Tyler Renelle
e42d4e6ba6 half-baked commit to save my progress and show my direction, we may 
want to rever this
 2013-02-07 22:42:59 -05:00
Tyler Renelle
b6398964fe got most of the character customizations working 2013-02-07 22:28:44 -05:00
Tyler Renelle
b134ec558d add in popover for customizations (can't get css working properly) 2013-02-07 21:24:04 -05:00
Tyler Renelle
76231aed12 begin integrating spritesheet 2013-02-07 20:53:11 -05:00
Tyler Renelle
1aa047d163 remove debuggging buttons 2013-02-06 15:05:14 -05:00
Tyler Renelle
906932090f Merge branch 'parties' 
Conflicts:
	src/app/helpers.coffee
	src/app/scoring.coffee
 2013-02-06 14:16:52 -05:00
Tyler Renelle
0e6d08e16b add more debug tools, and email me on error 2013-02-06 02:44:42 -05:00
Tyler Renelle
a0c4480c53 cleanup, typos, html tidying 2013-02-06 01:59:02 -05:00
Tyler Renelle
972a7af0ff various fixes and page-refresh fallbacks 2013-02-06 00:47:08 -05:00
Tyler Renelle
63dc9c1305 only show party in menu if unlocked 2013-02-05 20:21:26 -05:00
Tyler Renelle
fbeaabc7c0 sometimes model.session.userId is available, sometimes 
model.get('_userId'). *sigh*
 2013-02-05 19:25:46 -05:00
Tyler Renelle
c1ac873ad5 pretty up the html a bit 2013-02-05 18:52:29 -05:00
Tyler Renelle
9020ca4c17 Merge branch 'master' of github.com:lefnire/habitrpg 2013-02-05 11:54:09 -05:00
Tyler Renelle
dc00b0fb5e fix to 'gender' undefined 2013-02-05 11:51:24 -05:00
Tyler Renelle
f431090e0f forgot to bring in hiding ads 2013-02-05 11:49:17 -05:00
Tyler Renelle
4ac1a84acd kill party with last member, show user avatars in party 2013-02-05 01:46:46 -05:00
Tyler Renelle
6245d0adce setup party model subscriptions (currently very inefficient, and 
unsubscribe not being utilized)
 2013-02-05 01:37:13 -05:00
Tyler Renelle
a67c82aab5 accessControl basic framework for party system 2013-02-05 01:00:43 -05:00
Tyler Renelle
9723f3c37a don't need public/private paths after all, can check path requests in store accessControl callbacks 2013-02-04 23:32:40 -05:00
Tyler Renelle
6966f6a439 modify everything to accomdate migratino 2013-02-04 21:18:13 -05:00
Tyler Renelle
72cefaf787 Merge pull request #304 from Sabin144/master 
Fix for #47
 2013-02-04 15:59:57 -08:00
Tyler Renelle
c62b2d3e05 disable parties, merge in private, back to old REST, hide "next day" button 2013-02-04 17:43:30 -05:00
Tyler Renelle
57a7edc5d3 rename everything "friends" to "party", since we may use friends for 
following/followers feature
 2013-02-04 14:10:20 -05:00
Sabin144
e4d43846f6 Update views/app/index.html 2013-02-04 00:25:46 -05:00
Tyler Renelle
86ea99c2dc add "emulate next day" debugging button 2013-02-01 14:05:52 -05:00
Zachary Kain
791a19893c change the logic dictating change in bar size from if parties enabled to having party members 2013-01-30 22:25:20 -05:00
Tyler Renelle
7a478ab6cd fix to username, apply to main user 2013-01-30 21:22:38 -05:00
Tyler Renelle
d2c5506234 show friend modal for non logged in user 2013-01-30 20:54:34 -05:00
Tyler Renelle
a6ac1b0ce8 view.fn on specific user paths, getting errors otherwise 2013-01-30 18:57:46 -05:00
Tyler Renelle
e8ac4dcf86 unlock the party system at level 3, view.fn 'userName' 2013-01-30 18:22:52 -05:00
Tyler Renelle
c4526b3a37 fixes to html to include friend stuff 2013-01-30 17:49:21 -05:00
Tyler Renelle
fcadcb000f convert armor model.fn to a view.fn, so we can use on party too 2013-01-30 17:41:06 -05:00
Tyler Renelle
519dcf256e reactive model fucntion seems to bust the app, may need to send to use 
model.subscribe on get '/' and redirect on friend-add
 2013-01-30 17:14:55 -05:00
Tyler Renelle
57ab186a62 begin party subscription & view 2013-01-30 16:52:31 -05:00
Tyler Renelle
b896865865 v1 api using api token 2013-01-30 16:01:16 -05:00
Tyler Renelle
52b2532b5a armorset (v1 or v2) settings for females 2013-01-30 13:29:59 -05:00
Tyler Renelle
0e01160ee4 add setting for male / female 2013-01-30 13:25:10 -05:00
Tyler Renelle
466256f793 lotsa changes! renaming male/female icons, fix tnl & current armor 
refresh bug, model function for current armor (female pending)
 2013-01-30 13:03:10 -05:00
Tyler Renelle
371b532e70 remove mailing list alert 2013-01-30 12:19:10 -05:00
Tyler Renelle
bb4fa87f4a use data-targets instead of hrefs for modal links. fixes mobile 2013-01-29 00:50:36 -05:00
Tyler Renelle
4fae8f05a4 move flash error down below header 2013-01-28 23:56:44 -05:00
Tyler Renelle
d7e28ea07f some tweaks to last merge 2013-01-28 20:09:57 -05:00
Tyler Renelle
c2cd3d8498 Merge pull request #227 from SlappyBag/master 
Static Header & Popups
 2013-01-28 17:06:50 -08:00
Stan Lindsey
da3c0f1a2d All popups on left 2013-01-26 13:15:57 +00:00
Tobias Leugger
b697e7bdf1 Getting rid of the completedList and completedIds, instead only 
using the 'completed' attribute of the todo task. This fixes some
issues were a task was at the same time in the todoIds and
completedIds.
 2013-01-26 11:33:51 +01:00
Tyler Renelle
d4c2d274ba list item typo 2013-01-23 19:49:40 -05:00
Tyler Renelle
9051f2e40c more links 2013-01-23 19:39:32 -05:00
Tyler Renelle
e0d3df831b new footer links 2013-01-23 15:09:30 -05:00
Michael Writhe
82ed0971fd reward:gold field is now a number instead of text. Validates the input from user before submitting form... we should check the input once received as well, but this is good enough for now 2013-01-22 16:56:16 -07:00
Tyler Renelle
eb6fcaed25 remove addthis for app page (they see it on about page) 2013-01-21 10:00:51 -05:00
Tyler Renelle
08fadd3974 typo 2013-01-20 12:11:23 -05:00
Tyler Renelle
bb51f677f7 but _ga back in 2013-01-19 08:38:06 -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
af58e1ce5f use updated bootstrap tabs 2013-01-18 12:10:52 -05:00
Tyler Renelle
79b784bdfb remove gittip, redirect about to splash 2013-01-18 12:10:49 -05:00
Daniel Saewitz
613e536fcb Turn off email form 2013-01-18 12:10:42 -05:00
Daniel Saewitz
3c1ef4a822 Collect emails 2013-01-18 12:10:38 -05:00
Daniel Saewitz
9d8569cfd9 Add email signup 2013-01-18 12:10:36 -05:00
Daniel Saewitz
57e46cdc89 Add parentheses 2013-01-18 12:10:34 -05:00
Tyler Renelle
4b48336098 aws notification 2013-01-18 12:10:15 -05:00
Tyler Renelle
30fe5cd744 Revert "Revert "add splash page to try to reduce server load"" 
This reverts commit 517ed68598.
 2013-01-16 13:07:01 -05:00
Tyler Renelle
517ed68598 Revert "add splash page to try to reduce server load" 
This reverts commit ecbe791e45.
 2013-01-16 13:05:49 -05:00
Tyler Renelle
ecbe791e45 add splash page to try to reduce server load 2013-01-16 12:59:53 -05:00
Tyler Renelle
e6f0476c09 "dismiss" link 2013-01-15 21:02:14 -05:00
Tyler Renelle
8ee3c5e2e3 have about be a modal, inserted for SEO. will consolidate content later 2013-01-15 20:16:24 -05:00
Tyler Renelle
129be203e1 seo fix 2013-01-15 19:31:06 -05:00
Tyler Renelle
7e02fc8214 try dismiss modal before showing stripe (performance) 2013-01-15 14:55:50 -05:00
Tyler Renelle
f5a07f0a1c use stripe v2 for easier checkout form 2013-01-15 14:35:25 -05:00
Tyler Renelle
5ea51acbd3 "why ads" verbage cleanup 2013-01-14 13:40:18 -05:00
Tyler Renelle
feba0878de move all the modals to one spot in the html. add footers to them, much cleaner 2013-01-14 13:32:48 -05:00
Tyler Renelle
7a74575094 why ads modal 2013-01-14 12:40:30 -05:00
Tyler Renelle
5e0ffce9bb add adsense in for now (monitization test) 2013-01-14 12:24:18 -05:00
Tyler Renelle
63c69bbb6b Hide Safari User Interface Components 2013-01-14 10:56:52 -05:00
Tyler Renelle
0b0d400fe7 update kickstarter wording 2013-01-12 18:13:41 -05:00
Tyler Renelle
effd635d7a update kickstarter message 2013-01-12 15:47:51 -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
c23496a069 add reset button to death & reroll modals 2013-01-09 17:06:06 -05:00
Tyler Renelle
a1e2dbf5f6 update html to the new component syntax 2012-12-27 13:19:05 -05:00
Tyler Renelle
4483d004d4 had to put analytics back into .html, wasn't working in loadScripts file 2012-12-11 22:30:36 -07:00
Tyler Renelle
02df571c31 .html: use h2s, and float properly using bootstrap 2012-12-08 10:00:42 -08: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
2a8bc2abe2 upgrade bootstrap, and manually specifcy hover-triggers for popovers (bootstrap now 
defaults to click)
 2012-12-05 07:17:45 -08:00
Tyler Renelle
8933c6ef43 show flash messages (for login primarily) 2012-12-04 16:10:30 -08:00
Tyler Renelle
07a614259f username/password registration now available 2012-12-04 15:18:59 -08:00
Tyler Renelle
2bece89b37 fix legacy facebook name bug 2012-11-15 13:10:59 -05:00
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