760 commits

Author	SHA1	Message	Date
Tyler Renelle	5501d57e10	fix(toolbar): tweaks	2014-02-12 21:51:35 -07:00
Tyler Renelle	c95c6a4c3b	chore(modals): remove mathUpdates modal (no longer in use). reference ... this commit for any future emergency updates	2014-02-12 21:24:50 -07:00
Tyler Renelle	f72cb21300	feat(toolbar): add toolbar featuring navigation, gems / subs, bailey, & ... chat / invite notifications	2014-02-12 21:21:36 -07:00
Tyler Renelle	ce82be637d	feat(groups): add group chat notifications	2014-02-12 21:21:30 -07:00
Matteo Pagliazzi	99474729aa	fix(typo)	2014-02-12 19:10:45 +01:00
Matteo Pagliazzi	8fdc5327e9	refactor(grunt and caching): cache icon fonts, spritesmith and use icons from spritesmith for coins notification	2014-02-12 15:10:22 +01:00
Tyler Renelle	ff9d4b886e	fix(event-tracking): typo	2014-02-11 19:02:20 -07:00
Tyler Renelle	b093717b8d	feat(event-tracking): better page-view tracking via ui-router	2014-02-11 18:30:43 -07:00
Matteo Pagliazzi	c4244bc3b6	fix(misc)	2014-02-11 21:43:17 +01:00
Matteo Pagliazzi	fa2c64d2d8	chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings	2014-02-11 19:30:55 +01:00
Matteo Pagliazzi	975b516573	fix(css): menu and gems wallet margin	2014-02-11 18:37:20 +01:00
Matteo Pagliazzi	e75a9423d4	Merge pull request #2813 from benmanley/develop ... Fix alignment of task meta icons (glyphicons)	2014-02-11 18:10:07 +01:00
Tyler Renelle	cbb448478e	feat(marketing): more copy for mobile	2014-02-11 01:34:42 -07:00
Tyler Renelle	cb079977e6	feat(marketing): start fleshing out the about page with images, content, ... etc. Create separate videos page	2014-02-11 00:51:29 -07:00
benmanley	39ec102326	Fix alignment of task meta icons (glyphicons)	2014-02-10 22:22:54 +00:00
Tyler Renelle	ebd1df932e	fix(bs3): fix to MemberModalCtrl parameter	2014-02-10 13:48:34 -07:00
Tyler Renelle	2480591444	refactor(bs3): put paypal button back in, use javascript API to ... construct button on `ng-init` (since you can't nest script tags)	2014-02-10 13:28:16 -07:00
Tyler Renelle	2b9089a204	Merge branch 'event-tracking' into develop	2014-02-10 13:26:55 -07:00
Tyler Renelle	f7b4a04a59	feat(event-tracking): add server-side GA tracking for ecommerce events	2014-02-10 11:35:33 -07:00
Tyler Renelle	ffb42906e1	feat(event-tracking): start adding some client-side GA event-tracking	2014-02-10 11:33:40 -07:00
Matteo Pagliazzi	a22e28143f	fix(css): lighter columns title	2014-02-10 19:04:57 +01:00
Matteo Pagliazzi	1c41c4ddb9	fix(css): better food tray	2014-02-10 18:38:58 +01:00
benmanley	18f922c756	Fix food tray z-index	2014-02-10 13:30:54 +00:00
Matteo Pagliazzi	3f28d16478	refactor(bs3): add fixed height modals & panels	2014-02-09 16:25:10 +01:00
Matteo Pagliazzi	1a44c3cf0c	refactor(bs3): css	2014-02-09 16:16:43 +01:00
Matteo Pagliazzi	5874941b94	refactor(bs3): inventory & misc	2014-02-09 12:32:12 +01:00
Lorian	322b257b72	Separated stable into dropped pets, quest pets, and rare pets, and made countPets only count the former. Made countMounts only count dropped and quest-hatched mounts, not rare mounts.	2014-02-08 16:57:28 -08:00
Matteo Pagliazzi	3447524d41	refactor(bs3): chat suggestions, revert	2014-02-09 00:44:39 +01:00
Matteo Pagliazzi	1e3042a4b6	refactor(bs3): maybe fix for chat suggestions	2014-02-08 20:23:50 +01:00
Matteo Pagliazzi	b4be88f4e0	refactor(bs3): misc	2014-02-08 19:49:47 +01:00
Matteo Pagliazzi	9ea9ed841d	refactor(bs3): buyQuest fix, add back badges colors, minor fixes	2014-02-08 19:20:10 +01:00
Matteo Pagliazzi	ee871ccb01	refactor(bs3): fixes	2014-02-08 16:58:41 +01:00
Matteo Pagliazzi	0fe0cb4f2d	refactor(bs3): labels style and text, buttons classes	2014-02-08 16:27:34 +01:00
Tyler Renelle	37340d2318	fix(mounts): fix pets & mounts css to position the user based on ... pet/mount equip	2014-02-07 21:48:11 -07:00
Tyler Renelle	ce8351d622	chore(Merge): branch 'develop' into origin-paglias-bs3 ... Conflicts: views/options/social/tavern.jade	2014-02-07 00:03:33 -07:00
Tyler Renelle	106a7fa475	refactor(errors): refactor the way errors, offline, & queued ops are handled	2014-02-06 21:10:13 -07:00
Matteo Pagliazzi	d313a46299	refactor(bs3): push footer down	2014-02-06 18:46:43 +01:00
Matteo Pagliazzi	d6b3279e5c	refactor(bs3): misc fixes	2014-02-06 18:35:12 +01:00
Matteo Pagliazzi	e4bd817443	refactor(bs3): sync with develop	2014-02-06 17:36:33 +01:00
Matteo Pagliazzi	90e9a1aeaa	i18n(refactor): load all files in a locale, not the ones defined in app.json, move env.t client code to own file, add env.isStaticPage (from isFrontPage)	2014-02-06 17:17:21 +01:00
Marcelo Sizer	386d108c3c	Replace hard-coded strings for window.env.t on js files	2014-02-05 20:43:49 -02:00
Matteo Pagliazzi	4ce2dfd60d	refactor(bs3): remove unused bootstrap-datepicker from bower	2014-02-05 20:23:10 +01:00
Matteo Pagliazzi	0cc31465ed	refactor(bs3): challenges	2014-02-05 19:39:26 +01:00
Matteo Pagliazzi	5d4d82ad51	refactor(bs3): port options (profile, inventory, social (groups and hall)) and misc	2014-02-05 19:05:42 +01:00
Matteo Pagliazzi	ce5edbee58	refactor(bs3): consistent style for modals	2014-02-05 16:51:35 +01:00
Matteo Pagliazzi	ccc1230828	refactor(bs3): misc	2014-02-04 22:21:12 +01:00
Matteo Pagliazzi	d711d61a1f	refactor(bs3): re-enable two columns views for tablets	2014-02-04 21:54:19 +01:00
Matteo Pagliazzi	c663221229	refactor(bs3): misc fixes, use bootstrap own grid for tasks lists	2014-02-04 21:27:05 +01:00
Matteo Pagliazzi	379da41982	refactor(bs3): port notifications	2014-02-04 20:53:09 +01:00
Matteo Pagliazzi	685b7a3cd2	Merge branch 'develop' into paglias/bs3	2014-02-04 20:16:00 +01:00