Commit graph

2383 commits

Author SHA1 Message Date
Sacha Greif
50fc3eb11a Merge branch 'namespace' of https://github.com/TelescopeJS/Telescope into namespace
# Conflicts:
#	lib/users.js
#	packages/telescope-base/lib/base.js
#	packages/telescope-base/package.js
#	packages/telescope-lib
2015-04-20 13:57:37 +09:00
Sacha Greif
e1ccae8652 always point back at original template for now 2015-04-20 13:50:23 +09:00
Sacha Greif
8918af3296 added userProfileCompletedCallbacks 2015-04-20 08:41:33 +09:00
Sacha Greif
657e208a46 button tweaks 2015-04-15 09:20:50 +09:00
Sacha Greif
9b8b23f932 Merge branch 'delgermurun-template-extension' into devel
# Conflicts:
#	client/views/comments/comment_edit.js
#	client/views/comments/comment_form.js
2015-04-13 18:14:12 +09:00
Delgermurun
16d9eaf0f9 Delete all getTemplate related codes 2015-04-13 16:29:33 +09:00
Delgermurun
666577f4cb Template[getTemplate('XYZ')] => Template.XYZ 2015-04-13 14:52:03 +09:00
Sacha Greif
2070a725ea changing comment_item template 2015-04-13 09:19:42 +09:00
Sacha Greif
2e10b2f973 get rid of hotkeys package 2015-04-12 21:19:30 +09:00
Sacha Greif
4221449dcb Merge branch 'hotkeys' of https://github.com/delgermurun/Telescope into delgermurun-hotkeys 2015-04-11 17:03:24 +09:00
Sacha Greif
bea733f711 working on template extensions 2015-04-11 17:03:07 +09:00
Delgermurun
5748f50d66 Submit comment when press Crtl/Cmd+Enter 2015-04-11 15:47:32 +09:00
Sacha Greif
5900b3788e css fix 2015-04-11 12:25:34 +09:00
Sacha Greif
05e9d767ab do not show categories menu if there are no categories 2015-04-11 12:25:20 +09:00
Sacha Greif
a756aeb161 Merge pull request #905 from saimeunt/devel
Fix #903
2015-04-11 12:24:08 +09:00
saimeunt
714d7f1b54 Fix #903 2015-04-10 23:38:08 +02:00
Sacha Greif
bca4d19562 use function for defaultView as well 2015-04-10 14:46:22 +09:00
Sacha Greif
26a5e3ad5a small fixes 2015-04-10 14:16:37 +09:00
Sacha Greif
8871734cfc show all post views in settings 2015-04-10 14:16:26 +09:00
Sacha Greif
07f6dc4d73 Publish pages for all users 2015-04-09 11:34:19 +09:00
Sacha Greif
7a219a738d add pages to mobile nav; various CSS fixes 2015-04-09 10:02:50 +09:00
Sacha Greif
bbf9fb9666 Merge branch 'devel' 2015-04-09 09:38:47 +09:00
Sacha Greif
b7d38982ff don't display pages menu if there are no pages 2015-04-08 19:36:41 +09:00
Sacha Greif
2b05abf527 adding pages package 2015-04-08 18:23:29 +09:00
Sacha Greif
cb7b4164ab collapse user menu by default 2015-04-08 11:57:53 +09:00
Sacha Greif
621c51eb63 update meteor and version bump 2015-04-08 09:41:05 +09:00
Sacha Greif
4ba2f69e9b filter out admin menu items 2015-04-08 09:30:57 +09:00
Sacha Greif
be9d017304 avatars css fix 2015-04-08 09:20:58 +09:00
Sacha Greif
ffdbaed70d Merge branch 'settings-package' of https://github.com/delgermurun/Telescope into delgermurun-settings-package
Conflicts:
	.meteor/packages
	.meteor/versions
	client/components/postList/posts_list.js
	client/main.js
	lib/router/filters.js
	lib/router/posts.js
	lib/router/users.js
	packages/telescope-base/package.js
	packages/telescope-daily/lib/routes.js
	packages/telescope-module-share/package.js
	packages/telescope-seo/lib/routes.js
	packages/telescope-seo/lib/seo.js
	packages/telescope-seo/package.js
	packages/telescope-singleday/lib/routes.js
2015-04-08 09:20:50 +09:00
Sacha Greif
3563a41579 Merge branch 'devel' of https://github.com/TelescopeJS/Telescope into devel 2015-04-08 09:05:50 +09:00
Sacha Greif
ba3e6fee89 Merge pull request #880 from Alekzanther/devel
Swedish translation
2015-04-08 09:05:34 +09:00
Sacha Greif
0c8514a56b Fix #887 (thanks @kai101) 2015-04-08 09:05:15 +09:00
Sacha Greif
8f94eaa765 Fix #892 (feeds not getting imported) 2015-04-08 09:00:37 +09:00
Sacha Greif
7b92cfd653 Merge branch 'devel' of https://github.com/TelescopeJS/Telescope into devel 2015-04-08 08:56:45 +09:00
Sacha Greif
b2365ebfa0 Merge pull request #896 from ndarilek/devel
Additional accessibility fixes
2015-04-08 08:56:35 +09:00
Nolan Darilek
a571d40502 Set aria-live on post bodies so they're read automatically when viewed. 2015-04-07 09:59:23 -05:00
Nolan Darilek
20acbeda4e Set aria-hidden on avatars in comments and disable live regions. 2015-04-07 09:54:01 -05:00
Nolan Darilek
b325c8028c Disable live regions on, and hide from accessibility, post and comment avatars. 2015-04-07 09:48:06 -05:00
Nolan Darilek
8560a64121 aria-hidden needs a value. 2015-04-07 08:53:49 -05:00
Alekzanther
c15ea3ba93 Added Swedish translation for City 2015-04-07 15:27:14 +02:00
Alekzanther
38a74d68a0 Sync with upstream
Merge branch 'devel' of https://github.com/TelescopeJS/Telescope into devel
2015-04-07 15:21:10 +02:00
Sacha Greif
c937b1a8b5 adding new helper functions 2015-04-06 18:34:48 +09:00
Sacha Greif
3a3fc48847 Merge branch 'devel' of https://github.com/TelescopeJS/Telescope into devel 2015-04-06 10:08:07 +09:00
Sacha Greif
a8dd402e27 update avatar package 2015-04-06 10:08:03 +09:00
Charlie DeTar
ce488a2a76 Set canonical URL without overriding other params
manuelschoebel:ms-seo defaults to clearing prior settings on any call to
``SEO.set``, unless a second falsy argument is given.

Fixes #878.
2015-04-04 09:03:50 -06:00
Sacha Greif
ca20b9e1f2 add city field to profile 2015-04-03 18:52:44 +09:00
Sacha Greif
c1d0d6f6f7 clean up 2015-04-03 18:52:23 +09:00
Sacha Greif
c02850b78c use link instead of @import for font 2015-04-03 18:50:39 +09:00
Sacha Greif
c056003eca fix header mobile menu button color 2015-04-03 09:54:32 +09:00
Sacha Greif
48bfb14b11 Merge branch 'devel' of https://github.com/TelescopeJS/Telescope into devel
Conflicts:
	.meteor/versions
2015-04-03 09:49:04 +09:00