From 043df6613c83d4332f62b34fe96e63177af982f6 Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Thu, 18 Sep 2014 11:00:12 +0200 Subject: [PATCH 01/23] first tests --- .meteor/cordova-plugins | 1 + .meteor/packages | 2 +- .meteor/release | 2 +- .meteor/versions | 7 +-- client/main.js | 7 --- lib/config/at_config.js | 58 +++++++++++++++++++ lib/router.js | 3 + packages/npm-container/versions.json | 2 +- packages/telescope-api/versions.json | 2 +- packages/telescope-base/versions.json | 2 +- packages/telescope-daily/versions.json | 2 +- packages/telescope-email/versions.json | 2 +- packages/telescope-i18n/versions.json | 2 +- packages/telescope-lib/versions.json | 2 +- .../telescope-module-embedly/versions.json | 2 +- packages/telescope-module-share/versions.json | 2 +- packages/telescope-newsletter/versions.json | 2 +- packages/telescope-rss/versions.json | 2 +- packages/telescope-search/versions.json | 2 +- packages/telescope-tags/versions.json | 2 +- packages/telescope-theme-base/versions.json | 2 +- packages/telescope-theme-hubble/versions.json | 2 +- .../telescope-update-prompt/versions.json | 2 +- 23 files changed, 83 insertions(+), 29 deletions(-) create mode 100644 .meteor/cordova-plugins create mode 100644 lib/config/at_config.js diff --git a/.meteor/cordova-plugins b/.meteor/cordova-plugins new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/.meteor/cordova-plugins @@ -0,0 +1 @@ + diff --git a/.meteor/packages b/.meteor/packages index c22e089ee..0a8dc2195 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -38,7 +38,6 @@ sacha:spin@2.0.4 sacha:juice chuangbo:marked@0.3.3 percolatestudio:synced-cron@0.1.1 -joshowens:accounts-entry@0.9.0 # Atmosphere Packages (Old) @@ -66,4 +65,5 @@ matb33:collection-hooks djedi:sanitize-html rajit:bootstrap3-datepicker telescope-update-prompt +splendido:accounts-templates-bootstrap diff --git a/.meteor/release b/.meteor/release index 0d5c84e67..55ab0ecac 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@0.9.2.1 +METEOR@0.9.2.2 diff --git a/.meteor/versions b/.meteor/versions index ada23e866..afeb392ae 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -41,8 +41,6 @@ iron:core@0.3.4 iron:dynamic-template@0.4.1 iron:layout@0.4.1 iron:router@0.9.3 -joshowens:accounts-entry@0.9.0 -joshowens:simple-form@0.1.8 jquery@1.0.0 json@1.0.0 less@1.0.8 @@ -61,12 +59,10 @@ minimongo@1.0.3 mobile-status-bar@1.0.0 mongo-livedata@1.0.4 mongo@1.0.5 -mrt:accounts-t9n@0.0.13 mrt:cookies@0.3.0 mrt:jquery-hotkeys@0.0.1 mrt:mailchimp@0.4.0 mrt:moment@2.8.1 -mrt:underscore-string-latest@2.3.3 npm-bcrypt@0.7.7 npm-container@1.0.0 oauth1@1.1.0 @@ -87,9 +83,12 @@ sacha:spin@2.0.4 service-configuration@1.0.1 session@1.0.1 sha@1.0.0 +softwarerero:accounts-t9n@0.0.20 spacebars-compiler@1.0.2 spacebars@1.0.1 spiderable@1.0.3 +splendido:accounts-templates-bootstrap@0.9.0 +splendido:accounts-templates-core@0.9.0 srp@1.0.0 standard-app-packages@1.0.1 telescope-api@0.0.0 diff --git a/client/main.js b/client/main.js index b46272bb1..b452cfa72 100644 --- a/client/main.js +++ b/client/main.js @@ -47,11 +47,4 @@ postMeta = _.sortBy(postMeta, 'order'); Meteor.startup(function () { $('#rss-link').attr('title', i18n.t('New Posts')); - - AccountsEntry.config({ - homeRoute: '/', - dashboardRoute: '/', - passwordSignupFields: 'USERNAME_AND_EMAIL', - profileRoute: 'profile' - }); }); \ No newline at end of file diff --git a/lib/config/at_config.js b/lib/config/at_config.js new file mode 100644 index 000000000..00f7349aa --- /dev/null +++ b/lib/config/at_config.js @@ -0,0 +1,58 @@ +//Fields +AccountsTemplates.addField({ + _id: "username", + type: "text", + displayName: "username", + required: true, + minLength: 5, +}); + +/* +AccountsTemplates.addField({ + _id: "username_and_email", + type: "text", + displayName: "Name or Email", + placeholder: "name or email", +}); +*/ + +//Routes +AccountsTemplates.configureRoute("signIn", { + path: "sign-in", +}); + +AccountsTemplates.configureRoute("signUp", { + path: "sign-up", +}); + +AccountsTemplates.configureRoute("forgotPwd", { + path: "forgot-password", +}); + +//AccountsTemplates.configureRoute("changePwd"); +//AccountsTemplates.configureRoute("enrollAccount"); +//AccountsTemplates.configureRoute("resetPwd"); +//AccountsTemplates.configureRoute("verifyEmail"); + +// Options +AccountsTemplates.configure({ + enablePasswordChange: false, + showForgotPasswordLink: true, + confirmPassword: false, +/* + overrideLoginErrors: true, + sendVerificationEmail: true, + continuousValidation: false, + showLabels: true, + forbidClientAccountCreation: false, + formValidationFeedback: true, + homeRoutePath: "/", + showAddRemoveServices: false, + showPlaceholders: true, +*/ +}); + +// Initialization +Meteor.startup(function(){ + AccountsTemplates.init(); +}); \ No newline at end of file diff --git a/lib/router.js b/lib/router.js index 392b8470e..7809eb4ee 100644 --- a/lib/router.js +++ b/lib/router.js @@ -132,6 +132,7 @@ Router._filters = { $body.css("min-height", 0); }, + /* isLoggedIn: function(pause) { if (!(Meteor.loggingIn() || Meteor.user())) { throwError(i18n.t('Please Sign In First.')); @@ -143,6 +144,8 @@ Router._filters = { pause(); } }, + */ + isLoggedIn: AccountsTemplates.ensureSignedIn, isLoggedOut: function(pause) { if(Meteor.user()){ diff --git a/packages/npm-container/versions.json b/packages/npm-container/versions.json index fcfc7319d..32d357691 100644 --- a/packages/npm-container/versions.json +++ b/packages/npm-container/versions.json @@ -10,6 +10,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.30", + "toolVersion": "meteor-tool@1.0.31", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-api/versions.json b/packages/telescope-api/versions.json index 7d0e4679d..2e112fdd0 100644 --- a/packages/telescope-api/versions.json +++ b/packages/telescope-api/versions.json @@ -86,6 +86,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.30", + "toolVersion": "meteor-tool@1.0.31", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-base/versions.json b/packages/telescope-base/versions.json index 4b070463a..aff95dfc9 100644 --- a/packages/telescope-base/versions.json +++ b/packages/telescope-base/versions.json @@ -82,6 +82,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.30", + "toolVersion": "meteor-tool@1.0.31", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-daily/versions.json b/packages/telescope-daily/versions.json index 206be18fb..41b155036 100644 --- a/packages/telescope-daily/versions.json +++ b/packages/telescope-daily/versions.json @@ -210,6 +210,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.30", + "toolVersion": "meteor-tool@1.0.31", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-email/versions.json b/packages/telescope-email/versions.json index 8c171f337..648738212 100644 --- a/packages/telescope-email/versions.json +++ b/packages/telescope-email/versions.json @@ -18,6 +18,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.30", + "toolVersion": "meteor-tool@1.0.31", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-i18n/versions.json b/packages/telescope-i18n/versions.json index 19e341977..70fc037e0 100644 --- a/packages/telescope-i18n/versions.json +++ b/packages/telescope-i18n/versions.json @@ -74,6 +74,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.30", + "toolVersion": "meteor-tool@1.0.31", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-lib/versions.json b/packages/telescope-lib/versions.json index 83c9f0dfd..06691806b 100644 --- a/packages/telescope-lib/versions.json +++ b/packages/telescope-lib/versions.json @@ -14,6 +14,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.30", + "toolVersion": "meteor-tool@1.0.31", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-module-embedly/versions.json b/packages/telescope-module-embedly/versions.json index 873f4b84c..9ce88e4d5 100644 --- a/packages/telescope-module-embedly/versions.json +++ b/packages/telescope-module-embedly/versions.json @@ -98,6 +98,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.30", + "toolVersion": "meteor-tool@1.0.31", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-module-share/versions.json b/packages/telescope-module-share/versions.json index 5b1deadad..63d8ffc78 100644 --- a/packages/telescope-module-share/versions.json +++ b/packages/telescope-module-share/versions.json @@ -90,6 +90,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.30", + "toolVersion": "meteor-tool@1.0.31", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-newsletter/versions.json b/packages/telescope-newsletter/versions.json index d87422f6a..2a49ba206 100644 --- a/packages/telescope-newsletter/versions.json +++ b/packages/telescope-newsletter/versions.json @@ -214,6 +214,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.30", + "toolVersion": "meteor-tool@1.0.31", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-rss/versions.json b/packages/telescope-rss/versions.json index 7d0e4679d..2e112fdd0 100644 --- a/packages/telescope-rss/versions.json +++ b/packages/telescope-rss/versions.json @@ -86,6 +86,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.30", + "toolVersion": "meteor-tool@1.0.31", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-search/versions.json b/packages/telescope-search/versions.json index 2a1c51405..06c6b163c 100644 --- a/packages/telescope-search/versions.json +++ b/packages/telescope-search/versions.json @@ -186,6 +186,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.30", + "toolVersion": "meteor-tool@1.0.31", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-tags/versions.json b/packages/telescope-tags/versions.json index 2a1c51405..06c6b163c 100644 --- a/packages/telescope-tags/versions.json +++ b/packages/telescope-tags/versions.json @@ -186,6 +186,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.30", + "toolVersion": "meteor-tool@1.0.31", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-theme-base/versions.json b/packages/telescope-theme-base/versions.json index 7d0e4679d..2e112fdd0 100644 --- a/packages/telescope-theme-base/versions.json +++ b/packages/telescope-theme-base/versions.json @@ -86,6 +86,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.30", + "toolVersion": "meteor-tool@1.0.31", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-theme-hubble/versions.json b/packages/telescope-theme-hubble/versions.json index 7d0e4679d..2e112fdd0 100644 --- a/packages/telescope-theme-hubble/versions.json +++ b/packages/telescope-theme-hubble/versions.json @@ -86,6 +86,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.30", + "toolVersion": "meteor-tool@1.0.31", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-update-prompt/versions.json b/packages/telescope-update-prompt/versions.json index e8e55f499..c4ee6c901 100644 --- a/packages/telescope-update-prompt/versions.json +++ b/packages/telescope-update-prompt/versions.json @@ -190,6 +190,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.30", + "toolVersion": "meteor-tool@1.0.31", "format": "1.0" } \ No newline at end of file From 962ab548511686821f4826f6bef31f1b6f91cde0 Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Thu, 18 Sep 2014 18:17:31 +0200 Subject: [PATCH 02/23] logout route --- lib/router.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/router.js b/lib/router.js index 7809eb4ee..30d250d64 100644 --- a/lib/router.js +++ b/lib/router.js @@ -250,7 +250,7 @@ if(Meteor.isClient){ // Router.onBeforeAction(filters.isReady); Router.onBeforeAction(clearSeenErrors); - Router.onBeforeAction(filters.canView, {except: ['entrySignIn', 'entrySignUp', 'entryForgotPassword', 'entryResetPassword', 'entrySignOut']}); + Router.onBeforeAction(filters.canView, {except: ['atSignIn', 'atSignUp', 'atForgotPwd', 'atResetPwd', 'signOut']}); Router.onBeforeAction(filters.hasCompletedProfile); Router.onBeforeAction(filters.isLoggedIn, {only: ['post_submit']}); Router.onBeforeAction(filters.isLoggedOut, {only: []}); @@ -613,6 +613,18 @@ Meteor.startup(function () { // -------------------------------------------- Users -------------------------------------------- // + // User Logout + + this.route('signOut', { + path: '/sign-out', + onBeforeAction: function(pause) { + Meteor.logout(function() { + return Router.go('/'); + }); + return pause(); + } + }); + // User Profile this.route('user_profile', { From 98fc658545f84040848438d36bec624c100a3268 Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Thu, 18 Sep 2014 20:37:49 +0200 Subject: [PATCH 03/23] custom template for atForm --- client/views/common/at_form.html | 9 +++++++++ lib/config/at_config.js | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 client/views/common/at_form.html diff --git a/client/views/common/at_form.html b/client/views/common/at_form.html new file mode 100644 index 000000000..dba082443 --- /dev/null +++ b/client/views/common/at_form.html @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/lib/config/at_config.js b/lib/config/at_config.js index 00f7349aa..c7d7372b4 100644 --- a/lib/config/at_config.js +++ b/lib/config/at_config.js @@ -19,19 +19,26 @@ AccountsTemplates.addField({ //Routes AccountsTemplates.configureRoute("signIn", { path: "sign-in", + template: "aTmpls", }); AccountsTemplates.configureRoute("signUp", { path: "sign-up", + template: "aTmpls", }); AccountsTemplates.configureRoute("forgotPwd", { path: "forgot-password", + template: "aTmpls", +}); + +AccountsTemplates.configureRoute("resetPwd", { + path: "reset-password", + template: "aTmpls", }); //AccountsTemplates.configureRoute("changePwd"); //AccountsTemplates.configureRoute("enrollAccount"); -//AccountsTemplates.configureRoute("resetPwd"); //AccountsTemplates.configureRoute("verifyEmail"); // Options From 1210c8a7d7d97d4f05750975ec1c844746014ae4 Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Thu, 18 Sep 2014 20:54:42 +0200 Subject: [PATCH 04/23] changed screen.css to set maxwidth to at-form --- packages/telescope-theme-hubble/lib/client/css/screen.css | 4 ++-- .../lib/client/scss/partials/_grid.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/telescope-theme-hubble/lib/client/css/screen.css b/packages/telescope-theme-hubble/lib/client/css/screen.css index 46ca0f5f6..1720a4a81 100644 --- a/packages/telescope-theme-hubble/lib/client/css/screen.css +++ b/packages/telescope-theme-hubble/lib/client/css/screen.css @@ -18,12 +18,12 @@ margin-right: auto; } /* line 47, ../scss/partials/_grid.scss */ -.grid-small, .entry { +.grid-small, .at-form { width: 100%; margin: 0 auto; } @media screen and (min-width: 30em) { /* line 47, ../scss/partials/_grid.scss */ - .grid-small, .entry { + .grid-small, .at-form { max-width: 500px; } } /*================ FUNCTIONS =================*/ diff --git a/packages/telescope-theme-hubble/lib/client/scss/partials/_grid.scss b/packages/telescope-theme-hubble/lib/client/scss/partials/_grid.scss index d07ab8420..d55b1843e 100644 --- a/packages/telescope-theme-hubble/lib/client/scss/partials/_grid.scss +++ b/packages/telescope-theme-hubble/lib/client/scss/partials/_grid.scss @@ -44,7 +44,7 @@ $medium-break: 50em; margin-left: auto; margin-right: auto; } -.grid-small, .entry{ +.grid-small, .at-form{ width: 100%; @include medium-large{ max-width:500px; From 7733e68716c6497be7408aeb6191979e85e68d2a Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Thu, 18 Sep 2014 21:42:44 +0200 Subject: [PATCH 05/23] observe changes on settings to set current language also to accounts-t9n --- collections/settings.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/collections/settings.js b/collections/settings.js index b23ec3055..99e30b24a 100644 --- a/collections/settings.js +++ b/collections/settings.js @@ -177,3 +177,19 @@ Settings.allow({ remove: isAdminById }); + +var query = Settings.find(); +var handle = query.observeChanges({ + added: function (id, fields) { + console.log('Added document to settings'); + console.log(fields); + if (fields.language) + T9n.language = fields.language; + }, + changed: function (id, fields) { + console.log('Changed document inside settings'); + console.log(fields); + if (fields.language) + T9n.language = fields.language; + } +}); \ No newline at end of file From 64018cbf427b55897e94a1905f3ea6c89ad36dfb Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Thu, 18 Sep 2014 22:16:46 +0200 Subject: [PATCH 06/23] added italian locales --- lib/locales/it.js | 192 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 192 insertions(+) create mode 100644 lib/locales/it.js diff --git a/lib/locales/it.js b/lib/locales/it.js new file mode 100644 index 000000000..ad7058244 --- /dev/null +++ b/lib/locales/it.js @@ -0,0 +1,192 @@ +i18n.translations.it = { + //Navigation + "Menu": "Menu", + "Top": "Migliori", + "New": "Nuovi", + "Digest": "Selezione", + "Categories": "Categorie", + "Users": "Utenti", + "Settings": "Impostazioni", + "Admin": "Amministrazione", + "Post": "Posta", + "Toolbox": "Toolbox", + "Sign Up/Sign In": "Registrati/Accedi", + "My Account": "Il Mio Account", + "View Profile": "Vedi Profilo", + "Edit Account": "Modifica Account", + + //Main + "New Posts": "Nuovi Post", + + //Commments + "Your comment has been deleted.": "Il tuo commento è stato rimosso.", + "Comment": "Commenta", + "Delete Comment": "Elimina Commento", + "Add Comment": "Aggiungi Commento", + "upvote": "promuovi", + "downvote": "sconsiglia", + "link": "link", + "Edit": "Modifica", + "Reply": "Rispondi", + "No comments.": "Nessun commento.", + + //Errors + "You are already logged in": "Hai già eseguito l'accesso", + "Sorry, this is a private site. Please sign up first.": "Ci spiace, questo è un sito privato. Per favore registrati.", + "Thanks for signing up!": "Grazie per esserti registrato!", + "The site is currently invite-only, but we will let you know as soon as a spot opens up.": "Questo sito al momento è solo per chi è stato invitato, ma ti faremo sapere non appena ci sarà la possibilità di accedere.", + "Sorry, you don't have the rights to view this page.": "Ci spiace, non hai i permessi per visualizzare questa pagina.", + "Not Found!": "Non Trovato!", + "We're sorry; whatever you were looking for isn't here..": "Ci spiace; qualsiasi cosa stessi cercando non è qua..", + + //Notifications + "No notifications": "Nessuna Notifica", + "1 notification": "1 notifica", + "notifications": "notificche", + "Mark all as read": "Segna tutte come lette", + + // Post deleted + "Your post has been deleted.": "Il tuo post è stato rimosso.", + + // Post digest + "The top 5 posts of each day.": "I 5 migliori post di ogni giorno.", + "Previous Day": "Giorno Precedente", + "Next Day": "Giorno Successivo", + "Sorry, no posts for today": "Ci spiace, non ci sono post per oggi", + "Sorry, no posts for": "Ci spiace, non ci sono post per", + "Today": "Oggi", + "Yesterday": "Ieri", + + // Post submit & edit + "Created": "Creato", + "Title": "Titolo", + "Suggest title": "Titolo suggerito", + "URL": "URL", + "Short URL": "URL breve", + "Body": "Corpo", + "Category": "Categoria", + "Inactive?": "Inattivo?", + "Sticky?": "Persistente?", + "Submission Date": "Data di Invio", + "Submission Time": "Ora di Invio", + "Date": "Data", + "Submission": "Invio", + "Note: this post is still pending so it has no submission timestamp yet.": "Nota: questo post è ancora in attesa quindi non ha ancora una data di invio.", + "User": "Utente", + "Status": "Stato", + "Approved": "Approvato", + "Rejected": "Rifiutato", + "Delete Post": "Elimina Post", + "Thanks, your post is awaiting approval.": "Grazie, il tuo post è in attesa di approvazione.", + "Sorry, couldn't find a title...": "Ci spiace, non riusciamo a trovare un titolo...", + "Please fill in an URL first!": "Per favore riempi prima l'URL!", + + // Post item + "Share": "Condividi", + "Discuss": "Discuti", + "Upvote": "Promuovi", + "Sticky": "Persistente", + "status": "stato", + "votes": "voti", + "baseScore": "punteggioBase", + "score": "punteggio", + "clicks": "clicks", + "inactive": "inattivo", + "comment": "commento", + "comments": "commenti", + "point": "punto", + "points": "punti", + + //User + "Please complete your profile below before continuing.": "Per favore completa il tuo profilo qua sotto prima di proseguire.", + "Account": "Account", + "Username": "Nome Utente", + "Display Name": "Nove Visualizzato", + "Email": "Email", + "Bio": "Biografia", + "Password": "Password", + "Change Password?": "Cambio Password?", + "Old Password": "Vecchia Password", + "New Password": "Nuova Password", + "Email Notifications": "Notifiche via Email", + "New Posts": "Nuovi Posts", + "Comments on my posts": "Commenti ai miei post", + "Replies to my comments": "Risposte ai miei commenti", + "Forgot password?": "Password dimenticata?", + "Profile updated": "Profilo aggiornato", + "Please fill in your email below to finish signing up.": "Per favore inserisci qua sotto la tua email per completare la registrazione.", + "Invite": "Invita", + "Uninvite": "Annulla l'Invito", + "Make admin": "Rendi amministratore", + "Unadmin": "Annulla amministratore", + "Delete User": "Elimina Utente", + "Are you sure you want to delete ": "Sei sicuro che vuoi eliminare ", + "Reset Password": "Reimposta Password", + "Password reset link sent!": "Link per reimpostare la password inviato!", + "Name": "Nome", + "Posts": "Post", + "Comments": "Commenti", + "Karma": "Karma", + "Is Invited?": "È Invitato?", + "Is Admin?": "È Amministratore?", + "Delete": "Elimina", + "Member since": "Membro dal", + "Edit profile": "Modifica profilo", + "Sign In": "Accedi", + "Sign in!": "Accedi!", + "Sign up!": "Registrati!", + "Don't have an account?": "Non hai un account?", + "Already have an account?": "Hai già un account?", + "Sign Up": "Registrati", + "Please fill in all fields": "Per favore compila tutti i campi", + "Invite ": "Invita ", + "left": " sinistra", + "Invite (none left)": "Invita (nessuno rimasto)", + "All": "Tutti", + "Invited": "Invitati", + "Uninvited": "Non Invitati", + "Filter by": "Filtra per", + "Sort by": "Ordina per", + + //helpers + "Sorry, you do not have access to this page": "Ci spiace, non hai accesso a questa pagina", + "Please Sign In First.": "Per favore prima accedi.", + "Sorry, you have to be an admin to view this page.": "Ci spiace, devi essere un amministratore per vedere questa pagina.", + "Sorry, you don't have permissions to add new items.": "Ci spiace, non hai i permessi per aggiungere nuovi elementi.", + "Sorry, you cannot edit this post.": "Ci spiace, non puoi modificare questo post.", + "Sorry, you cannot edit this comment.": "Ci spiace, non puoi modificare questo commento.", + + //Collections + "You need to login and be an admin to add a new category.": "Devi accedere ed essere un amministratore per aggiungere una nuova categoria.", + "You need to login or be invited to post new comments.": "Devi accedere od essere invitato per postare nuovi commenti.", + "Please wait ": "Per favore attendi ", + " seconds before commenting again": " secondi prima di fare un altro commento", + "Your comment is empty.": "Il tuo commento è vuoto.", + "You don't have permission to delete this comment.": "Non hai i permessi per eliminare questo commento.", + "You need to login or be invited to post new stories.": "Devi accedere od essere invitato per postare nuove storie.", + "Please fill in a headline": "Per favore inserisci un titolo", + "This link has already been posted": "Questo link è già stato postato", + "Sorry, you cannot submit more than ": "Ci spiace, non puoi inviare più di ", + " posts per day": " post al giorno", + "Someone replied to your comment on": "Qualcuno ha risposto al tuo commento su", + " has replied to your comment on": " ha risposto al tuo commento su", + "Read more": "Leggi di più", + "A new comment on your post": "Un nuovo commento sul tuo post", + "You have a new comment by ": "Hai un nuovo commento di ", + " on your post": " sul tuo post", + " has created a new post": " ha creato un nuovo post", + "Your account has been approved.": "Il tuo account è stato approvato.", + "Welcome to ": "Benvenuto a ", + "Start posting.": "Inizia a postare.", + + //Common + "Pending": "In Attesa", + "Loading...": "Caricamento...", + "Submit": "Invia", + "You must be logged in.": "Devi effettuare l'accesso.", + "Are you sure?": "Sei sicuro?", + "Please log in first": "Per favore esegui prima l'accesso", + "Sign In/Sign Up with Twitter": "Accedi/Registrati con Twitter", + "Load more": "Carica altro" + +}; From ad4da5c35fff47dea5bbf009431477953d61e202 Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Sat, 20 Sep 2014 11:51:46 +0200 Subject: [PATCH 07/23] switched to accounts-templates-unstyled --- .meteor/packages | 3 ++- .meteor/versions | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 0a8dc2195..db838ced8 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -65,5 +65,6 @@ matb33:collection-hooks djedi:sanitize-html rajit:bootstrap3-datepicker telescope-update-prompt -splendido:accounts-templates-bootstrap +service-configuration +splendido:accounts-templates-unstyled diff --git a/.meteor/versions b/.meteor/versions index afeb392ae..95cad1d72 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -87,8 +87,8 @@ softwarerero:accounts-t9n@0.0.20 spacebars-compiler@1.0.2 spacebars@1.0.1 spiderable@1.0.3 -splendido:accounts-templates-bootstrap@0.9.0 splendido:accounts-templates-core@0.9.0 +splendido:accounts-templates-unstyled@0.9.0 srp@1.0.0 standard-app-packages@1.0.1 telescope-api@0.0.0 From fa3479b7c4aef19e966a184d97954287f0fef6fc Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Sat, 20 Sep 2014 11:55:00 +0200 Subject: [PATCH 08/23] observe changes on setting client-side only --- collections/settings.js | 44 +++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/collections/settings.js b/collections/settings.js index 99e30b24a..d23b081f3 100644 --- a/collections/settings.js +++ b/collections/settings.js @@ -47,11 +47,11 @@ settingsSchemaObject = { defaultEmail: { type: String, optional: true - }, + }, scoreUpdateInterval: { type: Number, optional: true - }, + }, defaultView: { type: String, optional: true, @@ -60,7 +60,7 @@ settingsSchemaObject = { return { value: camelCaseify(view.label), label: view.label - } + }; }) } }, @@ -119,7 +119,7 @@ settingsSchemaObject = { buttonTextColor: { type: String, optional: true - }, + }, headerColor: { type: String, optional: true @@ -127,7 +127,7 @@ settingsSchemaObject = { headerTextColor: { type: String, optional: true - }, + }, twitterAccount: { type: String, optional: true @@ -159,7 +159,7 @@ settingsSchemaObject = { notes: { type: String, optional: true - } + }, }; // add any extra properties to settingsSchemaObject (provided by packages for example) @@ -178,18 +178,20 @@ Settings.allow({ }); -var query = Settings.find(); -var handle = query.observeChanges({ - added: function (id, fields) { - console.log('Added document to settings'); - console.log(fields); - if (fields.language) - T9n.language = fields.language; - }, - changed: function (id, fields) { - console.log('Changed document inside settings'); - console.log(fields); - if (fields.language) - T9n.language = fields.language; - } -}); \ No newline at end of file +if (Meteor.isClient){ + var query = Settings.find(); + var handle = query.observeChanges({ + added: function (id, fields) { + console.log('Added document to settings'); + console.log(fields); + if (fields.language) + T9n.language = fields.language; + }, + changed: function (id, fields) { + console.log('Changed document inside settings'); + console.log(fields); + if (fields.language) + T9n.language = fields.language; + } + }); +} \ No newline at end of file From e31811416c94f66203a5f7d1c3c591874c8e0d5a Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Sat, 20 Sep 2014 12:25:04 +0200 Subject: [PATCH 09/23] removed console.log --- collections/settings.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/collections/settings.js b/collections/settings.js index d23b081f3..0e986993f 100644 --- a/collections/settings.js +++ b/collections/settings.js @@ -182,14 +182,10 @@ if (Meteor.isClient){ var query = Settings.find(); var handle = query.observeChanges({ added: function (id, fields) { - console.log('Added document to settings'); - console.log(fields); if (fields.language) T9n.language = fields.language; }, changed: function (id, fields) { - console.log('Changed document inside settings'); - console.log(fields); if (fields.language) T9n.language = fields.language; } From 4d19ee9498df5fd96d5b4925e361e9e1e6974454 Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Sat, 20 Sep 2014 12:52:14 +0200 Subject: [PATCH 10/23] better at configuration --- lib/config/at_config.js | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/lib/config/at_config.js b/lib/config/at_config.js index c7d7372b4..2eeb3cfa2 100644 --- a/lib/config/at_config.js +++ b/lib/config/at_config.js @@ -7,6 +7,27 @@ AccountsTemplates.addField({ minLength: 5, }); +AccountsTemplates.removeField('email'); +AccountsTemplates.addField({ + _id: 'email', + type: 'email', + required: true, + re: /.+@(.+){2,}\.(.+){2,}/, + errStr: 'error.accounts.Invalid email', + trim: true, + lowercase: true, +}); + +AccountsTemplates.removeField('password'); +AccountsTemplates.addField({ + _id: 'password', + type: 'password', + required: true, + minLength: 7, + errStr: 'error.minChar', +}); + + /* AccountsTemplates.addField({ _id: "username_and_email", @@ -45,9 +66,14 @@ AccountsTemplates.configureRoute("resetPwd", { AccountsTemplates.configure({ enablePasswordChange: false, showForgotPasswordLink: true, - confirmPassword: false, -/* + confirmPassword: true, overrideLoginErrors: true, + + negativeFeedback: false, + positiveFeedback: false, + negativeValidation: true, + positiveValidation: true, +/* sendVerificationEmail: true, continuousValidation: false, showLabels: true, From e0bb8f7fd706879cf4e5cb05cbb803011c14f145 Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Sat, 20 Sep 2014 14:21:32 +0200 Subject: [PATCH 11/23] removed no more unuseful aTmpls template --- client/views/common/at_form.html | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 client/views/common/at_form.html diff --git a/client/views/common/at_form.html b/client/views/common/at_form.html deleted file mode 100644 index dba082443..000000000 --- a/client/views/common/at_form.html +++ /dev/null @@ -1,9 +0,0 @@ - \ No newline at end of file From 59e4cdaa8e9dce2131c00f2aad0331cd10aedb50 Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Sat, 20 Sep 2014 14:21:56 +0200 Subject: [PATCH 12/23] better at configuration --- lib/config/at_config.js | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/lib/config/at_config.js b/lib/config/at_config.js index 2eeb3cfa2..81d3a19f2 100644 --- a/lib/config/at_config.js +++ b/lib/config/at_config.js @@ -1,3 +1,8 @@ +////////////////////////////////// +// AccountsTemplates configuration +////////////////////////////////// + + //Fields AccountsTemplates.addField({ _id: "username", @@ -27,7 +32,6 @@ AccountsTemplates.addField({ errStr: 'error.minChar', }); - /* AccountsTemplates.addField({ _id: "username_and_email", @@ -37,31 +41,17 @@ AccountsTemplates.addField({ }); */ + //Routes -AccountsTemplates.configureRoute("signIn", { - path: "sign-in", - template: "aTmpls", -}); - -AccountsTemplates.configureRoute("signUp", { - path: "sign-up", - template: "aTmpls", -}); - -AccountsTemplates.configureRoute("forgotPwd", { - path: "forgot-password", - template: "aTmpls", -}); - -AccountsTemplates.configureRoute("resetPwd", { - path: "reset-password", - template: "aTmpls", -}); - +AccountsTemplates.configureRoute("signIn"); +AccountsTemplates.configureRoute("signUp", {redirect: "/"}); +AccountsTemplates.configureRoute("forgotPwd", {redirect: "/"}); +AccountsTemplates.configureRoute("resetPwd", {redirect: "/"}); //AccountsTemplates.configureRoute("changePwd"); //AccountsTemplates.configureRoute("enrollAccount"); //AccountsTemplates.configureRoute("verifyEmail"); + // Options AccountsTemplates.configure({ enablePasswordChange: false, @@ -85,6 +75,7 @@ AccountsTemplates.configure({ */ }); + // Initialization Meteor.startup(function(){ AccountsTemplates.init(); From b6aadff54dcbf25bcb603e3b00d525c0ef6413a6 Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Sat, 20 Sep 2014 16:26:22 +0200 Subject: [PATCH 13/23] updated to at@0.9.3 --- .meteor/versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.meteor/versions b/.meteor/versions index 95cad1d72..2cf2a69d1 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -87,8 +87,8 @@ softwarerero:accounts-t9n@0.0.20 spacebars-compiler@1.0.2 spacebars@1.0.1 spiderable@1.0.3 -splendido:accounts-templates-core@0.9.0 -splendido:accounts-templates-unstyled@0.9.0 +splendido:accounts-templates-core@0.9.3 +splendido:accounts-templates-unstyled@0.9.3 srp@1.0.0 standard-app-packages@1.0.1 telescope-api@0.0.0 From 2ba151ab8b10a1b30ad876c26453d62e4deb2ef1 Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Sun, 21 Sep 2014 07:37:25 +0200 Subject: [PATCH 14/23] versions --- packages/telescope-notifications/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/telescope-notifications/versions.json b/packages/telescope-notifications/versions.json index 3b02d8879..e6a2af6b7 100644 --- a/packages/telescope-notifications/versions.json +++ b/packages/telescope-notifications/versions.json @@ -194,6 +194,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.30", + "toolVersion": "meteor-tool@1.0.31", "format": "1.0" } \ No newline at end of file From 5910cc9c4498450ef146216d5e49a807a08ce97d Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Sun, 21 Sep 2014 11:28:46 +0200 Subject: [PATCH 15/23] updated to at 0.9.4 --- .meteor/packages | 3 ++- .meteor/versions | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 5ba9defae..306779718 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -68,6 +68,7 @@ rajit:bootstrap3-datepicker # Accounts Templates -splendido:accounts-templates-unstyled service-configuration accounts-ui +splendido:accounts-templates-unstyled + diff --git a/.meteor/versions b/.meteor/versions index bdae82150..ac1fe22a4 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -87,8 +87,8 @@ softwarerero:accounts-t9n@0.0.20 spacebars-compiler@1.0.2 spacebars@1.0.1 spiderable@1.0.3 -splendido:accounts-templates-core@0.9.3 -splendido:accounts-templates-unstyled@0.9.3 +splendido:accounts-templates-core@0.9.4 +splendido:accounts-templates-unstyled@0.9.4 srp@1.0.0 standard-app-packages@1.0.1 telescope-api@0.0.0 From 933ec7d6f9c83c68e89ba7de4aaf1a52b6f6954f Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Wed, 24 Sep 2014 07:35:10 +0200 Subject: [PATCH 16/23] removed confirm password ad validation rules --- lib/config/at_config.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/config/at_config.js b/lib/config/at_config.js index 81d3a19f2..3f2b7054f 100644 --- a/lib/config/at_config.js +++ b/lib/config/at_config.js @@ -9,7 +9,7 @@ AccountsTemplates.addField({ type: "text", displayName: "username", required: true, - minLength: 5, + //minLength: 5, }); AccountsTemplates.removeField('email'); @@ -28,8 +28,8 @@ AccountsTemplates.addField({ _id: 'password', type: 'password', required: true, - minLength: 7, - errStr: 'error.minChar', + //minLength: 7, + //errStr: 'error.minChar', }); /* @@ -56,7 +56,7 @@ AccountsTemplates.configureRoute("resetPwd", {redirect: "/"}); AccountsTemplates.configure({ enablePasswordChange: false, showForgotPasswordLink: true, - confirmPassword: true, + confirmPassword: false, overrideLoginErrors: true, negativeFeedback: false, From e04a4e98e3a25e7da117a6a27c0609fe29c102cf Mon Sep 17 00:00:00 2001 From: Sacha Greif Date: Thu, 25 Sep 2014 09:14:55 +0900 Subject: [PATCH 17/23] working on CSS --- .../lib/client/css/screen.css | 81 +++++++++++++++---- .../lib/client/scss/global/_forms.scss | 2 +- .../lib/client/scss/global/_main.scss | 2 +- .../lib/client/scss/screen.scss | 1 + .../lib/client/scss/specific/_accounts.scss | 54 +++++++++++++ .../lib/client/css/screen.css | 61 +++++++------- .../lib/client/scss/partials/_grid.scss | 5 +- 7 files changed, 156 insertions(+), 50 deletions(-) create mode 100644 packages/telescope-theme-base/lib/client/scss/specific/_accounts.scss diff --git a/packages/telescope-theme-base/lib/client/css/screen.css b/packages/telescope-theme-base/lib/client/css/screen.css index 7c89f2900..ba71ae282 100644 --- a/packages/telescope-theme-base/lib/client/css/screen.css +++ b/packages/telescope-theme-base/lib/client/css/screen.css @@ -113,46 +113,46 @@ form > div, .accounts-dialog > div { form > div:after, .accounts-dialog > div:after { clear: both; } /* line 12, ../scss/global/_forms.scss */ -form .control-group, form .form-group, .accounts-dialog .control-group, .accounts-dialog .form-group { +form .control-group, form .form-group, form .at-input, .accounts-dialog .control-group, .accounts-dialog .form-group, .accounts-dialog .at-input { /* For modern browsers */ /* For IE 6/7 (trigger hasLayout) */ *zoom: 1; margin-bottom: 15px; } /* line 6, ../scss/includes/_mixins.scss */ - form .control-group:before, form .control-group:after, form .form-group:before, form .form-group:after, .accounts-dialog .control-group:before, .accounts-dialog .control-group:after, .accounts-dialog .form-group:before, .accounts-dialog .form-group:after { + form .control-group:before, form .control-group:after, form .form-group:before, form .form-group:after, form .at-input:before, form .at-input:after, .accounts-dialog .control-group:before, .accounts-dialog .control-group:after, .accounts-dialog .form-group:before, .accounts-dialog .form-group:after, .accounts-dialog .at-input:before, .accounts-dialog .at-input:after { content: ""; display: table; } /* line 10, ../scss/includes/_mixins.scss */ - form .control-group:after, form .form-group:after, .accounts-dialog .control-group:after, .accounts-dialog .form-group:after { + form .control-group:after, form .form-group:after, form .at-input:after, .accounts-dialog .control-group:after, .accounts-dialog .form-group:after, .accounts-dialog .at-input:after { clear: both; } /* line 15, ../scss/global/_forms.scss */ - form .control-group > label, form .form-group > label, .accounts-dialog .control-group > label, .accounts-dialog .form-group > label { + form .control-group > label, form .form-group > label, form .at-input > label, .accounts-dialog .control-group > label, .accounts-dialog .form-group > label, .accounts-dialog .at-input > label { font-weight: bold; display: block; } @media screen and (max-width: 40em) { /* line 15, ../scss/global/_forms.scss */ - form .control-group > label, form .form-group > label, .accounts-dialog .control-group > label, .accounts-dialog .form-group > label { + form .control-group > label, form .form-group > label, form .at-input > label, .accounts-dialog .control-group > label, .accounts-dialog .form-group > label, .accounts-dialog .at-input > label { margin-bottom: 5px; } } @media screen and (min-width: 40em) { /* line 15, ../scss/global/_forms.scss */ - form .control-group > label, form .form-group > label, .accounts-dialog .control-group > label, .accounts-dialog .form-group > label { + form .control-group > label, form .form-group > label, form .at-input > label, .accounts-dialog .control-group > label, .accounts-dialog .form-group > label, .accounts-dialog .at-input > label { float: left; margin-right: 10px; } } /* line 26, ../scss/global/_forms.scss */ - form .control-group .controls, form .form-group .controls, .accounts-dialog .control-group .controls, .accounts-dialog .form-group .controls { + form .control-group .controls, form .form-group .controls, form .at-input .controls, .accounts-dialog .control-group .controls, .accounts-dialog .form-group .controls, .accounts-dialog .at-input .controls { position: relative; } @media screen and (min-width: 40em) { /* line 26, ../scss/global/_forms.scss */ - form .control-group .controls, form .form-group .controls, .accounts-dialog .control-group .controls, .accounts-dialog .form-group .controls { + form .control-group .controls, form .form-group .controls, form .at-input .controls, .accounts-dialog .control-group .controls, .accounts-dialog .form-group .controls, .accounts-dialog .at-input .controls { margin-left: 200px; } } /* line 31, ../scss/global/_forms.scss */ - form .control-group .controls .inline-link, form .form-group .controls .inline-link, .accounts-dialog .control-group .controls .inline-link, .accounts-dialog .form-group .controls .inline-link { + form .control-group .controls .inline-link, form .form-group .controls .inline-link, form .at-input .controls .inline-link, .accounts-dialog .control-group .controls .inline-link, .accounts-dialog .form-group .controls .inline-link, .accounts-dialog .at-input .controls .inline-link { position: absolute; display: block; top: 2px; right: 8px; } /* line 36, ../scss/global/_forms.scss */ - form .control-group .controls .inline-link.loading, form .form-group .controls .inline-link.loading, .accounts-dialog .control-group .controls .inline-link.loading, .accounts-dialog .form-group .controls .inline-link.loading { + form .control-group .controls .inline-link.loading, form .form-group .controls .inline-link.loading, form .at-input .controls .inline-link.loading, .accounts-dialog .control-group .controls .inline-link.loading, .accounts-dialog .form-group .controls .inline-link.loading, .accounts-dialog .at-input .controls .inline-link.loading { background: url(/img/loading.gif) center center no-repeat; height: 22px; width: 18px; @@ -160,23 +160,23 @@ form .control-group, form .form-group, .accounts-dialog .control-group, .account text-shadow: none; color: transparent; } /* line 43, ../scss/global/_forms.scss */ - form .control-group .controls label, form .form-group .controls label, .accounts-dialog .control-group .controls label, .accounts-dialog .form-group .controls label { + form .control-group .controls label, form .form-group .controls label, form .at-input .controls label, .accounts-dialog .control-group .controls label, .accounts-dialog .form-group .controls label, .accounts-dialog .at-input .controls label { display: block; margin-bottom: 5px; } /* line 47, ../scss/global/_forms.scss */ - form .control-group .controls label.inline, form .form-group .controls label.inline, .accounts-dialog .control-group .controls label.inline, .accounts-dialog .form-group .controls label.inline { + form .control-group .controls label.inline, form .form-group .controls label.inline, form .at-input .controls label.inline, .accounts-dialog .control-group .controls label.inline, .accounts-dialog .form-group .controls label.inline, .accounts-dialog .at-input .controls label.inline { display: inline-block; margin-bottom: 0; } /* line 52, ../scss/global/_forms.scss */ - form .control-group.inline, form .form-group.inline, .accounts-dialog .control-group.inline, .accounts-dialog .form-group.inline { + form .control-group.inline, form .form-group.inline, form .at-input.inline, .accounts-dialog .control-group.inline, .accounts-dialog .form-group.inline, .accounts-dialog .at-input.inline { margin-bottom: 10px; } /* line 53, ../scss/global/_forms.scss */ - form .control-group.inline .controls, form .form-group.inline .controls, .accounts-dialog .control-group.inline .controls, .accounts-dialog .form-group.inline .controls { + form .control-group.inline .controls, form .form-group.inline .controls, form .at-input.inline .controls, .accounts-dialog .control-group.inline .controls, .accounts-dialog .form-group.inline .controls, .accounts-dialog .at-input.inline .controls { margin-left: 0px; width: 80%; float: left; } /* line 58, ../scss/global/_forms.scss */ - form .control-group.inline .submit, form .form-group.inline .submit, .accounts-dialog .control-group.inline .submit, .accounts-dialog .form-group.inline .submit { + form .control-group.inline .submit, form .form-group.inline .submit, form .at-input.inline .submit, .accounts-dialog .control-group.inline .submit, .accounts-dialog .form-group.inline .submit, .accounts-dialog .at-input.inline .submit { float: right; } /* line 64, ../scss/global/_forms.scss */ form .form-actions, form .form-group, .accounts-dialog .form-actions, .accounts-dialog .form-group { @@ -367,7 +367,7 @@ a { height: 300px; } /* line 39, ../scss/global/_main.scss */ -.grid-module { +.grid-module, .at-form { background: white; margin-bottom: 10px; padding: 15px; } @@ -518,6 +518,55 @@ h4 { li { margin: 0 0 10px 0; } +/* line 5, ../scss/specific/_accounts.scss */ +.at-oauth { + text-align: center; } + /* line 7, ../scss/specific/_accounts.scss */ + .at-oauth .at-social-btn { + margin: 0 auto 15px auto; } + +/* line 12, ../scss/specific/_accounts.scss */ +.at-sep { + text-align: center; + position: relative; + overflow: hidden; + margin-bottom: 15px; } + /* line 17, ../scss/specific/_accounts.scss */ + .at-sep:before, .at-sep:after { + display: block; + content: " "; + border-bottom: 1px solid #ddd; + width: 100%; + position: absolute; + top: 48%; } + /* line 25, ../scss/specific/_accounts.scss */ + .at-sep:before { + left: -55%; } + /* line 28, ../scss/specific/_accounts.scss */ + .at-sep:after { + right: -55%; } + +/* line 34, ../scss/specific/_accounts.scss */ +.at-input label { + margin-bottom: 5px; } + +/* line 39, ../scss/specific/_accounts.scss */ +#at-forgotPwd { + font-size: 13px; + float: right; + margin-top: -8px; } + +/* line 45, ../scss/specific/_accounts.scss */ +#at-btn { + margin: 0 auto; } + +/* line 49, ../scss/specific/_accounts.scss */ +.at-signup-link { + border-top: 1px solid #ddd; + margin-top: 15px; + padding-top: 15px; + text-align: center; } + /* line 1, ../scss/specific/_dropdown.scss */ .has-dropdown .dropdown { position: relative; } diff --git a/packages/telescope-theme-base/lib/client/scss/global/_forms.scss b/packages/telescope-theme-base/lib/client/scss/global/_forms.scss index 43f318679..76dbc4a61 100644 --- a/packages/telescope-theme-base/lib/client/scss/global/_forms.scss +++ b/packages/telescope-theme-base/lib/client/scss/global/_forms.scss @@ -9,7 +9,7 @@ form, .accounts-dialog{ >div{ @include cf; } - .control-group, .form-group{ + .control-group, .form-group, .at-input{ @include cf; margin-bottom:$grid-padding; >label{ diff --git a/packages/telescope-theme-base/lib/client/scss/global/_main.scss b/packages/telescope-theme-base/lib/client/scss/global/_main.scss index be6986ae2..e2d06ee22 100644 --- a/packages/telescope-theme-base/lib/client/scss/global/_main.scss +++ b/packages/telescope-theme-base/lib/client/scss/global/_main.scss @@ -36,7 +36,7 @@ height:300px; } -.grid-module{ +.grid-module, .at-form{ background: white; margin-bottom: $grid-margin; padding: $grid-padding; diff --git a/packages/telescope-theme-base/lib/client/scss/screen.scss b/packages/telescope-theme-base/lib/client/scss/screen.scss index 95ed9c4b2..6045bafda 100644 --- a/packages/telescope-theme-base/lib/client/scss/screen.scss +++ b/packages/telescope-theme-base/lib/client/scss/screen.scss @@ -20,6 +20,7 @@ // Specific Styles (header, posts, etc.) +@import "specific/accounts"; @import "specific/dropdown"; @import "specific/errors"; @import "specific/header"; diff --git a/packages/telescope-theme-base/lib/client/scss/specific/_accounts.scss b/packages/telescope-theme-base/lib/client/scss/specific/_accounts.scss new file mode 100644 index 000000000..78efdc4af --- /dev/null +++ b/packages/telescope-theme-base/lib/client/scss/specific/_accounts.scss @@ -0,0 +1,54 @@ +.at-form{ + +} + +.at-oauth{ + text-align: center; + .at-social-btn{ + margin: 0 auto 15px auto; + } +} + +.at-sep{ + text-align: center; + position: relative; + overflow: hidden; + margin-bottom: 15px; + &:before, &:after{ + display: block; + content: " "; + border-bottom: 1px solid #ddd; + width: 100%; + position: absolute; + top: 48%; + } + &:before{ + left: -55%; + } + &:after{ + right: -55%; + } +} + +.at-input{ + label{ + margin-bottom: 5px; + } +} + +#at-forgotPwd{ + font-size: 13px; + float: right; + margin-top: -8px; +} + +#at-btn{ + margin: 0 auto; +} + +.at-signup-link{ + border-top: 1px solid #ddd; + margin-top: 15px; + padding-top: 15px; + text-align: center; +} \ No newline at end of file diff --git a/packages/telescope-theme-hubble/lib/client/css/screen.css b/packages/telescope-theme-hubble/lib/client/css/screen.css index 46ca0f5f6..be1ab2412 100644 --- a/packages/telescope-theme-hubble/lib/client/css/screen.css +++ b/packages/telescope-theme-hubble/lib/client/css/screen.css @@ -18,12 +18,13 @@ margin-right: auto; } /* line 47, ../scss/partials/_grid.scss */ -.grid-small, .entry { +.grid-small, .at-form { width: 100%; - margin: 0 auto; } + margin-left: auto; + margin-right: auto; } @media screen and (min-width: 30em) { /* line 47, ../scss/partials/_grid.scss */ - .grid-small, .entry { + .grid-small, .at-form { max-width: 500px; } } /*================ FUNCTIONS =================*/ @@ -32,7 +33,7 @@ /* line 108, ../scss/partials/_mixins.scss */ .popover, .share-options { background: white; - border: 1px solid #dd3416; + border: 1px solid #DD3416; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -204,11 +205,11 @@ em { left: 50%; top: -40px; opacity: 0; - -moz-transition: ease-out opacity 300ms 0ms; - -o-transition: ease-out opacity 300ms 0ms; - -webkit-transition: ease-out opacity 300ms; + -moz-transition: ease-out 300ms opacity 0ms; + -o-transition: ease-out 300ms opacity 0ms; + -webkit-transition: ease-out 300ms opacity; -webkit-transition-delay: 0ms; - transition: ease-out opacity 300ms 0ms; } + transition: ease-out 300ms opacity 0ms; } /* line 11, ../scss/partials/_tooltips.scss */ .has-tooltip .tooltip span { display: block; @@ -538,7 +539,7 @@ em { /* line 191, ../scss/modules/_posts.scss */ .post-upvote .upvote-link.not-voted:hover i { background: rgba(221, 52, 22, 0.1); - color: #dd3416; + color: #DD3416; text-shadow: none; } /* line 197, ../scss/modules/_posts.scss */ .post-upvote .upvote-link.voted { @@ -587,11 +588,11 @@ em { border-radius: 0px 0px 3px 3px; } /* line 242, ../scss/modules/_posts.scss */ .post.animate { - -moz-transition: ease-out top 400ms 0ms; - -o-transition: ease-out top 400ms 0ms; - -webkit-transition: ease-out top 400ms; + -moz-transition: ease-out 400ms top 0ms; + -o-transition: ease-out 400ms top 0ms; + -webkit-transition: ease-out 400ms top; -webkit-transition-delay: 0ms; - transition: ease-out top 400ms 0ms; } + transition: ease-out 400ms top 0ms; } /* line 246, ../scss/modules/_posts.scss */ .post.inactive .post-content { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAQElEQVQYV2NkIALMnDlTkpGQOpCi9PT053gVwhSBDMOpEFkRToXoirAqxKYIQyEuRSgK8SmCKySkCKyQGEUghQC5OyXvW/4BHwAAAABJRU5ErkJggg=="); } @@ -686,7 +687,7 @@ em { vertical-align: middle; } /* line 328, ../scss/modules/_posts.scss */ .post-category:hover { - background: #dd3416; + background: #DD3416; color: white; } /* line 333, ../scss/modules/_posts.scss */ @@ -719,7 +720,7 @@ em { line-height: 50px; } /* line 359, ../scss/modules/_posts.scss */ .post-share > a.edit-link, .post-discuss > a.edit-link { - color: #dd3416; } + color: #DD3416; } /* line 362, ../scss/modules/_posts.scss */ .post-share > a.share-link, .post-discuss > a.share-link { color: #7ac0e4; @@ -732,7 +733,7 @@ em { color: #7ac0e4; } /* line 373, ../scss/modules/_posts.scss */ .post-share > a:hover, .post-share > a:hover .action, .post-discuss > a:hover, .post-discuss > a:hover .action { - color: #dd3416; } + color: #DD3416; } /* line 377, ../scss/modules/_posts.scss */ .post-share > a.voted, .post-discuss > a.voted { background: #4e555d; @@ -851,11 +852,11 @@ em { .queue-container { position: relative; height: 0px; - -moz-transition: ease-out opacity 400ms 0ms; - -o-transition: ease-out opacity 400ms 0ms; - -webkit-transition: ease-out opacity 400ms; + -moz-transition: ease-out 400ms opacity 0ms; + -o-transition: ease-out 400ms opacity 0ms; + -webkit-transition: ease-out 400ms opacity; -webkit-transition-delay: 0ms; - transition: ease-out opacity 400ms 0ms; } + transition: ease-out 400ms opacity 0ms; } /* line 5, ../scss/modules/_comments.scss */ .queue-container ul { position: absolute; @@ -891,7 +892,7 @@ em { display: block; height: 30px; width: 30px; - background: #dd3416; + background: #DD3416; -moz-border-radius: 100px; -webkit-border-radius: 100px; border-radius: 100px; @@ -921,11 +922,11 @@ em { background: none; } /* line 75, ../scss/modules/_comments.scss */ .comment .comment-body { - -moz-transition: ease-out opacity 600ms 0ms; - -o-transition: ease-out opacity 600ms 0ms; - -webkit-transition: ease-out opacity 600ms; + -moz-transition: ease-out 600ms opacity 0ms; + -o-transition: ease-out 600ms opacity 0ms; + -webkit-transition: ease-out 600ms opacity; -webkit-transition-delay: 0ms; - transition: ease-out opacity 600ms 0ms; + transition: ease-out 600ms opacity 0ms; opacity: 1; } /* line 80, ../scss/modules/_comments.scss */ .comment.comment-queued .comment-body { @@ -987,7 +988,7 @@ em { text-indent: 0; } /* line 168, ../scss/modules/_comments.scss */ .comment-meta .comment-permalink:hover:before { - color: #dd3416; } + color: #DD3416; } /* line 173, ../scss/modules/_comments.scss */ .comment-actions { @@ -1027,7 +1028,7 @@ em { line-height: 30px; text-align: center; text-indent: 0; - color: #dd3416; } + color: #DD3416; } /* line 205, ../scss/modules/_comments.scss */ .comment-actions a:hover { background: #4e555d; } @@ -1107,7 +1108,7 @@ em { .error { margin-bottom: 10px; text-align: center; - background: #dd3416; + background: #DD3416; color: white; } /* line 1, ../scss/modules/_share.scss */ @@ -1168,14 +1169,14 @@ em { @media screen and (max-width: 30em) { /* line 48, ../scss/modules/_share.scss */ .share-options:before { - border-bottom-color: #dd3416; + border-bottom-color: #DD3416; top: -22px; left: 50%; margin-left: -12px; } } @media screen and (min-width: 30em) { /* line 48, ../scss/modules/_share.scss */ .share-options:before { - border-left-color: #dd3416; + border-left-color: #DD3416; top: 20px; margin-top: -4px; } } /* line 63, ../scss/modules/_share.scss */ diff --git a/packages/telescope-theme-hubble/lib/client/scss/partials/_grid.scss b/packages/telescope-theme-hubble/lib/client/scss/partials/_grid.scss index d07ab8420..3f0dfa42d 100644 --- a/packages/telescope-theme-hubble/lib/client/scss/partials/_grid.scss +++ b/packages/telescope-theme-hubble/lib/client/scss/partials/_grid.scss @@ -44,10 +44,11 @@ $medium-break: 50em; margin-left: auto; margin-right: auto; } -.grid-small, .entry{ +.grid-small, .at-form{ width: 100%; @include medium-large{ max-width:500px; } - margin:0 auto; + margin-left: auto; + margin-right: auto; } From 58ae149e0091a1b0d315eb5d9ab39cea902ecc24 Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Thu, 25 Sep 2014 15:08:24 +0200 Subject: [PATCH 18/23] updated to accounts-templates-unstyled@0.9.5 --- .meteor/packages | 1 + .meteor/versions | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 77c543bb4..bd6764cd2 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -72,3 +72,4 @@ rajit:bootstrap3-datepicker service-configuration accounts-ui splendido:accounts-templates-unstyled + diff --git a/.meteor/versions b/.meteor/versions index 00c9c4086..0a7a7ea00 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -52,7 +52,6 @@ meteor-platform@1.1.0 meteor@1.1.0 meteorhacks:async@1.0.0 meteorhacks:fast-render@1.1.0 -meteorhacks:kadira@2.5.0 meteorhacks:npm@1.2.0 meteorhacks:subs-manager@1.1.0 minifiers@1.1.0 @@ -84,12 +83,12 @@ sacha:spin@2.0.4 service-configuration@1.0.1 session@1.0.1 sha@1.0.0 -softwarerero:accounts-t9n@0.0.20 +softwarerero:accounts-t9n@1.0.0 spacebars-compiler@1.0.2 spacebars@1.0.1 spiderable@1.0.3 -splendido:accounts-templates-core@0.9.4 -splendido:accounts-templates-unstyled@0.9.4 +splendido:accounts-templates-core@0.9.5 +splendido:accounts-templates-unstyled@0.9.5 srp@1.0.0 standard-app-packages@1.0.1 telescope-api@0.0.0 @@ -97,7 +96,6 @@ telescope-base@0.0.0 telescope-daily@0.0.0 telescope-email@0.2.9 telescope-i18n@0.0.0 -telescope-kadira@0.1.0 telescope-lib@0.2.9 telescope-module-embedly@0.2.9 telescope-module-share@0.0.0 From 7d66ae23eb7edac292899aae47d200a4cbb81f92 Mon Sep 17 00:00:00 2001 From: Sacha Greif Date: Fri, 26 Sep 2014 09:40:55 +0900 Subject: [PATCH 19/23] Fix #430 --- client/views/users/user_edit.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/views/users/user_edit.js b/client/views/users/user_edit.js index 11ad62d15..e7e9f92eb 100644 --- a/client/views/users/user_edit.js +++ b/client/views/users/user_edit.js @@ -56,8 +56,7 @@ Template[getTemplate('user_edit')].events({ "profile.notifications.users": $('input[name=notifications_users]:checked').length, // only actually used for admins "profile.notifications.posts": $('input[name=notifications_posts]:checked').length, "profile.notifications.comments": $('input[name=notifications_comments]:checked').length, - "profile.notifications.replies": $('input[name=notifications_replies]:checked').length, - "inviteCount": parseInt($target.find('[name=inviteCount]').val()) + "profile.notifications.replies": $('input[name=notifications_replies]:checked').length }; var old_password = $target.find('[name=old_password]').val(); From 25f5fcd778af1d5026bc73970ee5e64460cd7060 Mon Sep 17 00:00:00 2001 From: Sacha Greif Date: Fri, 26 Sep 2014 11:28:20 +0900 Subject: [PATCH 20/23] finishing css tweaks --- .meteor/versions | 2 + .../lib/client/css/screen.css | 49 ---------------- .../lib/client/css/screen.css | 56 +++++++++++++++++++ .../lib/client/scss/modules}/_accounts.scss | 13 +++-- .../lib/client/scss/screen.scss | 1 + 5 files changed, 66 insertions(+), 55 deletions(-) rename packages/{telescope-theme-base/lib/client/scss/specific => telescope-theme-hubble/lib/client/scss/modules}/_accounts.scss (81%) diff --git a/.meteor/versions b/.meteor/versions index 0a7a7ea00..e2d5f2961 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -52,6 +52,7 @@ meteor-platform@1.1.0 meteor@1.1.0 meteorhacks:async@1.0.0 meteorhacks:fast-render@1.1.0 +meteorhacks:kadira@2.5.0 meteorhacks:npm@1.2.0 meteorhacks:subs-manager@1.1.0 minifiers@1.1.0 @@ -96,6 +97,7 @@ telescope-base@0.0.0 telescope-daily@0.0.0 telescope-email@0.2.9 telescope-i18n@0.0.0 +telescope-kadira@0.1.0 telescope-lib@0.2.9 telescope-module-embedly@0.2.9 telescope-module-share@0.0.0 diff --git a/packages/telescope-theme-base/lib/client/css/screen.css b/packages/telescope-theme-base/lib/client/css/screen.css index ba71ae282..ceded5247 100644 --- a/packages/telescope-theme-base/lib/client/css/screen.css +++ b/packages/telescope-theme-base/lib/client/css/screen.css @@ -518,55 +518,6 @@ h4 { li { margin: 0 0 10px 0; } -/* line 5, ../scss/specific/_accounts.scss */ -.at-oauth { - text-align: center; } - /* line 7, ../scss/specific/_accounts.scss */ - .at-oauth .at-social-btn { - margin: 0 auto 15px auto; } - -/* line 12, ../scss/specific/_accounts.scss */ -.at-sep { - text-align: center; - position: relative; - overflow: hidden; - margin-bottom: 15px; } - /* line 17, ../scss/specific/_accounts.scss */ - .at-sep:before, .at-sep:after { - display: block; - content: " "; - border-bottom: 1px solid #ddd; - width: 100%; - position: absolute; - top: 48%; } - /* line 25, ../scss/specific/_accounts.scss */ - .at-sep:before { - left: -55%; } - /* line 28, ../scss/specific/_accounts.scss */ - .at-sep:after { - right: -55%; } - -/* line 34, ../scss/specific/_accounts.scss */ -.at-input label { - margin-bottom: 5px; } - -/* line 39, ../scss/specific/_accounts.scss */ -#at-forgotPwd { - font-size: 13px; - float: right; - margin-top: -8px; } - -/* line 45, ../scss/specific/_accounts.scss */ -#at-btn { - margin: 0 auto; } - -/* line 49, ../scss/specific/_accounts.scss */ -.at-signup-link { - border-top: 1px solid #ddd; - margin-top: 15px; - padding-top: 15px; - text-align: center; } - /* line 1, ../scss/specific/_dropdown.scss */ .has-dropdown .dropdown { position: relative; } diff --git a/packages/telescope-theme-hubble/lib/client/css/screen.css b/packages/telescope-theme-hubble/lib/client/css/screen.css index be1ab2412..2dcebb28f 100644 --- a/packages/telescope-theme-hubble/lib/client/css/screen.css +++ b/packages/telescope-theme-hubble/lib/client/css/screen.css @@ -239,6 +239,62 @@ em { .has-tooltip:hover .tooltip { opacity: 1; } +/* line 1, ../scss/modules/_accounts.scss */ +.at-oauth { + text-align: center; } + /* line 3, ../scss/modules/_accounts.scss */ + .at-oauth .at-social-btn { + margin: 0 auto 15px auto; } + +/* line 8, ../scss/modules/_accounts.scss */ +.at-sep { + text-align: center; + position: relative; + overflow: hidden; + margin-bottom: 15px; } + /* line 13, ../scss/modules/_accounts.scss */ + .at-sep:before, .at-sep:after { + display: block; + content: " "; + border-bottom: 1px solid #ddd; + width: 100%; + position: absolute; + top: 48%; } + /* line 21, ../scss/modules/_accounts.scss */ + .at-sep:before { + left: -55%; } + /* line 24, ../scss/modules/_accounts.scss */ + .at-sep:after { + right: -55%; } + +/* line 30, ../scss/modules/_accounts.scss */ +.at-input label { + margin-bottom: 5px; } + +/* line 35, ../scss/modules/_accounts.scss */ +#at-forgotPwd { + font-size: 13px; + float: right; + margin-top: -8px; } + +/* line 41, ../scss/modules/_accounts.scss */ +#at-btn { + margin: 0 auto; } + +/* line 44, ../scss/modules/_accounts.scss */ +.at-title { + border-bottom: 1px solid #ddd; + margin-bottom: 20px; + padding-bottom: 5px; + text-align: center; } + +/* line 50, ../scss/modules/_accounts.scss */ +.at-signup-link, .at-signin-link { + border-top: 1px solid #ddd; + margin-top: 15px; + padding-top: 15px; + text-align: center; } + /* line 1, ../scss/modules/_nav.scss */ .header { background-color: #4e555d; diff --git a/packages/telescope-theme-base/lib/client/scss/specific/_accounts.scss b/packages/telescope-theme-hubble/lib/client/scss/modules/_accounts.scss similarity index 81% rename from packages/telescope-theme-base/lib/client/scss/specific/_accounts.scss rename to packages/telescope-theme-hubble/lib/client/scss/modules/_accounts.scss index 78efdc4af..1efe7f833 100644 --- a/packages/telescope-theme-base/lib/client/scss/specific/_accounts.scss +++ b/packages/telescope-theme-hubble/lib/client/scss/modules/_accounts.scss @@ -1,7 +1,3 @@ -.at-form{ - -} - .at-oauth{ text-align: center; .at-social-btn{ @@ -45,8 +41,13 @@ #at-btn{ margin: 0 auto; } - -.at-signup-link{ +.at-title{ + border-bottom: 1px solid #ddd; + margin-bottom: 20px; + padding-bottom: 5px; + text-align: center; +} +.at-signup-link, .at-signin-link{ border-top: 1px solid #ddd; margin-top: 15px; padding-top: 15px; diff --git a/packages/telescope-theme-hubble/lib/client/scss/screen.scss b/packages/telescope-theme-hubble/lib/client/scss/screen.scss index 8139a37f0..65929df40 100644 --- a/packages/telescope-theme-hubble/lib/client/scss/screen.scss +++ b/packages/telescope-theme-hubble/lib/client/scss/screen.scss @@ -17,6 +17,7 @@ // @import "partials/markdown"; @import "partials/tooltips"; +@import "modules/accounts"; @import "modules/nav"; // @import "modules/mobile_nav"; @import "modules/posts"; From 2eccd9f8ad598900146ff7b78563494d666fa058 Mon Sep 17 00:00:00 2001 From: Sacha Greif Date: Fri, 26 Sep 2014 11:32:03 +0900 Subject: [PATCH 21/23] updating history --- History.md | 2 ++ lib/version.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/History.md b/History.md index 07708e60d..8ac226bb9 100644 --- a/History.md +++ b/History.md @@ -4,6 +4,8 @@ * Kadira is now included by default. * Comments now have their own feed (thanks @delgermurun!). * Fixed URL collision bug (thanks @GoodEveningMiss!). +* Now using [`account-templates`](https://github.com/splendido/accounts-templates-core) (thanks @splendido!). +* Retinizing avatar sizes (thanks @shaialon!). ## v0.9.5 “FixScope” diff --git a/lib/version.js b/lib/version.js index 793c48e1e..ca8bfd3c0 100644 --- a/lib/version.js +++ b/lib/version.js @@ -1 +1 @@ -telescopeVersion = "0.9.5"; \ No newline at end of file +telescopeVersion = "0.9.6"; \ No newline at end of file From 95a21577686296176c6e114d18a498bd572d5f37 Mon Sep 17 00:00:00 2001 From: Sacha Greif Date: Fri, 26 Sep 2014 12:03:59 +0900 Subject: [PATCH 22/23] updating meteor --- .meteor/release | 2 +- .meteor/versions | 69 ++++++++++--------- packages/npm-container/versions.json | 4 +- packages/telescope-api/versions.json | 14 ++-- packages/telescope-base/versions.json | 14 ++-- packages/telescope-daily/versions.json | 38 +++++----- packages/telescope-email/versions.json | 4 +- packages/telescope-i18n/versions.json | 14 ++-- packages/telescope-kadira/versions.json | 38 ++++++---- packages/telescope-lib/versions.json | 4 +- .../telescope-module-embedly/versions.json | 18 ++--- packages/telescope-module-share/versions.json | 16 ++--- packages/telescope-newsletter/versions.json | 30 ++++---- .../telescope-notifications/versions.json | 30 ++++---- packages/telescope-rss/versions.json | 14 ++-- packages/telescope-search/versions.json | 30 ++++---- packages/telescope-tags/versions.json | 30 ++++---- packages/telescope-theme-base/versions.json | 14 ++-- packages/telescope-theme-hubble/versions.json | 14 ++-- .../telescope-update-prompt/versions.json | 32 ++++----- 20 files changed, 219 insertions(+), 210 deletions(-) diff --git a/.meteor/release b/.meteor/release index 55ab0ecac..7b32bf7a2 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@0.9.2.2 +METEOR@0.9.3 diff --git a/.meteor/versions b/.meteor/versions index e2d5f2961..4dc4c8c4f 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,41 +1,41 @@ -accounts-base@1.1.0 -accounts-facebook@1.0.0 -accounts-oauth@1.1.0 -accounts-password@1.0.1 -accounts-twitter@1.0.0 -accounts-ui-unstyled@1.1.1 -accounts-ui@1.1.0 -aldeed:autoform@2.0.1 -aldeed:collection2@2.0.0 +accounts-base@1.1.1 +accounts-facebook@1.0.1 +accounts-oauth@1.1.1 +accounts-password@1.0.2 +accounts-twitter@1.0.1 +accounts-ui-unstyled@1.1.2 +accounts-ui@1.1.1 +aldeed:autoform@2.0.2 +aldeed:collection2@2.1.0 aldeed:simple-schema@1.0.3 application-configuration@1.0.2 -autoupdate@1.1.0 +autoupdate@1.1.1 backbone@1.0.0 base64@1.0.0 binary-heap@1.0.0 blaze-tools@1.0.0 -blaze@2.0.0 +blaze@2.0.1 boilerplate-generator@1.0.0 callback-hook@1.0.0 -check@1.0.0 +check@1.0.1 chuangbo:marked@0.3.5 cmather:handlebars-server@0.2.0 coffeescript@1.0.3 ctl-helper@1.0.3 ctl@1.0.1 -ddp@1.0.8 -deps@1.0.3 +ddp@1.0.9 +deps@1.0.4 djedi:sanitize-html@1.3.0 -ejson@1.0.2 -email@1.0.2 +ejson@1.0.3 +email@1.0.3 facebook@1.1.0 fastclick@1.0.0 follower-livedata@1.0.1 geojson-utils@1.0.0 handlebars@1.0.0 -html-tools@1.0.0 +html-tools@1.0.1 htmljs@1.0.1 -http@1.0.5 +http@1.0.6 id-map@1.0.0 iron:core@0.3.4 iron:dynamic-template@0.4.1 @@ -43,23 +43,24 @@ iron:layout@0.4.1 iron:router@0.9.3 jquery@1.0.0 json@1.0.0 -less@1.0.8 -livedata@1.0.9 +less@1.0.9 +livedata@1.0.10 localstorage@1.0.0 logging@1.0.3 matb33:collection-hooks@0.7.6 -meteor-platform@1.1.0 -meteor@1.1.0 +meteor-platform@1.1.1 +meteor@1.1.1 meteorhacks:async@1.0.0 -meteorhacks:fast-render@1.1.0 -meteorhacks:kadira@2.5.0 +meteorhacks:fast-render@1.1.2 +meteorhacks:kadira-binary-deps@1.0.1 +meteorhacks:kadira@2.9.2 meteorhacks:npm@1.2.0 meteorhacks:subs-manager@1.1.0 minifiers@1.1.0 minimongo@1.0.3 mobile-status-bar@1.0.0 -mongo-livedata@1.0.4 -mongo@1.0.5 +mongo-livedata@1.0.5 +mongo@1.0.6 mrt:cookies@0.3.0 mrt:jquery-hotkeys@0.0.1 mrt:mailchimp@0.4.0 @@ -74,24 +75,24 @@ ordered-dict@1.0.0 percolatestudio:synced-cron@0.3.0 rajit:bootstrap3-datepicker@1.3.1 random@1.0.0 -reactive-dict@1.0.2 -reactive-var@1.0.1 +reactive-dict@1.0.3 +reactive-var@1.0.2 reload@1.1.0 retry@1.0.0 routepolicy@1.0.1 sacha:juice@0.1.0 sacha:spin@2.0.4 service-configuration@1.0.1 -session@1.0.1 +session@1.0.2 sha@1.0.0 softwarerero:accounts-t9n@1.0.0 spacebars-compiler@1.0.2 -spacebars@1.0.1 +spacebars@1.0.2 spiderable@1.0.3 splendido:accounts-templates-core@0.9.5 splendido:accounts-templates-unstyled@0.9.5 srp@1.0.0 -standard-app-packages@1.0.1 +standard-app-packages@1.0.2 telescope-api@0.0.0 telescope-base@0.0.0 telescope-daily@0.0.0 @@ -109,13 +110,13 @@ telescope-tags@0.0.0 telescope-theme-base@0.0.0 telescope-theme-hubble@0.0.0 telescope-update-prompt@0.1.0 -templating@1.0.6 +templating@1.0.7 tmeasday:crypto-base@3.1.2 tmeasday:crypto-md5@3.1.2 tracker@1.0.2 twitter@1.1.0 -ui@1.0.2 +ui@1.0.3 underscore@1.0.0 url@1.0.0 webapp-hashing@1.0.0 -webapp@1.1.1 +webapp@1.1.2 diff --git a/packages/npm-container/versions.json b/packages/npm-container/versions.json index 32d357691..b7f39bd42 100644 --- a/packages/npm-container/versions.json +++ b/packages/npm-container/versions.json @@ -2,7 +2,7 @@ "dependencies": [ [ "meteor", - "1.1.0" + "1.1.1" ], [ "underscore", @@ -10,6 +10,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-api/versions.json b/packages/telescope-api/versions.json index 2e112fdd0..cb036c8ae 100644 --- a/packages/telescope-api/versions.json +++ b/packages/telescope-api/versions.json @@ -6,15 +6,15 @@ ], [ "blaze", - "2.0.0" + "2.0.1" ], [ "deps", - "1.0.3" + "1.0.4" ], [ "ejson", - "1.0.2" + "1.0.3" ], [ "geojson-utils", @@ -38,7 +38,7 @@ ], [ "meteor", - "1.1.0" + "1.1.1" ], [ "minimongo", @@ -58,7 +58,7 @@ ], [ "reactive-var", - "1.0.1" + "1.0.2" ], [ "telescope-base", @@ -78,7 +78,7 @@ ], [ "ui", - "1.0.2" + "1.0.3" ], [ "underscore", @@ -86,6 +86,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-base/versions.json b/packages/telescope-base/versions.json index aff95dfc9..05bb562a8 100644 --- a/packages/telescope-base/versions.json +++ b/packages/telescope-base/versions.json @@ -6,15 +6,15 @@ ], [ "blaze", - "2.0.0" + "2.0.1" ], [ "deps", - "1.0.3" + "1.0.4" ], [ "ejson", - "1.0.2" + "1.0.3" ], [ "geojson-utils", @@ -38,7 +38,7 @@ ], [ "meteor", - "1.1.0" + "1.1.1" ], [ "minimongo", @@ -58,7 +58,7 @@ ], [ "reactive-var", - "1.0.1" + "1.0.2" ], [ "telescope-i18n", @@ -74,7 +74,7 @@ ], [ "ui", - "1.0.2" + "1.0.3" ], [ "underscore", @@ -82,6 +82,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-daily/versions.json b/packages/telescope-daily/versions.json index 41b155036..1d67f1cc9 100644 --- a/packages/telescope-daily/versions.json +++ b/packages/telescope-daily/versions.json @@ -2,7 +2,7 @@ "dependencies": [ [ "accounts-base", - "1.1.0" + "1.1.1" ], [ "application-configuration", @@ -18,7 +18,7 @@ ], [ "blaze", - "2.0.0" + "2.0.1" ], [ "blaze-tools", @@ -34,19 +34,19 @@ ], [ "check", - "1.0.0" + "1.0.1" ], [ "ddp", - "1.0.8" + "1.0.9" ], [ "deps", - "1.0.3" + "1.0.4" ], [ "ejson", - "1.0.2" + "1.0.3" ], [ "follower-livedata", @@ -58,7 +58,7 @@ ], [ "html-tools", - "1.0.0" + "1.0.1" ], [ "htmljs", @@ -94,7 +94,7 @@ ], [ "livedata", - "1.0.9" + "1.0.10" ], [ "localstorage", @@ -106,11 +106,11 @@ ], [ "meteor", - "1.1.0" + "1.1.1" ], [ "meteorhacks:fast-render", - "1.1.0" + "1.1.2" ], [ "meteorhacks:subs-manager", @@ -126,11 +126,11 @@ ], [ "mongo", - "1.0.5" + "1.0.6" ], [ "mongo-livedata", - "1.0.4" + "1.0.5" ], [ "observe-sequence", @@ -146,11 +146,11 @@ ], [ "reactive-dict", - "1.0.2" + "1.0.3" ], [ "reactive-var", - "1.0.1" + "1.0.2" ], [ "retry", @@ -166,7 +166,7 @@ ], [ "spacebars", - "1.0.1" + "1.0.2" ], [ "spacebars-compiler", @@ -186,7 +186,7 @@ ], [ "templating", - "1.0.6" + "1.0.7" ], [ "tracker", @@ -194,7 +194,7 @@ ], [ "ui", - "1.0.2" + "1.0.3" ], [ "underscore", @@ -202,7 +202,7 @@ ], [ "webapp", - "1.1.1" + "1.1.2" ], [ "webapp-hashing", @@ -210,6 +210,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-email/versions.json b/packages/telescope-email/versions.json index 648738212..6a5b99156 100644 --- a/packages/telescope-email/versions.json +++ b/packages/telescope-email/versions.json @@ -10,7 +10,7 @@ ], [ "meteor", - "1.1.0" + "1.1.1" ], [ "underscore", @@ -18,6 +18,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-i18n/versions.json b/packages/telescope-i18n/versions.json index 70fc037e0..f9299181d 100644 --- a/packages/telescope-i18n/versions.json +++ b/packages/telescope-i18n/versions.json @@ -6,15 +6,15 @@ ], [ "blaze", - "2.0.0" + "2.0.1" ], [ "deps", - "1.0.3" + "1.0.4" ], [ "ejson", - "1.0.2" + "1.0.3" ], [ "geojson-utils", @@ -38,7 +38,7 @@ ], [ "meteor", - "1.1.0" + "1.1.1" ], [ "minimongo", @@ -58,7 +58,7 @@ ], [ "reactive-var", - "1.0.1" + "1.0.2" ], [ "tracker", @@ -66,7 +66,7 @@ ], [ "ui", - "1.0.2" + "1.0.3" ], [ "underscore", @@ -74,6 +74,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-kadira/versions.json b/packages/telescope-kadira/versions.json index 02bb44c1d..1b81c4897 100644 --- a/packages/telescope-kadira/versions.json +++ b/packages/telescope-kadira/versions.json @@ -14,7 +14,7 @@ ], [ "blaze", - "2.0.0" + "2.0.1" ], [ "callback-hook", @@ -22,23 +22,23 @@ ], [ "check", - "1.0.0" + "1.0.1" ], [ "ddp", - "1.0.8" + "1.0.9" ], [ "deps", - "1.0.3" + "1.0.4" ], [ "ejson", - "1.0.2" + "1.0.3" ], [ "email", - "1.0.2" + "1.0.3" ], [ "follower-livedata", @@ -54,7 +54,7 @@ ], [ "http", - "1.0.5" + "1.0.6" ], [ "id-map", @@ -70,7 +70,11 @@ ], [ "livedata", - "1.0.9" + "1.0.10" + ], + [ + "localstorage", + "1.0.0" ], [ "logging", @@ -78,11 +82,15 @@ ], [ "meteor", - "1.1.0" + "1.1.1" ], [ "meteorhacks:kadira", - "2.5.0" + "2.9.2" + ], + [ + "meteorhacks:kadira-binary-deps", + "1.0.1" ], [ "minimongo", @@ -90,11 +98,11 @@ ], [ "mongo", - "1.0.5" + "1.0.6" ], [ "mongo-livedata", - "1.0.4" + "1.0.5" ], [ "observe-sequence", @@ -110,7 +118,7 @@ ], [ "reactive-var", - "1.0.1" + "1.0.2" ], [ "retry", @@ -134,7 +142,7 @@ ], [ "ui", - "1.0.2" + "1.0.3" ], [ "underscore", @@ -146,6 +154,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-lib/versions.json b/packages/telescope-lib/versions.json index 06691806b..e280ee124 100644 --- a/packages/telescope-lib/versions.json +++ b/packages/telescope-lib/versions.json @@ -6,7 +6,7 @@ ], [ "meteor", - "1.1.0" + "1.1.1" ], [ "underscore", @@ -14,6 +14,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-module-embedly/versions.json b/packages/telescope-module-embedly/versions.json index 9ce88e4d5..8e0261956 100644 --- a/packages/telescope-module-embedly/versions.json +++ b/packages/telescope-module-embedly/versions.json @@ -6,15 +6,15 @@ ], [ "blaze", - "2.0.0" + "2.0.1" ], [ "deps", - "1.0.3" + "1.0.4" ], [ "ejson", - "1.0.2" + "1.0.3" ], [ "geojson-utils", @@ -26,7 +26,7 @@ ], [ "http", - "1.0.5" + "1.0.6" ], [ "id-map", @@ -42,7 +42,7 @@ ], [ "meteor", - "1.1.0" + "1.1.1" ], [ "minimongo", @@ -62,7 +62,7 @@ ], [ "reactive-var", - "1.0.1" + "1.0.2" ], [ "telescope-base", @@ -78,7 +78,7 @@ ], [ "templating", - "1.0.6" + "1.0.7" ], [ "tracker", @@ -86,7 +86,7 @@ ], [ "ui", - "1.0.2" + "1.0.3" ], [ "underscore", @@ -98,6 +98,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-module-share/versions.json b/packages/telescope-module-share/versions.json index 63d8ffc78..2ec1b9a95 100644 --- a/packages/telescope-module-share/versions.json +++ b/packages/telescope-module-share/versions.json @@ -6,15 +6,15 @@ ], [ "blaze", - "2.0.0" + "2.0.1" ], [ "deps", - "1.0.3" + "1.0.4" ], [ "ejson", - "1.0.2" + "1.0.3" ], [ "geojson-utils", @@ -38,7 +38,7 @@ ], [ "meteor", - "1.1.0" + "1.1.1" ], [ "minimongo", @@ -58,7 +58,7 @@ ], [ "reactive-var", - "1.0.1" + "1.0.2" ], [ "telescope-base", @@ -74,7 +74,7 @@ ], [ "templating", - "1.0.6" + "1.0.7" ], [ "tracker", @@ -82,7 +82,7 @@ ], [ "ui", - "1.0.2" + "1.0.3" ], [ "underscore", @@ -90,6 +90,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-newsletter/versions.json b/packages/telescope-newsletter/versions.json index 2a49ba206..878157c6f 100644 --- a/packages/telescope-newsletter/versions.json +++ b/packages/telescope-newsletter/versions.json @@ -18,7 +18,7 @@ ], [ "blaze", - "2.0.0" + "2.0.1" ], [ "blaze-tools", @@ -34,7 +34,7 @@ ], [ "check", - "1.0.0" + "1.0.1" ], [ "cmather:handlebars-server", @@ -42,15 +42,15 @@ ], [ "ddp", - "1.0.8" + "1.0.9" ], [ "deps", - "1.0.3" + "1.0.4" ], [ "ejson", - "1.0.2" + "1.0.3" ], [ "follower-livedata", @@ -66,7 +66,7 @@ ], [ "html-tools", - "1.0.0" + "1.0.1" ], [ "htmljs", @@ -106,7 +106,7 @@ ], [ "meteor", - "1.1.0" + "1.1.1" ], [ "meteorhacks:async", @@ -126,7 +126,7 @@ ], [ "mongo", - "1.0.5" + "1.0.6" ], [ "mrt:cookies", @@ -154,11 +154,11 @@ ], [ "reactive-dict", - "1.0.2" + "1.0.3" ], [ "reactive-var", - "1.0.1" + "1.0.2" ], [ "retry", @@ -170,7 +170,7 @@ ], [ "spacebars", - "1.0.1" + "1.0.2" ], [ "spacebars-compiler", @@ -190,7 +190,7 @@ ], [ "templating", - "1.0.6" + "1.0.7" ], [ "tracker", @@ -198,7 +198,7 @@ ], [ "ui", - "1.0.2" + "1.0.3" ], [ "underscore", @@ -206,7 +206,7 @@ ], [ "webapp", - "1.1.1" + "1.1.2" ], [ "webapp-hashing", @@ -214,6 +214,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-notifications/versions.json b/packages/telescope-notifications/versions.json index 63a555cc7..3b9d0bd5d 100644 --- a/packages/telescope-notifications/versions.json +++ b/packages/telescope-notifications/versions.json @@ -18,7 +18,7 @@ ], [ "blaze", - "2.0.0" + "2.0.1" ], [ "blaze-tools", @@ -34,7 +34,7 @@ ], [ "check", - "1.0.0" + "1.0.1" ], [ "cmather:handlebars-server", @@ -42,15 +42,15 @@ ], [ "ddp", - "1.0.8" + "1.0.9" ], [ "deps", - "1.0.3" + "1.0.4" ], [ "ejson", - "1.0.2" + "1.0.3" ], [ "follower-livedata", @@ -66,7 +66,7 @@ ], [ "html-tools", - "1.0.0" + "1.0.1" ], [ "htmljs", @@ -106,7 +106,7 @@ ], [ "meteor", - "1.1.0" + "1.1.1" ], [ "minifiers", @@ -118,7 +118,7 @@ ], [ "mongo", - "1.0.5" + "1.0.6" ], [ "observe-sequence", @@ -134,11 +134,11 @@ ], [ "reactive-dict", - "1.0.2" + "1.0.3" ], [ "reactive-var", - "1.0.1" + "1.0.2" ], [ "retry", @@ -150,7 +150,7 @@ ], [ "spacebars", - "1.0.1" + "1.0.2" ], [ "spacebars-compiler", @@ -174,7 +174,7 @@ ], [ "templating", - "1.0.6" + "1.0.7" ], [ "tracker", @@ -182,7 +182,7 @@ ], [ "ui", - "1.0.2" + "1.0.3" ], [ "underscore", @@ -190,7 +190,7 @@ ], [ "webapp", - "1.1.1" + "1.1.2" ], [ "webapp-hashing", @@ -198,6 +198,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-rss/versions.json b/packages/telescope-rss/versions.json index 2e112fdd0..cb036c8ae 100644 --- a/packages/telescope-rss/versions.json +++ b/packages/telescope-rss/versions.json @@ -6,15 +6,15 @@ ], [ "blaze", - "2.0.0" + "2.0.1" ], [ "deps", - "1.0.3" + "1.0.4" ], [ "ejson", - "1.0.2" + "1.0.3" ], [ "geojson-utils", @@ -38,7 +38,7 @@ ], [ "meteor", - "1.1.0" + "1.1.1" ], [ "minimongo", @@ -58,7 +58,7 @@ ], [ "reactive-var", - "1.0.1" + "1.0.2" ], [ "telescope-base", @@ -78,7 +78,7 @@ ], [ "ui", - "1.0.2" + "1.0.3" ], [ "underscore", @@ -86,6 +86,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-search/versions.json b/packages/telescope-search/versions.json index 06c6b163c..acc0e04ea 100644 --- a/packages/telescope-search/versions.json +++ b/packages/telescope-search/versions.json @@ -18,7 +18,7 @@ ], [ "blaze", - "2.0.0" + "2.0.1" ], [ "blaze-tools", @@ -34,19 +34,19 @@ ], [ "check", - "1.0.0" + "1.0.1" ], [ "ddp", - "1.0.8" + "1.0.9" ], [ "deps", - "1.0.3" + "1.0.4" ], [ "ejson", - "1.0.2" + "1.0.3" ], [ "follower-livedata", @@ -58,7 +58,7 @@ ], [ "html-tools", - "1.0.0" + "1.0.1" ], [ "htmljs", @@ -98,7 +98,7 @@ ], [ "meteor", - "1.1.0" + "1.1.1" ], [ "minifiers", @@ -110,7 +110,7 @@ ], [ "mongo", - "1.0.5" + "1.0.6" ], [ "observe-sequence", @@ -126,11 +126,11 @@ ], [ "reactive-dict", - "1.0.2" + "1.0.3" ], [ "reactive-var", - "1.0.1" + "1.0.2" ], [ "retry", @@ -142,7 +142,7 @@ ], [ "spacebars", - "1.0.1" + "1.0.2" ], [ "spacebars-compiler", @@ -162,7 +162,7 @@ ], [ "templating", - "1.0.6" + "1.0.7" ], [ "tracker", @@ -170,7 +170,7 @@ ], [ "ui", - "1.0.2" + "1.0.3" ], [ "underscore", @@ -178,7 +178,7 @@ ], [ "webapp", - "1.1.1" + "1.1.2" ], [ "webapp-hashing", @@ -186,6 +186,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-tags/versions.json b/packages/telescope-tags/versions.json index 06c6b163c..acc0e04ea 100644 --- a/packages/telescope-tags/versions.json +++ b/packages/telescope-tags/versions.json @@ -18,7 +18,7 @@ ], [ "blaze", - "2.0.0" + "2.0.1" ], [ "blaze-tools", @@ -34,19 +34,19 @@ ], [ "check", - "1.0.0" + "1.0.1" ], [ "ddp", - "1.0.8" + "1.0.9" ], [ "deps", - "1.0.3" + "1.0.4" ], [ "ejson", - "1.0.2" + "1.0.3" ], [ "follower-livedata", @@ -58,7 +58,7 @@ ], [ "html-tools", - "1.0.0" + "1.0.1" ], [ "htmljs", @@ -98,7 +98,7 @@ ], [ "meteor", - "1.1.0" + "1.1.1" ], [ "minifiers", @@ -110,7 +110,7 @@ ], [ "mongo", - "1.0.5" + "1.0.6" ], [ "observe-sequence", @@ -126,11 +126,11 @@ ], [ "reactive-dict", - "1.0.2" + "1.0.3" ], [ "reactive-var", - "1.0.1" + "1.0.2" ], [ "retry", @@ -142,7 +142,7 @@ ], [ "spacebars", - "1.0.1" + "1.0.2" ], [ "spacebars-compiler", @@ -162,7 +162,7 @@ ], [ "templating", - "1.0.6" + "1.0.7" ], [ "tracker", @@ -170,7 +170,7 @@ ], [ "ui", - "1.0.2" + "1.0.3" ], [ "underscore", @@ -178,7 +178,7 @@ ], [ "webapp", - "1.1.1" + "1.1.2" ], [ "webapp-hashing", @@ -186,6 +186,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-theme-base/versions.json b/packages/telescope-theme-base/versions.json index 2e112fdd0..cb036c8ae 100644 --- a/packages/telescope-theme-base/versions.json +++ b/packages/telescope-theme-base/versions.json @@ -6,15 +6,15 @@ ], [ "blaze", - "2.0.0" + "2.0.1" ], [ "deps", - "1.0.3" + "1.0.4" ], [ "ejson", - "1.0.2" + "1.0.3" ], [ "geojson-utils", @@ -38,7 +38,7 @@ ], [ "meteor", - "1.1.0" + "1.1.1" ], [ "minimongo", @@ -58,7 +58,7 @@ ], [ "reactive-var", - "1.0.1" + "1.0.2" ], [ "telescope-base", @@ -78,7 +78,7 @@ ], [ "ui", - "1.0.2" + "1.0.3" ], [ "underscore", @@ -86,6 +86,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-theme-hubble/versions.json b/packages/telescope-theme-hubble/versions.json index 2e112fdd0..cb036c8ae 100644 --- a/packages/telescope-theme-hubble/versions.json +++ b/packages/telescope-theme-hubble/versions.json @@ -6,15 +6,15 @@ ], [ "blaze", - "2.0.0" + "2.0.1" ], [ "deps", - "1.0.3" + "1.0.4" ], [ "ejson", - "1.0.2" + "1.0.3" ], [ "geojson-utils", @@ -38,7 +38,7 @@ ], [ "meteor", - "1.1.0" + "1.1.1" ], [ "minimongo", @@ -58,7 +58,7 @@ ], [ "reactive-var", - "1.0.1" + "1.0.2" ], [ "telescope-base", @@ -78,7 +78,7 @@ ], [ "ui", - "1.0.2" + "1.0.3" ], [ "underscore", @@ -86,6 +86,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file diff --git a/packages/telescope-update-prompt/versions.json b/packages/telescope-update-prompt/versions.json index c4ee6c901..4c56f735c 100644 --- a/packages/telescope-update-prompt/versions.json +++ b/packages/telescope-update-prompt/versions.json @@ -14,7 +14,7 @@ ], [ "blaze", - "2.0.0" + "2.0.1" ], [ "blaze-tools", @@ -30,19 +30,19 @@ ], [ "check", - "1.0.0" + "1.0.1" ], [ "ddp", - "1.0.8" + "1.0.9" ], [ "deps", - "1.0.3" + "1.0.4" ], [ "ejson", - "1.0.2" + "1.0.3" ], [ "follower-livedata", @@ -54,7 +54,7 @@ ], [ "html-tools", - "1.0.0" + "1.0.1" ], [ "htmljs", @@ -62,7 +62,7 @@ ], [ "http", - "1.0.5" + "1.0.6" ], [ "id-map", @@ -98,7 +98,7 @@ ], [ "meteor", - "1.1.0" + "1.1.1" ], [ "minifiers", @@ -110,7 +110,7 @@ ], [ "mongo", - "1.0.5" + "1.0.6" ], [ "observe-sequence", @@ -126,11 +126,11 @@ ], [ "reactive-dict", - "1.0.2" + "1.0.3" ], [ "reactive-var", - "1.0.1" + "1.0.2" ], [ "retry", @@ -142,7 +142,7 @@ ], [ "spacebars", - "1.0.1" + "1.0.2" ], [ "spacebars-compiler", @@ -162,7 +162,7 @@ ], [ "templating", - "1.0.6" + "1.0.7" ], [ "tracker", @@ -170,7 +170,7 @@ ], [ "ui", - "1.0.2" + "1.0.3" ], [ "underscore", @@ -182,7 +182,7 @@ ], [ "webapp", - "1.1.1" + "1.1.2" ], [ "webapp-hashing", @@ -190,6 +190,6 @@ ] ], "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.31", + "toolVersion": "meteor-tool@1.0.32", "format": "1.0" } \ No newline at end of file From a9574e8bfd926eadc2b493d0bae0204fbb6ee342 Mon Sep 17 00:00:00 2001 From: Delgermurun Date: Fri, 26 Sep 2014 12:32:56 +0800 Subject: [PATCH 23/23] Exclude posts scheduled in the future from the RSS feed --- packages/telescope-rss/lib/server/rss.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/telescope-rss/lib/server/rss.js b/packages/telescope-rss/lib/server/rss.js index 1d2447120..8dac3d353 100644 --- a/packages/telescope-rss/lib/server/rss.js +++ b/packages/telescope-rss/lib/server/rss.js @@ -13,7 +13,11 @@ var getMeta = function() { servePostRSS = function() { var feed = new RSS(getMeta()); - Posts.find({status: STATUS_APPROVED}, {sort: {postedAt: -1}, limit: 20}).forEach(function(post) { + filters = { + status: STATUS_APPROVED, + postedAt: {$lte: new Date()} + }; + Posts.find(filters, {sort: {postedAt: -1}, limit: 20}).forEach(function(post) { var description = !!post.body ? post.body+'

' : ''; feed.item({ title: post.title,