Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,076 Commits 64 Branches 1,256 Tags
68effee1e88ea2e9b641be62c3346c67006fe43e
Commit Graph

640 Commits

Author SHA1 Message Date
Tyler Renelle d975931500 tags: add tags legend to task meta 2013-05-06 17:05:34 +01:00
Tyler Renelle fa7232760c tags: use icon-pencil for editing 2013-05-06 16:43:01 +01:00
Tyler Renelle 82682e1af1 tags: cleanup, prevent bug for multiple tag-creation 2013-05-06 16:41:35 +01:00
Tyler Renelle ccd091b622 tags: some visual cleanup of the filter bar 2013-05-06 15:59:58 +01:00
Tyler Renelle bed0f64d47 tags: use select combobox instead of dropdown, easier code & mitigates 
some css issues
 2013-05-06 15:27:27 +01:00
Tyler Renelle 40dc8e422c new tag sets _newTag to '', reset dom, static-bound tag loop 2013-05-06 15:18:36 +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 9737e0e2a2 settings in two panes rather than sub-tabs 2013-05-06 09:55:44 +01:00
Tyler Renelle ed1f3acded full username test in chat (_user.profile.name only part of the 
equation), and min-height: 60px - was getting stacked longtext issue
 2013-05-05 23:29:10 +01:00
Daniel Saewitz 3526cd6f72 Keep relative times updated every 60 seconds 2013-05-05 13:44:24 -04:00
Daniel Saewitz c1c2f025ad Merge develop and add functionality to party chat 2013-05-05 13:07:36 -04:00
Tyler Renelle 9b1bcb8367 dynamic pets, fix #897 2013-05-05 13:54:32 +01:00
Daniel Saewitz 68a932d5ab Remove timestamp 2013-05-04 15:00:26 -04:00
Daniel Saewitz c8ddd39577 Add relative dates to chat 2013-05-04 14:56:21 -04:00
Daniel Saewitz 66dbc3f258 Highlight username in tavernchat 2013-05-04 13:15:47 -04:00
Tyler Renelle 7ebe611078 adjust achievement view logic for previous commit 2013-05-04 16:41:07 +01:00
Tyler Renelle 0f1ec096ef add backer.contributor & backer.npc for tavern & party chat 2013-05-04 16:03:03 +01:00
Tyler Renelle c8e4386b4b add backer, npc, and contributor achievements (still need to run 
database migrations for them)
 2013-05-04 14:24:37 +01:00
Tyler Renelle 54ef864458 wording update 2013-05-04 11:45:51 +01:00
Tyler Renelle 5232589678 bailey alert for streaks 2013-05-04 11:35:11 +01:00
Tyler Renelle 4584433506 Merge branch 'master' into develop 2013-05-04 08:56:59 +01:00
Tyler Renelle dd8935ec63 put popover back in for main herobox #890 2013-05-04 08:11:01 +01:00
Tyler Renelle 55957ca72d Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-03 23:38:28 +01:00
Daniel Saewitz 63495a647b Send chat message on enter and disallow empty messages 2013-05-03 14:59:37 -04:00
Tyler Renelle bcb2505a96 add streak GP bonus & drop bonus (separately handled) 2013-05-03 18:51:47 +01:00
Tyler Renelle c9aa04439d begin implementing streaks 2013-05-03 18:20:28 +01:00
Tyler Renelle df59817f64 add bailey notification for achievements 2013-05-03 16:39:11 +01:00
Tyler Renelle db5466f381 add <hr/> 2013-05-03 16:24:59 +01:00
Tyler Renelle 055848452b add "max-gear" achievement 2013-05-03 16:24:28 +01:00
Tyler Renelle 7c93d80ae5 add beast-master achievement 2013-05-03 16:08:22 +01:00
Tyler Renelle 2b9f4e336b add achievemnts in as spritesheet 2013-05-03 15:46:59 +01:00
Tyler Renelle 2e3a4853f8 make "original user" achievement real. unfortunately would be a dick 
move to take away from any current users, even though they may have
only recently signed up - so just setting cut-off point to now
 2013-05-03 15:27:35 +01:00
Tyler Renelle ae1a4230ca add pets count to stable page 2013-05-03 12:27:14 +01:00
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