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
|
d3283e9b9c
|
Merge branch 'master' of https://github.com/TelescopeJS/Telescope
|
2014-11-25 15:47:49 +09:00 |
|
Sacha Greif
|
a3c5c0a4c4
|
updating tap:i18n
|
2014-11-25 08:56:29 +09:00 |
|
Ben Gott
|
f68ecba862
|
Upgrade to bengott:avatar 0.6.0
- Create new config file in lib/config/avatar.js (accessible to both
client and server)
- Comment out some outdated SCSS/CSS
|
2014-11-24 01:48:04 -06: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 |
|
Daniel Chcouri
|
a056b8297a
|
Add tap:i18n
|
2014-11-18 22:37:44 +08:00 |
|
Sacha Greif
|
c335d654c9
|
fixing missing username in notifications; cleaning up console.logs
|
2014-11-18 11:00:38 +09:00 |
|
Sacha Greif
|
3141c204c2
|
tweak commentCount migration; fix kadira version; fix path check
|
2014-11-18 09:56:09 +09:00 |
|
Sacha Greif
|
73cb59a088
|
Working on IR 1.0 update
|
2014-11-17 11:01:37 +09:00 |
|
Sacha Greif
|
570fca6fcb
|
cleaning up packages file
|
2014-11-17 10:15:03 +09:00 |
|
Sacha Greif
|
0ceda58124
|
updating to Meteor 1.0
|
2014-11-17 09:35:29 +09:00 |
|
Ben Gott
|
663cb88d1c
|
Update to bengott:avatar 0.2.1
|
2014-10-17 18:33:37 -05:00 |
|
Ben Gott
|
c84279cdfe
|
Fix email_hash bug (Issue #393)
|
2014-10-15 16:48:04 -05:00 |
|
Ben Gott
|
75a74c599d
|
Update to bengott:avatar 0.1.4
|
2014-10-14 18:53:09 -05:00 |
|
Ben Gott
|
4bb13c9243
|
Update to use bengott:avatar 0.1.2
|
2014-10-13 16:14:48 -05:00 |
|
Sacha Greif
|
4eb53c693c
|
updated autoform and testing date time field
|
2014-10-08 18:38:01 +09:00 |
|
Sacha Greif
|
521afdc50d
|
Merge branch 'herald-integration' of github.com:Kestanous/Telescope into Kestanous-herald-integration
Conflicts:
.meteor/versions
packages/telescope-kadira/versions.json
packages/telescope-notifications/lib/notifications.js
|
2014-10-07 10:34:23 +09:00 |
|
Massimiliano Marini
|
cb7ba31f9f
|
Update Kadira package to latest release 2.11.2
|
2014-10-05 12:30:29 +02:00 |
|
Sacha Greif
|
cd1496897d
|
updating packages
|
2014-10-05 17:23:05 +09:00 |
|
Sacha Greif
|
f5c4908d12
|
Upgrading to 0.9.3.1
|
2014-10-04 12:51:44 +09:00 |
|
Kestanous
|
9be1bd7169
|
herald integration
|
2014-10-02 16:42:31 -04:00 |
|
Ben Gott
|
bab24860d6
|
Update to use bengott:avatar package for all user avatars
|
2014-09-30 12:34:42 -05:00 |
|
Luca Mussi
|
98769bb429
|
update to accounts-templates-unstyled 0.9.7
|
2014-09-29 08:22:23 +02:00 |
|
Sacha Greif
|
95a2157768
|
updating meteor
|
2014-09-26 12:03:59 +09:00 |
|
Sacha Greif
|
25f5fcd778
|
finishing css tweaks
|
2014-09-26 11:28:20 +09:00 |
|
Sacha Greif
|
c06196f0ed
|
Merge branch 'at-integration' of github.com:splendido/Telescope into splendido-at-integration
Conflicts:
.meteor/packages
|
2014-09-26 11:22:49 +09:00 |
|
Luca Mussi
|
58ae149e00
|
updated to accounts-templates-unstyled@0.9.5
|
2014-09-25 15:08:24 +02:00 |
|
Luca Mussi
|
97b9fccbf4
|
Merge remote-tracking branch 'telescope/master' into at-integration
Conflicts:
.meteor/packages
|
2014-09-25 15:02:20 +02:00 |
|
Sacha Greif
|
7b3153d805
|
Merge branch 'at-integration' of github.com:splendido/Telescope into splendido-at-integration
Conflicts:
.meteor/packages
|
2014-09-25 09:14:50 +09:00 |
|
Sacha Greif
|
b54b7b60d8
|
adding telescope-kadira package
|
2014-09-24 14:14:04 +09:00 |
|
Sacha Greif
|
64ba9fe0f3
|
security fix
|
2014-09-23 11:30:21 +09:00 |
|
Luca Mussi
|
5910cc9c44
|
updated to at 0.9.4
|
2014-09-21 11:28:46 +02:00 |
|
Luca Mussi
|
acf9ddf33b
|
Merge remote-tracking branch 'telescope/master' into at-integration
Conflicts:
.meteor/packages
|
2014-09-20 16:30:11 +02:00 |
|
Luca Mussi
|
b6aadff54d
|
updated to at@0.9.3
|
2014-09-20 16:26:22 +02:00 |
|
Luca Mussi
|
ad4da5c35f
|
switched to accounts-templates-unstyled
|
2014-09-20 11:51:46 +02:00 |
|
Sacha Greif
|
2a911217e9
|
Making notifications into their own package
|
2014-09-20 09:57:09 +09:00 |
|
Sacha Greif
|
d78cb03b89
|
fix comment publication bug
|
2014-09-19 20:00:22 +09:00 |
|
Luca Mussi
|
043df6613c
|
first tests
|
2014-09-18 11:00:12 +02:00 |
|
Sacha Greif
|
cec0dd5a43
|
Merge branch 'alert'
Conflicts:
.meteor/versions
|
2014-09-16 09:13:24 +09:00 |
|
Sacha Greif
|
9222fdc4f9
|
upgrading to 0.9.2.1
|
2014-09-16 09:06:09 +09:00 |
|
Sacha Greif
|
27e274c872
|
working on alert banner
|
2014-09-08 17:29:55 +09:00 |
|
Lance Ennen
|
4b1ebf50fc
|
update bootstrap datepicker
|
2014-09-01 20:51:07 -05:00 |
|
Sacha Greif
|
21c6dc6854
|
using sanitizeHTML and adding migrations
|
2014-09-01 09:33:50 +09:00 |
|
Sacha Greif
|
e21f5c7056
|
adding new htmlBody field and adding hooks to sanitise it
|
2014-08-31 16:11:48 +09:00 |
|
Sacha Greif
|
9e068dba74
|
cleanup
|
2014-08-29 13:33:07 +09:00 |
|
Sacha Greif
|
266947e878
|
split out juice into its own package
|
2014-08-29 13:32:13 +09:00 |
|
Sacha Greif
|
8ae358181e
|
Got rid of meteorhacks:npm packages; moved email features to their own package
|
2014-08-29 10:23:11 +09:00 |
|
Sacha Greif
|
f704c812ef
|
Fixed rss package
|
2014-08-28 13:39:30 +09:00 |
|