Commit graph

18 commits

Author SHA1 Message Date
Sacha Greif
987696657d upgrade to meteor 1.0.1 2014-12-10 09:37:57 +09:00
Sacha Greif
ab639798d7 only apply primary button color to .btn-primary style 2014-11-27 17:43:11 +09:00
Sacha Greif
019ae375fd Merge branch 'master' into quickform
Conflicts:
	packages/telescope-theme-base/lib/client/css/screen.css
2014-11-26 17:32:25 +09:00
Anthony Mayer
aaa2efb05f Merge branch 'master' of https://github.com/TelescopeJS/Telescope into compass-to-node-sass
Conflicts:
	.meteor/packages
	packages/telescope-theme-base/versions.json
	packages/telescope-theme-hubble/lib/client/css/screen.css
	packages/telescope-theme-hubble/lib/client/scss/modules/_comments.scss
	packages/telescope-theme-hubble/lib/client/scss/modules/_posts.scss
	packages/telescope-theme-hubble/versions.json
2014-11-25 22:12:01 -08:00
Sacha Greif
b8dc56ea40 Merge branch 'master' into quickform
Conflicts:
	.meteor/versions
	client/views/settings/quickFormSettings.html
	collections/posts.js
	lib/router.js
	packages/telescope-api/versions.json
	packages/telescope-base/versions.json
	packages/telescope-module-embedly/versions.json
	packages/telescope-module-share/versions.json
	packages/telescope-notifications/versions.json
	packages/telescope-rss/versions.json
	packages/telescope-theme-base/versions.json
	packages/telescope-theme-hubble/versions.json
2014-11-26 11:22:54 +09:00
Sacha Greif
a3c5c0a4c4 updating tap:i18n 2014-11-25 08:56:29 +09:00
Anthony Mayer
30ca412921 Compiling scss as part of build rather than with compass.
Remove dependency on compass, add fourseven:scss (includes autoprefixer),
add reset package, delete compiled css, and some random scss cleanup.
2014-11-23 21:11:15 -08:00
Sacha Greif
f3ddf53cf7 updating package versions 2014-11-20 10:44:08 +09:00
Sacha Greif
0ceda58124 updating to Meteor 1.0 2014-11-17 09:35:29 +09:00
Sacha Greif
ccf0ea7820 working on quick form for post submit 2014-10-05 17:20:15 +09:00
Sacha Greif
f5c4908d12 Upgrading to 0.9.3.1 2014-10-04 12:51:44 +09:00
Sacha Greif
95a2157768 updating meteor 2014-09-26 12:03:59 +09:00
Sacha Greif
64ba9fe0f3 security fix 2014-09-23 11:30:21 +09:00
Sacha Greif
9222fdc4f9 upgrading to 0.9.2.1 2014-09-16 09:06:09 +09:00
Sacha Greif
f704c812ef Fixed rss package 2014-08-28 13:39:30 +09:00
Sacha Greif
11dc51b31d bringing back newsletter and embedly modules in core codebase and updating all packages to 0.9.0 2014-08-28 13:24:28 +09:00
Sacha Greif
8ee91e50dc Merge branch 'master' into daily
Conflicts:
	packages/telescope-theme-hubble/lib/client/css/screen.css
2014-08-27 10:36:38 +09:00
Sacha Greif
3b1cff9347 working on daily view 2014-08-27 10:23:56 +09:00