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

707 commits

Author SHA1 Message Date
Tyler Renelle
7308b8ffbc cleaner profiles modal, also fix bug where user.profile not being 
sent (hence not seeing eachother's info)
 2013-05-03 12:04:17 +01:00
Tyler Renelle
b3620f1db0 don't show stats popover for main user 2013-05-03 10:56:51 +01:00
Tyler Renelle
71b30e8289 add bailey notification 2013-05-02 21:31:07 +01:00
Tyler Renelle
079d91956a prettier rest-in-tavern 2013-05-02 21:21:51 +01:00
Tyler Renelle
c48d6bde13 add tavern chat 2013-05-02 21:09:50 +01:00
Tyler Renelle
c3eadab4dc notify of new chat messages 2013-05-02 20:23:50 +01:00
Tyler Renelle
f8e592d68f begin implementing party chat. still need notifications 2013-05-02 19:26:25 +01:00
Tyler Renelle
470cad9df3 add the latest NPCs to new stuff 2013-05-02 17:57:51 +01:00
Tyler Renelle
937aea6f23 adjust some popover / login requirement stuff 2013-05-02 17:42:35 +01:00
Tyler Renelle
bdb4a08f9e add 'options' menu item back, more obvious toggling between panes 2013-05-02 17:26:20 +01:00
Tyler Renelle
77bd61c244 Add bailey the crier for alerts. move CHANGELOG.md into the modal 2013-05-02 16:56:43 +01:00
Tyler Renelle
a40a41fa9c add in alexander the merchant 2013-05-02 15:12:00 +01:00
Tyler Renelle
e22634658a add in daniel / tavern tab content 2013-05-02 15:01:11 +01:00
Tyler Renelle
60b5783689 add separate game-pane from tasks-pane, make layout smoother #828 2013-05-02 14:16:57 +01:00
Tyler Renelle
584eb3e936 let's try moving external script loading back to app.on('render') so 
ew don't cause blocking on failed amazon affiliate load
 2013-05-01 13:07:42 +01:00
Matteo Pagliazzi
dcf61fe355 show gold amount rounded up in rewards column, fix #758 2013-04-23 10:37:33 +02:00
Tyler Renelle
089a2e0cf1 hide user from partyMembers (see previous commit) 2013-04-21 18:48:28 -04:00
Tyler Renelle
830089a74e some fixes to make sure {#each} contains one-and-only-one element 2013-04-21 17:46:58 -04:00
Tyler Renelle
6aaca11227 add rare pets back in (veteran wolf only for now) 2013-04-16 21:30:44 -04:00
Tyler Renelle
77e7b3e36d take custom overridden profile name into account 2013-04-15 09:56:32 -04:00
Tyler Renelle
3a64c1104a add pets count on character popover. also, static bindings wherever 
possible - saves CPU
 2013-04-15 02:27:38 -04:00
Tyler Renelle
9e86248120 "unlock all the pets" style stable layout 2013-04-15 02:03:32 -04:00
Tyler Renelle
0342e9a4e7 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-04-14 14:34:21 -04:00
Tyler Renelle
6e0b82e081 move Rest checkbox out of avatar into settings for now, we'll put back 
once we've added the tavern art
 2013-04-14 14:33:50 -04:00
Kevin Kaland
f6f397dcb0 Use user's current day for completed/uncompleted. 
References #587.
 2013-04-12 23:20:30 +02:00
Daniel Saewitz
9917173429 Rest 2013-04-11 18:22:06 -04:00
Tyler Renelle
72ee444608 back to our roots: store vendor files in public/vendor instead of 
using CDN, hoping to fix #773 (hoping! will follow up). We can close #755 as a result. We use
require() to min/concat for performance. Note, previously we had "too
many files open" error because we had /vendor tracking git submodules,
which includes all files for those projects - now we're downloading
manually, which gives us minimum required files from each project's
build steps
 2013-04-09 13:21:20 -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
Shane Lister
4742e4236e Update pets.html 
Changing the sprinkle button to say pour.
 2013-04-05 22:55:34 -07:00
Tyler Renelle
dd736923ca Merge pull request #757 from ThibG/master 
Fix rewards moving / item unlocking
 2013-04-04 14:43:34 -07:00
Tyler Renelle
367ca4a76b redirect about, team, extensions to the community site. remove header 2013-04-03 17:15:28 -04:00
Thibaut Girka
96d1dbd430 Fix rewards being movable only once and item tooltips not showing up after that 2013-03-31 23:34:20 +02:00
Tyler Renelle
41449d349a protocol-agnostic amazon images & hover-script at the end 2013-03-31 00:27:47 -07:00
Tyler Renelle
ce43a7503b no more adsense, switching to amazon affiliates because of https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/x8FwdTLEuXo 2013-03-31 00:06:29 -07:00
Tyler Renelle
c9907f9558 move some external script loading into app.on('render') to see if that 
solves https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/x8FwdTLEuXo
 2013-03-30 18:45:57 -07:00
Tyler Renelle
be83a2c46e Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-29 22:28:27 -07:00
Tyler Renelle
9b42eb825b small ads & static-bindings cleanup (doesn't fix the ads issue) 2013-03-29 21:48:08 -07:00
Daniel Saewitz
2b59c205a2 Remove translations for now 2013-03-29 14:15:17 -04:00
Tyler Renelle
f87ab6866f Merge branch 'master' of github.com:lefnire/habitrpg 2013-03-28 08:46:50 -07:00
Tyler Renelle
51f054e51c show tokens in character modal at all times 2013-03-28 08:43:13 -07:00
Stan Lindsey
6ba25e40b0 Added Community Link 2013-03-28 11:29:02 +00:00
Stan Lindsey
e0a28514c7 Added Community Link 2013-03-28 11:27:52 +00:00
Tyler Renelle
3d36a3f531 "new stuff" update 2013-03-28 01:36:18 -07:00
Tyler Renelle
d2b4072ad6 better wording on buying tokens 2013-03-28 00:49:57 -07:00
Tyler Renelle
88badc4929 pets: list cost of items in market 2013-03-28 00:36:57 -07:00
Tyler Renelle
6d6085e29b Merge branch 'ads' into pets 2013-03-28 00:28:59 -07:00
Tyler Renelle
562634478f pets: easier click on market items 2013-03-27 11:59:56 -07:00
Tyler Renelle
3a62482a4d pets: bug fixes & rewording 2013-03-27 11:57:40 -07:00
Tyler Renelle
4edbb8bf3d pets: rename everything "food" to "hatcing potions" (since we may be adding food in the near future) 2013-03-27 11:34:41 -07:00
Tyler Renelle
6520bfb789 pets: rename shaners Item_HatchingPotion to Pet_HatchingPotion to fit 
previous architecture, add some placeholders for the un-finished
potions. got them working
 2013-03-27 00:20:33 -07:00
Shane Lister
ea1be5f346 Merge branch 'pets' into patch-3 2013-03-26 23:20:13 -07:00
Tyler Renelle
0253815625 pets: rename food to hatching powder 2013-03-26 22:21:46 -07:00
Tyler Renelle
903f2b17c6 pets: bug where everyone shows main user's pet 2013-03-26 22:15:52 -07:00
Tyler Renelle
77f697446c pets: revert back to market as top-level tab 2013-03-26 18:57:58 -07:00
Tyler Renelle
42292be251 pets: show which egg was dropped on unlocking drops 2013-03-26 17:58:44 -07:00
Tyler Renelle
f6b2c08a60 Merge branch 'develop' into pets 
Conflicts:
	views/app/rewards.html
 2013-03-26 17:54:31 -07:00
Tyler Renelle
76512eef46 parties: bunch of bug fixes. enable parties by default, just notify 
them at lvl 3 if they haven't started using it. Show a bell-icon
notification in user, reset dom properly after invitation
 2013-03-26 14:54:14 -07:00
Tyler Renelle
80fd4f192c code cleanup: some indentation & {{}} where live-binds aren't required 2013-03-26 12:55:47 -07:00
Shane Lister
6b0aad01f7 Merge pull request #7 from lefnire/pets 
Update my pets branch
 2013-03-26 08:04:07 -07:00
Tyler Renelle
124409bfc5 Merge pull request #715 from switz/translations 
@lefnire => i18n support... aka Translations!
 2013-03-25 18:42:53 -07:00
Tyler Renelle
58ba7cf4f3 Merge branch 'develop' 2013-03-25 17:43:48 -07:00
Tyler Renelle
f7937ffb1b add forum link to footer 2013-03-25 17:43:34 -07:00
Tyler Renelle
01f2bfeab7 remove FAQ page, redirect to http://community.habitrpg.com/faq-page 2013-03-25 17:41:25 -07:00
Tyler Renelle
b2f0ee58c8 pets: move market into inventory as sub-tab 2013-03-25 17:01:16 -07:00
Tyler Renelle
64e421d529 pets: add eggs to market, move from rewards tab to avatar modal 2013-03-25 15:44:41 -07:00
Tyler Renelle
307bcb8a38 Merge branch 'develop' 2013-03-25 14:20:01 -07:00
Zachary Kain
0f49ec3ebc fix 697 remove level from top of herobox 2013-03-25 16:03:13 -04:00
Tyler Renelle
4af56b998f pets: some better default inventory/stable layout 2013-03-25 11:50:32 -06:00
Tyler Renelle
ae53675014 pets: move inventory into <menus> 2013-03-25 10:18:28 -06:00
Tyler Renelle
102c693d7c pets: show specific egg in inventory 2013-03-25 09:51:41 -06:00
Tyler Renelle
5102b7fc51 Merge branch 'develop' into pets 2013-03-25 08:58:15 -06:00
Zachary Kain
b038b74534 checkbox shenanigans fix. 2013-03-25 10:05:44 -04:00
Daniel Saewitz
8107200105 i18n implemented 2013-03-23 16:03:12 -04:00
Tyler Renelle
b013460809 Merge branch 'develop' 2013-03-23 08:44:09 -06:00
Tyler Renelle
43d89599ca add habitrpg-github to extensions (thanks @ruddfawcett!) 2013-03-23 08:15:39 -06:00
Tyler Renelle
3c75caffd8 Merge branch 'develop' into pets 2013-03-22 23:50:41 -06:00
Tyler Renelle
e3df4cd9f3 choosePet inside <a/> with tooltip 2013-03-22 23:04:38 -06:00
Tyler Renelle
acdb9eb5e5 add better temporary pet positioning 2013-03-22 22:40:12 -06:00
Tyler Renelle
a6f4e01de7 move random-drop inside batch operations 2013-03-22 22:35:51 -06:00
Tyler Renelle
6fd9bfbab4 pets: use pet.name for unique identifier, not pet.text. general cleanup 2013-03-22 22:17:25 -06:00
Tyler Renelle
c170cd269f move some more pet html into pets.html 2013-03-22 19:37:48 -06:00
Tyler Renelle
5043c46b5a move some pet html around 2013-03-22 19:21:35 -06:00
Tyler Renelle
a4d50125d9 Merge branch 'develop' 2013-03-22 19:11:42 -06:00
Tyler Renelle
ccb6f9bd32 fix bootstrap-tour element bind with new herobox system 2013-03-22 19:11:29 -06:00
Tyler Renelle
a862e21e8e Merge branch 'develop' into pets 2013-03-22 19:06:48 -06:00
Daniel Saewitz
ee2f8c0b6c Merge pull request #701 from pjf/webservice_habitrpg 
pfenwick went and changed his github username to pjf
 2013-03-22 10:44:36 -07:00
Paul Fenwick
d6553c763d pfenwick went and changed his github username to pjf 2013-03-23 00:56:56 +11:00
Tyler Renelle
3d679ba94e fix to "anonymous" username 2013-03-21 16:50:27 -06:00
Tyler Renelle
199006d692 move todos-charts up top 2013-03-21 16:36:24 -06:00
Tyler Renelle
b286b95153 add charts back in, temporary style 2013-03-21 16:31:23 -06:00
Tyler Renelle
a1a85241d5 add "hatching powder" (as temporary pet food), clean up some dialogs, 
fix eggs using their actual animal sprites
 2013-03-21 14:56:25 -06: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
Zachary Kain
dd0b041565 remove duplicate user name from party popover 2013-03-21 14:55:35 -04:00
Tyler Renelle
fa89b20dd5 Merge branch 'develop' into zakkain-ui-tweaks 
Conflicts:
	styles/app/index.styl
	styles/app/tasks.styl
	views/app/alerts.html
	views/app/avatar.html
	views/app/header.html
	views/app/index.html
Merge branch 'develop' into zakkain-ui-tweaks

Conflicts:
	styles/app/index.styl
	styles/app/tasks.styl
	views/app/alerts.html
	views/app/avatar.html
	views/app/header.html
	views/app/index.html
by popular demand, we're dropping the crosshatched square and going blank

Conflicts:
	styles/app/tasks.styl
 2013-03-21 12:36:05 -06:00
Tyler Renelle
7c77126129 try some protocol-agnostics to fix homepage css 2013-03-21 11:23:46 -06:00
Tyler Renelle
d737bd0714 remove a ton of public/vendor git submodules, using CDN instead. The 
reason we're removing the submodules (intead of keeping them around
for offline development) is that derby does some watchfile magic on the
public directory, and it causes a "max file limit" operating system
error (mitigated by `ulimit -u 2048`). For offline developers, you may
want to have some symlinks and a git stash handy
 2013-03-21 11:11:15 -06:00
Zachary Kain
fa94bef0f6 new input class names on restore function 2013-03-21 13:03:03 -04:00
Tyler Renelle
7529601dcc add general "new stuff" notification, linking to changelog 2013-03-21 10:31:23 -06:00
Paul Fenwick
9280e9d851 Add WebService::HabitRPG to list of extensions. 2013-03-21 08:08:59 -06:00
Paul Fenwick
25c6748f98 Add WebService::HabitRPG to list of extensions. 2013-03-22 00:31:19 +11:00
Tyler Renelle
272eda64c6 copyright 2013 2013-03-20 09:36:50 -06:00
Tyler Renelle
8f012e8e78 copyright 2013 2013-03-20 09:36:29 -06:00
Zachary Kain
1d93793616 fix customization modal cutting off herobox 2013-03-19 01:02:59 -04:00
Zachary Kain
30b3b527a5 fix no name showing up if not logged in 2013-03-19 00:09:06 -04:00
Zachary Kain
915c86d8ba implement avatar variable system with data attributes and css. LIKE A BOSS 2013-03-19 00:04:24 -04:00
Tyler Renelle
9255644108 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-18 21:51:54 -06:00
Zachary Kain
507a0fc3c9 MASSIVE HEADER CHANGES OH SHIT 2013-03-18 23:42:03 -04:00
Tyler Renelle
b287d854f1 add tag-editing context (add new, delete). still have to refresh after everything, do to the live-bound each bug 2013-03-18 20:25:01 -04:00
Tyler Renelle
f6c5495495 add new tag 2013-03-18 19:51:02 -04:00
Tyler Renelle
494d5cecf9 for now don't live-bind to {#each _user.tags}. There's a derby bug 
here, so we'll have to refresh when users add new tags until we get
that fixed
 2013-03-18 19:47:15 -04:00
Zachary Kain
411c614408 fix the 1px gap 2013-03-18 19:33:30 -04:00
Zachary Kain
f453eb9833 cut old menu. Next up, avatars then MODALS 2013-03-18 18:31:26 -04:00
Zachary Kain
8284693d0f rebuilt header boiiii. Tested FF, Safari, Chrome 2013-03-18 18:29:53 -04:00
Tyler Renelle
d6652bcf12 rename user._tagFilters to user.filters 2013-03-18 18:13:05 -04: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
Zachary Kain
e18c53f97f middle of wrasslin the new header 2013-03-18 16:48:47 -04:00
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
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
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
932783484a fix price input bug 2013-03-18 14:02:30 -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
903745f7c9 pass in whole task object to taskClasses 2013-03-17 21:50:02 -04:00
Tyler Renelle
2f3d0fa86a start adding undo functionality 2013-03-17 21:30:24 -04: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
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
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
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
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