sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-31 15:09:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
25741 commits 3 branches 0 tags 1.6 GiB
Commit graph

25741 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
70dcd0b886 move rewards column into rewards rewards.html 2013-03-18 16:47:03 -04:00
Zachary Kain
13673c3ec7 flattenize header, change to <header>, even margins 2013-03-18 16:46:58 -04:00
Tyler Renelle
a4cfd9d19c wrap avatars with <span>. #each requires an element, so #if / #unless 
blocks nested immediately inside cause issues if they return false,
see https://github.com/codeparty/derby/issues/215
 2013-03-18 15:46:35 -04:00
Tyler Renelle
49db610602 fix to "editing profile" bug. move {#with _user.preferences as :p} 
into minimum allowable depth in HTML hierachy at which it's required.
Still trying to put my finger on it, but I'm getting close
 2013-03-18 15:43:02 -04:00
Zachary Kain
3d581358ec fix text showing behind button b/c of opacity bug 2013-03-18 14:37:24 -04:00
Zachary Kain
97294b793f robustify input stuff. Still NEED to rip out existing bootstrap classes so mine take hold 2013-03-18 14:37:14 -04:00
Zachary Kain
6d2df1ccc9 fix price input bug 2013-03-18 14:37:03 -04:00
Zachary Kain
e67295651f didn't need that reset, probably will remove the whole thing once tested for shenanigans 2013-03-18 14:33:05 -04:00
Zachary Kain
ba16338bf9 fix text showing behind button b/c of opacity bug 2013-03-18 14:32:44 -04:00
Zachary Kain
eceae48b2b robustify input stuff. Still NEED to rip out existing bootstrap classes so mine take hold 2013-03-18 14:28:00 -04:00
Zachary Kain
68ca52f125 wah my beautiful designery fonts don't work in modals 2013-03-18 14:15:22 -04:00
Zachary Kain
932783484a fix price input bug 2013-03-18 14:02:30 -04:00
Tyler Renelle
5799a155af set timeout interval on undo (disappear after 10s) 2013-03-17 23:16:05 -04:00
Tyler Renelle
16bb4879e3 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-17 22:10:04 -04:00
Tyler Renelle
de1eca084e bugfix to "can't delete task" 2013-03-17 22:09:33 -04:00
Tyler Renelle
07a3a3c3b6 fix to reward issue in undo 2013-03-17 22:02:06 -04:00
Tyler Renelle
903745f7c9 pass in whole task object to taskClasses 2013-03-17 21:50:02 -04:00
Tyler Renelle
10e9d3eb40 fixed undo on checkboxed items 2013-03-17 21:43:03 -04:00
Tyler Renelle
2f3d0fa86a start adding undo functionality 2013-03-17 21:30:24 -04:00
Tyler Renelle
b576290ee6 Merge pull request #671 from ruddfawcett/develop 
Added "btn" class to "Show Header"
 2013-03-17 13:33:52 -07:00
Rudd Fawcett
f8be873241 Added "btn" class to "Show Header" 2013-03-17 15:25:23 -03:00
Tyler Renelle
3df22d72d9 privacy & terms page titles 2013-03-17 09:47:02 -04:00
Tyler Renelle
2276867f6c use cloudflare cdn for bootstrap too 2013-03-17 09:45:57 -04:00
Tyler Renelle
2be827f484 Merge branch 'cdn-scripts' into develop 2013-03-17 09:33:19 -04:00
Tyler Renelle
6182a474c7 remoe bootstrap import from .styl, start pulling in from 
CDN (500.html, static, & dynamic pages)
 2013-03-17 09:33:14 -04:00
Tyler Renelle
8e845d6586 add bootstrap-responsive into master. remove when develop is merged in 2013-03-17 09:19:55 -04:00
Tyler Renelle
dc3af9aa49 better "reroll" comment 2013-03-17 09:16:33 -04:00
Tyler Renelle
2ca7c65abc 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

Conflicts:
	src/app/index.coffee
 2013-03-17 09:16:31 -04:00
Tyler Renelle
83b29177bc add responsive to static pages 2013-03-17 09:15:56 -04:00
Tyler Renelle
76064be3d8 clegsome static-page cleanup 2013-03-17 09:15:50 -04:00
Tyler Renelle
b030fb60ec add a ton of static page, beef up the footer, make this website look 
official! @zakkain, I hope I didn't break anything!
 2013-03-17 09:15:44 -04:00
Tyler Renelle
4e9fc85193 start static-pages redesign 2013-03-17 09:15:34 -04:00
Tyler Renelle
0bcea534ae better "reroll" comment 2013-03-17 09:13:25 -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
Tyler Renelle
49dedf8f2f add responsive to static pages 2013-03-17 00:29:32 -04:00
Tyler Renelle
63cda4c5c7 clegsome static-page cleanup 2013-03-16 23:35:20 -04:00
Tyler Renelle
ee9e6064b2 add a ton of static page, beef up the footer, make this website look 
official! @zakkain, I hope I didn't break anything!
 2013-03-16 23:03:59 -04:00
Tyler Renelle
b1fe9b64a9 Merge branch 'develop' into static-pages 2013-03-16 20:29:22 -04:00
Tyler Renelle
dbc3906eb3 possible fix to dom losing functions after model.resetDom() 2013-03-16 20:02:01 -04:00
Tyler Renelle
00db85dff6 protocol agnostic ads 2013-03-16 19:48:15 -04:00
Daniel Saewitz
78bc27439a Remove trailing spaces 2013-03-16 19:36:07 -04:00
Tyler Renelle
9f7b653a25 Merge branch 'develop' into ads 
Conflicts:
	views/app/tasks.html
 2013-03-16 19:27:29 -04:00
Tyler Renelle
9501e67661 add missing namespaces for rewards & tasks for consistency & organization 2013-03-16 19:22:53 -04:00
Tyler Renelle
9c0a640f9f add ads back in 2013-03-16 19:18:17 -04:00
Tyler Renelle
903479af5a add view functions and(), or(), notEqual() 2013-03-16 19:10:40 -04:00
Daniel Saewitz
7083e7a103 yarr, fix all teh bugs 2013-03-16 16:30:45 -04:00
Tyler Renelle
53682205de another strange derby truthy issue 2013-03-16 16:03:07 -04:00
Tyler Renelle
081c5c656f another strange derby truthy issue 2013-03-16 16:02:15 -04:00
Daniel Saewitz
099008d557 whitespace 2013-03-16 15:36:56 -04:00