Sacha Greif
1cd36e0bea
Merge branch 'devel' into AdmitHub-telescope-master-seo2
...
Conflicts:
.meteor/versions
2015-03-26 11:12:17 +09:00
Sacha Greif
56caa499b7
make views nav use dropdown component, and hide it when there's only a single view
2015-03-25 18:19:22 +09:00
Sacha Greif
2c9aac2580
add category titles; do not show posts views nav on category pages
2015-03-25 12:30:55 +09:00
Sacha Greif
f43d0dd569
small tweaks
2015-03-25 12:02:29 +09:00
Sacha Greif
273fa4089a
changing color names
2015-03-25 11:44:57 +09:00
Sacha Greif
827a15dc74
do not publish password bcrypt token
2015-03-25 10:12:03 +09:00
Sacha Greif
ed0e7ef270
fix user dashboard css
2015-03-25 10:11:44 +09:00
Charlie DeTar
083dd1d850
Remove local migration change
2015-03-24 10:17:21 -06:00
Charlie DeTar
ba0e7cec52
Merge branch 'telescope-master-seo2' of github.com:AdmitHub/Telescope into telescope-master-seo2
...
Conflicts:
.meteor/packages
.meteor/versions
packages/telescope-seo/lib/routes.js
packages/telescope-seo/lib/seo.js
packages/telescope-seo/lib/server/sitemaps.js
packages/telescope-seo/package.js
2015-03-24 10:15:04 -06:00
Charlie DeTar
50c81aa169
Simplify and catch up to master
2015-03-24 10:11:11 -06:00
Charlie DeTar
b51fa95c91
Correct name of defaultView setting
2015-03-24 09:26:22 -06:00
Charlie DeTar
7521bb66b2
Refactor for getDescription and package style
...
Update package style to accord with the example of
``packages/telescope-blank``. Add i18n. Simplify description setting
into a single setting for both meta descriptions and og:description. Use
``getTitle`` and ``getDescription``.
2015-03-24 09:26:22 -06:00
Charlie DeTar
c3c8aab94a
Update SEO package for master, remove page titles
2015-03-24 09:25:40 -06:00
Sacha Greif
8fc95a316c
fix mobile nav
2015-03-24 17:03:37 +09:00
Sacha Greif
9e25f8bafc
fix comment upvote/downvote
2015-03-24 14:32:54 +09:00
Sacha Greif
3c8fc80841
refactoring color customization system
2015-03-24 14:30:04 +09:00
Sacha Greif
8a8cf53fee
using font awesome for icons
2015-03-24 13:13:04 +09:00
Sacha Greif
5e645e11d7
color css fix
2015-03-23 11:38:30 +09:00
Sacha Greif
f59ad553b6
close dropdown when clicking "mark all as read"
2015-03-23 11:35:49 +09:00
Sacha Greif
9c5d3534cb
refactoring dropdown CSS
2015-03-23 11:28:36 +09:00
Sacha Greif
8486e73283
history update
2015-03-23 10:49:21 +09:00
Sacha Greif
51b52da004
working on admin menu
2015-03-23 10:32:56 +09:00
Sacha Greif
2bcb078877
setting header colors based on settings
2015-03-23 08:57:29 +09:00
Sacha Greif
7de8974fc4
fixing top nav & notifications
2015-03-22 12:27:05 +09:00
Sacha Greif
44c1230a8a
fixing mobile version
2015-03-22 11:56:06 +09:00
Sacha Greif
e06e5289f8
adding new postListTop zone
2015-03-22 11:19:27 +09:00
Sacha Greif
0d0d1f8bf5
adding postsViews setting
2015-03-22 10:55:30 +09:00
Sacha Greif
c58d4f0a56
injecting svg for all templates
2015-03-22 10:55:19 +09:00
Sacha Greif
4de55e5120
working on posts list views navigation
2015-03-22 09:42:58 +09:00
Sacha Greif
978bf7cd6f
working on dropdown show more
2015-03-21 20:51:23 +09:00
Sacha Greif
631092d78f
working on dropdown open/close
2015-03-21 18:43:35 +09:00
Sacha Greif
70147b5bc3
simplify dropdown and add admin-only items
2015-03-21 17:52:15 +09:00
Sacha Greif
0eb3d5d641
Merge branch 'devel' into sidenav
2015-03-21 09:43:59 +09:00
Sacha Greif
24537d6e6f
simplifying dropdown component
2015-03-21 09:43:51 +09:00
Sacha Greif
a29987d7b2
refactoring dropdown menus into components
2015-03-20 18:31:49 +09:00
Sacha Greif
efcf801f22
make sure set object is not empty
2015-03-20 16:51:28 +09:00
Sacha Greif
262cf1eebb
header > nav
2015-03-20 16:46:33 +09:00
Sacha Greif
b1cc62105e
Merge branch 'ywang28-issue825' into devel
2015-03-20 12:00:36 +09:00
Yalin Wang
02bc33e912
fix bug where last character in search keyword couldn't be cleared
...
with backspace. issue #825
2015-03-19 20:56:55 -05:00
Sacha Greif
4b0681c5f7
Merge branch 'devel' into sidenav
2015-03-19 11:25:30 +09:00
Sacha Greif
595df8c20a
updating Meteor to 1.0.4.1
2015-03-19 11:25:15 +09:00
Sacha Greif
11dd2cd49c
Merge pull request #827 from webyak/patch-1
...
missing `var` keyword for `defaultProperties`
2015-03-19 11:16:14 +09:00
Yannik Schweinzer
ea4d12aaf4
missed var
keyword
2015-03-18 18:25:17 +01:00
Sacha Greif
6894de3d2f
working on new admin menu
2015-03-18 17:22:43 +09:00
Sacha Greif
9cde28fdf6
fix API bugs
2015-03-18 16:22:30 +09:00
Sacha Greif
b38601dd94
Merge branch 'devel' into sidenav
2015-03-18 12:12:51 +09:00
Sacha Greif
8c2eb51209
make migration work with twitter accounts
2015-03-18 12:12:46 +09:00
Sacha Greif
77fee86303
updating Meteor
2015-03-18 10:40:23 +09:00
Sacha Greif
ab8ce6f2d8
Merge branch 'devel' into sidenav
2015-03-18 10:14:59 +09:00
Sacha Greif
aaf0ba013b
Merge branch 'gabrielhpugliese-master' into devel
2015-03-18 09:47:31 +09:00