Commit graph

64 commits

Author SHA1 Message Date
Tyler Renelle
979d7d85a4 refactor(avatar): avatar separated into two mixins: +heroBox() and
+avatar(). Mobile will be sharing jade files with web, we'll need more
modular markup
2014-04-26 15:12:03 -06:00
Tyler Renelle
f72cb21300 feat(toolbar): add toolbar featuring navigation, gems / subs, bailey, &
chat / invite notifications
2014-02-12 21:21:36 -07:00
Matteo Pagliazzi
5874941b94 refactor(bs3): inventory & misc 2014-02-09 12:32:12 +01:00
Matteo Pagliazzi
d313a46299 refactor(bs3): push footer down 2014-02-06 18:46:43 +01:00
Matteo Pagliazzi
f4c30390f5 refactor(bs3): start porting app, general layout and filters 2014-01-31 21:18:44 +01:00
Tyler Renelle
a1df41ad81 fix(spells): <ESC> to cancel spell-casting 2014-01-18 14:15:45 -07:00
Marcelo Sizer
57ac0239c5 Replaced hard-coded strings with env.t on views/static folder and en/app.json contains it all. 2013-12-30 00:14:55 -02:00
Tyler Renelle
d03a996946 classes: very simple "buffs applied" icon next to level, add chat message
for party / member casts (@wc8 @sabrecat)
2013-12-17 19:16:31 -07:00
Tyler Renelle
19b6eb73e0 Merge branch 'develop' into classes
Conflicts:
	public/css/index.styl
	src/models/user.js
	views/options/profile.jade
	views/shared/header/avatar.jade
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
2013-12-02 18:24:33 -07:00
Tyler Renelle
83e3a6aff2 classes WIP 2013-11-23 16:59:41 -07:00
Matteo Pagliazzi
d0c29eba78 move js & css files to public/manifest.json, allow for stylus files editing without restarting server on development, removed hashres from dev build 2013-11-04 22:13:03 +01:00
Tyler Renelle
62b2d5780b [#1710] some simplification on Groups memoization. No need for all that
special handling of Header Party, just have it's own controller and do
specific-handling. Also, removing MenuCtrl & StatsCtrl - they weren't
used TMK, I think twas a vestige of mobile. @paglias give that a gander
2013-11-01 20:15:04 -07:00
Matteo Pagliazzi
da7ab9f1c3 remove loading indicator 2013-10-30 19:35:30 +01:00
Matteo Pagliazzi
e2331e5194 added growl style notification for errors 2013-10-30 19:29:46 +01:00
Matteo Pagliazzi
1490380e53 @lefnire since we are just testing and not deploying from this I liked to try the loading bar we talked about so that everyone can say what they do think 2013-10-30 19:13:21 +01:00
Tyler Renelle
ff3266bac8 get rid of ngRoute completely, depend on ui-router instead 2013-10-30 10:31:36 -07:00
Tyler Renelle
77fee06fdb gMerge branch 'challenges' into develop
Conflicts:
	migrations/20131028_cleanup_deleted_tags.js
	src/controllers/groups.js
	views/options/groups/group.jade
	views/options/profile.jade
2013-10-29 15:38:47 -07:00
Matteo Pagliazzi
6ee1b14e97 dismissable errors and warnings, fix #1580 2013-10-28 20:16:40 +01:00
Tyler Renelle
35c4a62de0 challenges: switch from ngRoute to ui-router 2013-10-28 11:34:08 -07:00
Tyler Renelle
fa25f3d300 challenges: WIP beginning challenges feature. some basic CRUD & some
basic subscribe / unsubscribe functional (but buggy)
2013-10-28 11:34:07 -07:00
Tyler Renelle
e45d8307e7 Subdocs & script templates. Migrate the API from User.tasks =>
User.habits/dailys/todos/rewards. Move /#/tasks & /#/options page
loading from server-sent html to everything loaded in the page as script
templates (including necessary fixes for adsense). NOTE: this commit
won't work, it depends a bit on the *next* commit with Challenges
functionality, but I wanted to separate it out a bit for clarity
2013-10-28 11:34:07 -07:00
Tyler Renelle
cef8431af0 charts: port toggleChart back in (functional, but it's not getting the
right width)
2013-10-19 16:15:48 -07:00
Tyler Renelle
e62007e74e add jquery.cookie for tour (suddenly required?) 2013-09-17 15:20:09 -04:00
Tyler Renelle
598c4445ff [#1396] setup tour, using user.flags.showTour now instead of
localStorage. double check with #1507
2013-09-10 18:06:16 -04:00
Matteo Pagliazzi
21823564c2 add caching 2013-09-10 14:40:00 +02:00
Matteo Pagliazzi
9cc92ccb25 serve all css minimized & static files from /build 2013-09-10 12:29:43 +02:00
Tyler Renelle
774fa4f645 use marked instead of showdown, it's more performant and allows us to
sanitize the content
2013-09-09 14:06:36 -04:00
Tyler Renelle
6e800ea2d9 use markdown for profile-editing. Add save button. will remove linky
once everything's in markdown
2013-09-09 13:27:25 -04:00
Tyler Renelle
aad034564e [#1459] add profile-editing (note, it requires bluring the input fields for
changes to go through - this is a pretty assuming solution, but I doubt it
will cause problems)
2013-09-08 12:28:06 -04:00
Tyler Renelle
91d1cdf361 [#1465] add member modals back in. Not all info is present, just a bit more
work. Can now click guild & tavern members! does lazy-loading of members
so we don't have to load all their information at once
2013-09-07 12:45:39 -04:00
Matteo Pagliazzi
4f9cf94574 fix #1438 2013-09-07 13:56:33 +02:00
Matteo Pagliazzi
9046bd5041 css 2013-09-06 21:39:18 +02:00
Matteo Pagliazzi
7cd075d787 initial grunt support, gzip enabled 2013-09-06 19:19:43 +02:00
Tyler Renelle
56d44887d4 [#1439] add highlight back in for chat. use ngSanitize linky to add links in chat 2013-09-06 00:36:05 -04:00
Matteo Pagliazzi
16bc90acb1 remove moment and lodash, using from habitrpg-shared 2013-09-04 13:15:13 +02:00
Matteo Pagliazzi
cb350338ed manage local js with connect-assets 2013-09-04 12:54:15 +02:00
Tyler Renelle
f69abe4ca0 Merge pull request #1409 from lefnire/paglias/pets
Stable
2013-09-03 21:49:26 -07:00
Matteo Pagliazzi
dc96a97fe2 new path for habitrpg-shared 2013-09-03 17:12:17 +02:00
Matteo Pagliazzi
3fd290a3e1 non working stable choosePet 2013-09-03 10:32:06 +02:00
Tyler Renelle
80fd023012 use cookieSession so we can launch in production mode 2013-09-02 21:38:05 -04:00
Tyler Renelle
d70c2c4040 coming soon notes 2013-09-02 20:16:08 -04:00
Tyler Renelle
62a10d4b28 cleanup 2013-09-02 19:03:45 -04:00
Tyler Renelle
b22ccc0a23 app.js: intercept errors, show them on page, show loading screen in interceptor 2013-09-01 11:34:00 -04:00
Tyler Renelle
bc4798b354 groups: big changes here i may decide to revert. GET /api/v1/groups
optionally takes ?type=guilds (guilds, party, tavern, public). this
allows us to incrementally load the app as they click through the tabs,
because guilds is really large (1.5mb!) - gotta cut this down
somehow. The big issue is requireing return values as an array, so
ngResource can work with the response (subsequent group.$postChat(),
group.$join(), etc.). The array format doesn't really work out that
well, so I may scrap
2013-08-31 22:59:35 -04:00
Tyler Renelle
524457b5d7 chat: keyup to trigger send message. ng-model on chat box is painfully
slow! using jquery as workaround for now
2013-08-31 20:52:41 -04:00
Tyler Renelle
10ff61be91 rewrite: use vanilla bootstrap tabs for now, keep an eye on https://github.com/angular-ui/bootstrap/issues/783 2013-08-31 14:52:13 -04:00
Tyler Renelle
2219068fad api & rewrite: add party members! need to optimize! 2013-08-28 22:08:59 -04:00
Tyler Renelle
de7b46b14d rewrite: fix show/hide header 2013-08-28 19:11:29 -04:00
Tyler Renelle
f956570593 rewrite: start adding filters / tags 2013-08-28 18:57:25 -04:00
Tyler Renelle
b77021e745 rewrite: prep for adding filters, restructured html to allow separate
options / tasks
2013-08-28 18:11:00 -04:00