Skip to content

Instantly share code, notes, and snippets.

@fdv
Created January 12, 2014 15:01
Show Gist options
  • Save fdv/8385670 to your computer and use it in GitHub Desktop.
Save fdv/8385670 to your computer and use it in GitHub Desktop.
Big merge is big.
Branch: refs/heads/master
Home: https://github.com/fdv/publify
Commit: 0cd73579fbbe14e6934fd69f4a3ceb727c4c8ab2
https://github.com/fdv/publify/commit/0cd73579fbbe14e6934fd69f4a3ceb727c4c8ab2
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-08 (Fri, 08 Nov 2013)
Changed paths:
R app/assets/images/admin/glyphicons-halflings.png
R app/assets/javascripts/bootstrap-affix.js
R app/assets/javascripts/bootstrap-alert.js
R app/assets/javascripts/bootstrap-button.js
R app/assets/javascripts/bootstrap-carousel.js
R app/assets/javascripts/bootstrap-collapse.js
R app/assets/javascripts/bootstrap-dropdown.js
R app/assets/javascripts/bootstrap-modal.js
R app/assets/javascripts/bootstrap-popover.js
R app/assets/javascripts/bootstrap-scrollspy.js
R app/assets/javascripts/bootstrap-tab.js
R app/assets/javascripts/bootstrap-tooltip.js
R app/assets/javascripts/bootstrap-transition.js
R app/assets/javascripts/bootstrap-typeahead.js
M app/assets/javascripts/bootstrap.js
R app/assets/stylesheets/bootstrap-accounts.css
R app/assets/stylesheets/bootstrap-admin.css
A app/assets/stylesheets/bootstrap-theme.css
A app/assets/stylesheets/bootstrap.css
A app/assets/stylesheets/fonts/glyphicons-halflings-regular.eot
A app/assets/stylesheets/fonts/glyphicons-halflings-regular.svg
A app/assets/stylesheets/fonts/glyphicons-halflings-regular.ttf
A app/assets/stylesheets/fonts/glyphicons-halflings-regular.woff
Log Message:
-----------
Removing old Bootstrap 2.x files. Adding new Bootstrap 3 stylesheets.
Issue #269.
Commit: a18800fbfcd7d364a8c7b6a65311074861a5fa42
https://github.com/fdv/publify/commit/a18800fbfcd7d364a8c7b6a65311074861a5fa42
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-08 (Fri, 08 Nov 2013)
Changed paths:
M app/assets/stylesheets/accounts.css
M app/views/accounts/login.html.erb
M app/views/layouts/accounts.html.erb
Log Message:
-----------
Ports accounts layout to Bootstrap 3.
Ports login form to Bootstrap 3.
Issue #269.
Commit: bd548e4bffd68333767be5dcf574bb25a8fa6493
https://github.com/fdv/publify/commit/bd548e4bffd68333767be5dcf574bb25a8fa6493
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-08 (Fri, 08 Nov 2013)
Changed paths:
M app/assets/stylesheets/publify_admin.css.scss
Log Message:
-----------
Fixes bogus bootstrap call.
Issue #269.
Commit: 23ce34353460cef7ff8df151f707937b29896328
https://github.com/fdv/publify/commit/23ce34353460cef7ff8df151f707937b29896328
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-08 (Fri, 08 Nov 2013)
Changed paths:
M app/views/accounts/recover_password.html.erb
Log Message:
-----------
Moves email recover form to Bootstrap 3.
Issue #269.
Commit: 74dc621f4c16778605f53b301487bd6ed02d22f9
https://github.com/fdv/publify/commit/74dc621f4c16778605f53b301487bd6ed02d22f9
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-08 (Fri, 08 Nov 2013)
Changed paths:
M app/views/accounts/confirm.html.erb
M app/views/accounts/signup.html.erb
Log Message:
-----------
Moves the login form to Bootstrap 3.
Issue #269.
Commit: 32c5b55309ae521112e274d42991c41d09d0ded0
https://github.com/fdv/publify/commit/32c5b55309ae521112e274d42991c41d09d0ded0
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-08 (Fri, 08 Nov 2013)
Changed paths:
M app/assets/stylesheets/administration_structure.css.scss
M app/views/layouts/administration.html.erb
Log Message:
-----------
Makes the default layout visible again (this will change soon but not now)
Issue #269
Commit: 9030e2ce79500f3a60d59a77c51417980166df64
https://github.com/fdv/publify/commit/9030e2ce79500f3a60d59a77c51417980166df64
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-08 (Fri, 08 Nov 2013)
Changed paths:
M app/assets/stylesheets/administration_structure.css.scss
M app/assets/stylesheets/bootstrap.css
Log Message:
-----------
Makes Glyphicons work.
Issue #269
Commit: 4e03f21a284345926613fa0d0f4dc97a22700e7b
https://github.com/fdv/publify/commit/4e03f21a284345926613fa0d0f4dc97a22700e7b
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-08 (Fri, 08 Nov 2013)
Changed paths:
M app/views/admin/dashboard/_comment.html.erb
M app/views/admin/dashboard/_comments.html.erb
M app/views/admin/dashboard/_drafts.html.erb
M app/views/admin/dashboard/_inbound.html.erb
M app/views/admin/dashboard/_welcome.html.erb
M app/views/admin/dashboard/index.html.erb
Log Message:
-----------
Brings the dashboard back to life.
Issue #269.
Commit: d20805873e049c15a4a5dce8fa6fb2dce365ab5f
https://github.com/fdv/publify/commit/d20805873e049c15a4a5dce8fa6fb2dce365ab5f
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-08 (Fri, 08 Nov 2013)
Changed paths:
M app/assets/stylesheets/administration_structure.css.scss
M app/helpers/admin/base_helper.rb
M app/views/admin/content/_article_list.html.erb
M app/views/admin/content/index.html.erb
Log Message:
-----------
Ports the articles listing to Bootstrap 3.
Revamps the filterings.
Issue #269.
Commit: 66173737ee88887ede720a2edcae304f628e8e04
https://github.com/fdv/publify/commit/66173737ee88887ede720a2edcae304f628e8e04
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-08 (Fri, 08 Nov 2013)
Changed paths:
M app/views/admin/content/index.html.erb
Log Message:
-----------
Reindents the html.
Issue #269
Commit: 2b1c555b9b4905d54618177a0cc2775de0962a1e
https://github.com/fdv/publify/commit/2b1c555b9b4905d54618177a0cc2775de0962a1e
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-09 (Sat, 09 Nov 2013)
Changed paths:
M app/helpers/admin/base_helper.rb
M app/helpers/admin/feedback_helper.rb
M app/views/admin/feedback/_button.html.erb
M app/views/admin/feedback/_feedback.html.erb
M app/views/admin/feedback/article.html.erb
M app/views/admin/feedback/edit.html.erb
M app/views/admin/feedback/index.html.erb
M lib/publify_avatar_gravatar/lib/publify_avatar_gravatar.rb
Log Message:
-----------
Moves feedback management to Bootstrap 3.
TODO:
* fix comment state change behavior (see issue #275).
* comment in a ? state should have both spam and ham choices (see issue #276)
Issue #269
Commit: 32083df87f8d5d4a5ddedb360a99821fabe4b6bf
https://github.com/fdv/publify/commit/32083df87f8d5d4a5ddedb360a99821fabe4b6bf
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-09 (Sat, 09 Nov 2013)
Changed paths:
M app/views/admin/feedback/article.html.erb
M app/views/admin/feedback/edit.html.erb
M app/views/admin/feedback/index.html.erb
Log Message:
-----------
Adds icons back on feedback title.
Issue #269.
Commit: b7269dee70dad29bae2b375733b18452b6249626
https://github.com/fdv/publify/commit/b7269dee70dad29bae2b375733b18452b6249626
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-09 (Sat, 09 Nov 2013)
Changed paths:
M app/helpers/admin/base_helper.rb
M app/helpers/admin/categories_helper.rb
M app/views/admin/categories/new.html.erb
Log Message:
-----------
Moves categories to Bootstrap 3. Ensures button with a create / update action are green.
Issue #269.
Commit: 3326907bdfd43423e34728249c1b97042e580bee
https://github.com/fdv/publify/commit/3326907bdfd43423e34728249c1b97042e580bee
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-09 (Sat, 09 Nov 2013)
Changed paths:
M app/helpers/admin/tag_helper.rb
M app/views/admin/tags/new.html.erb
Log Message:
-----------
Ports tags listing to Bootstrap3
Issue #269
Commit: 460e86d484af43fa7b86b0aff1560c7929296993
https://github.com/fdv/publify/commit/460e86d484af43fa7b86b0aff1560c7929296993
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-09 (Sat, 09 Nov 2013)
Changed paths:
M app/views/admin/categories/new.html.erb
M app/views/admin/tags/new.html.erb
Log Message:
-----------
Fixes indent and line break
Issue #269
Commit: 0dff3603d3b0fd44ab1986fda3985b81572b6222
https://github.com/fdv/publify/commit/0dff3603d3b0fd44ab1986fda3985b81572b6222
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-09 (Sat, 09 Nov 2013)
Changed paths:
M app/helpers/admin/post_types_helper.rb
M app/views/admin/post_types/new.html.erb
Log Message:
-----------
Ports articles types to Bootstrap 3.
Issue #269
Commit: f587c0ace4f7679544deb255aab5d8617f50583b
https://github.com/fdv/publify/commit/f587c0ace4f7679544deb255aab5d8617f50583b
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-09 (Sat, 09 Nov 2013)
Changed paths:
M app/helpers/admin/redirects_helper.rb
M app/views/admin/redirects/new.html.erb
Log Message:
-----------
Ports redirect to Bootstrap 3.
Issue #269
Commit: 5512eceb6a315a6392e04dcc0bb2d332980fb7ce
https://github.com/fdv/publify/commit/5512eceb6a315a6392e04dcc0bb2d332980fb7ce
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-09 (Sat, 09 Nov 2013)
Changed paths:
M app/views/admin/notes/new.html.erb
Log Message:
-----------
Ports notes to Bootstrap3
Issue #269.
Commit: 0b4da8d159763d0da82fee5e17c2686e151b82d4
https://github.com/fdv/publify/commit/0b4da8d159763d0da82fee5e17c2686e151b82d4
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-09 (Sat, 09 Nov 2013)
Changed paths:
M app/views/admin/pages/_pages.html.erb
M app/views/admin/pages/index.html.erb
Log Message:
-----------
Moves pages listing to Bootstrap3.
Issue #269.
Commit: d01bc7011ca38fbbd4a5dd4b5fbca21903017dfe
https://github.com/fdv/publify/commit/d01bc7011ca38fbbd4a5dd4b5fbca21903017dfe
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-10 (Sun, 10 Nov 2013)
Changed paths:
M app/views/admin/cache/index.html.erb
Log Message:
-----------
Moves admin/cache to Bootstrap3.
Commit: 97e524105084e9cbc08924f6e3650e6c14334443
https://github.com/fdv/publify/commit/97e524105084e9cbc08924f6e3650e6c14334443
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-10 (Sun, 10 Nov 2013)
Changed paths:
M app/assets/javascripts/quicktags.js
M app/views/admin/pages/_form.html.erb
Log Message:
-----------
Moves pages editor to Bootstrap 3.
Issue #269.
Commit: f157cb42bab6624f4d242238ebf365f434dca3d3
https://github.com/fdv/publify/commit/f157cb42bab6624f4d242238ebf365f434dca3d3
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-11 (Mon, 11 Nov 2013)
Changed paths:
M app/views/admin/content/_categories.html.erb
M app/views/admin/content/_form.html.erb
Log Message:
-----------
Makes articles form useable before we completely change it.
See issue #271 for the specs
Issue #269
Commit: 52bcfbfd9edbd29a98afb42bfd7bb19444d83a0b
https://github.com/fdv/publify/commit/52bcfbfd9edbd29a98afb42bfd7bb19444d83a0b
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-11 (Mon, 11 Nov 2013)
Changed paths:
M app/views/admin/resources/index.html.erb
Log Message:
-----------
Moves resources to Bootstrap 3.
Issue #269
Commit: eed8415c68eb87e8eda635c23327c2ff2b845ae4
https://github.com/fdv/publify/commit/eed8415c68eb87e8eda635c23327c2ff2b845ae4
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-11 (Mon, 11 Nov 2013)
Changed paths:
M app/views/admin/themes/index.html.erb
Log Message:
-----------
Makes the themes list use Bootstrap3.
Issue @269
Commit: 8776b5c1ed52c4173b4f62d151b1c70f7cd5a4d2
https://github.com/fdv/publify/commit/8776b5c1ed52c4173b4f62d151b1c70f7cd5a4d2
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-11 (Mon, 11 Nov 2013)
Changed paths:
M app/views/admin/sidebar/_active.html.erb
M app/views/admin/sidebar/index.html.erb
M lib/sidebar.rb
Log Message:
-----------
Makes sidebar selection use Bootstrap 3.
Some things are broken, we know it, see issue #277, so PR or (please) GTFO.
Issue #269.
Commit: f48b0e7ac544039b88dfd9be7856d9783f21028d
https://github.com/fdv/publify/commit/f48b0e7ac544039b88dfd9be7856d9783f21028d
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-12 (Tue, 12 Nov 2013)
Changed paths:
M app/helpers/admin/base_helper.rb
M app/views/admin/profiles/index.html.erb
M app/views/admin/users/_form.html.erb
M app/views/admin/users/index.html.erb
Log Message:
-----------
Moves users and profile to Bootstrap 3.
Issue #269
Commit: c5b453f1ffd91dbaa446dd3be2beb16e0ac81516
https://github.com/fdv/publify/commit/c5b453f1ffd91dbaa446dd3be2beb16e0ac81516
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-12 (Tue, 12 Nov 2013)
Changed paths:
M app/helpers/application_helper.rb
Log Message:
-----------
Fixes error message display.
Issue #269.
Commit: 4155660f6da54b08f52ebec2f9e40e7392b7db7c
https://github.com/fdv/publify/commit/4155660f6da54b08f52ebec2f9e40e7392b7db7c
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-12 (Tue, 12 Nov 2013)
Changed paths:
M .gitignore
M Gemfile
M app/models/content.rb
M app/views/admin/seo/permalinks.html.erb
M config/application.rb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
A config/timezone.yml.jst
M db/converters/README
A db/converters/blogger.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/it_IT.rb
M lang/nb_NO.rb
M lang/ru_RU.rb
M lib/publify_time.rb
M spec/lib/publify_time_spec.rb
M spec/models/article_spec.rb
Log Message:
-----------
Merge branch 'master' into feature/drop-bootstrap2-for-bootstrap3/269
Commit: f0e30b436ca7da438ded2a8eaa76541eef1b9a5f
https://github.com/fdv/publify/commit/f0e30b436ca7da438ded2a8eaa76541eef1b9a5f
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-12 (Tue, 12 Nov 2013)
Changed paths:
M app/helpers/admin/base_helper.rb
M app/views/admin/settings/display.html.erb
M app/views/admin/settings/feedback.html.erb
M app/views/admin/settings/index.html.erb
M app/views/admin/settings/update_database.html.erb
M app/views/admin/settings/write.html.erb
Log Message:
-----------
Ports the settings part to Bootstrap3.
Drops the "show my email" setting:
* if people want to display their email, they will just... display it somewhere.
* I doubt anyone has ever used it
Issue #269.
Commit: 2d3dc57a2b13798a77da9e02c30d2faf3e8d46b5
https://github.com/fdv/publify/commit/2d3dc57a2b13798a77da9e02c30d2faf3e8d46b5
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-13 (Wed, 13 Nov 2013)
Changed paths:
M app/views/admin/seo/index.html.erb
M app/views/admin/seo/permalinks.html.erb
M app/views/admin/seo/titles.html.erb
Log Message:
-----------
Moves SEO settings to Bootstrap 3.
Issue #269.
Commit: f595fec09591c6307e4d8686bd350bfde3ae0e60
https://github.com/fdv/publify/commit/f595fec09591c6307e4d8686bd350bfde3ae0e60
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-13 (Wed, 13 Nov 2013)
Changed paths:
M app/views/setup/confirm.html.erb
M app/views/setup/index.html.erb
Log Message:
-----------
Ports the setup to Bootstrap 3.
End of issue #269.
Commit: 4d6644d22eefe75a4b9ee32be0276d7cfaa830bc
https://github.com/fdv/publify/commit/4d6644d22eefe75a4b9ee32be0276d7cfaa830bc
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-13 (Wed, 13 Nov 2013)
Changed paths:
M app/views/admin/seo/permalinks.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/it_IT.rb
M lang/nb_NO.rb
M lang/ru_RU.rb
Log Message:
-----------
Merge pull request #281 from fdv/master
Move lang to config for permalinks
Commit: c7eb41b13a5b30be384e74764a71082c9c33fcca
https://github.com/fdv/publify/commit/c7eb41b13a5b30be384e74764a71082c9c33fcca
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-13 (Wed, 13 Nov 2013)
Changed paths:
R app/assets/images/admin/glyphicons-halflings.png
R app/assets/javascripts/bootstrap-affix.js
R app/assets/javascripts/bootstrap-alert.js
R app/assets/javascripts/bootstrap-button.js
R app/assets/javascripts/bootstrap-carousel.js
R app/assets/javascripts/bootstrap-collapse.js
R app/assets/javascripts/bootstrap-dropdown.js
R app/assets/javascripts/bootstrap-modal.js
R app/assets/javascripts/bootstrap-popover.js
R app/assets/javascripts/bootstrap-scrollspy.js
R app/assets/javascripts/bootstrap-tab.js
R app/assets/javascripts/bootstrap-tooltip.js
R app/assets/javascripts/bootstrap-transition.js
R app/assets/javascripts/bootstrap-typeahead.js
M app/assets/javascripts/bootstrap.js
M app/assets/javascripts/quicktags.js
M app/assets/stylesheets/accounts.css
M app/assets/stylesheets/administration_structure.css.scss
R app/assets/stylesheets/bootstrap-accounts.css
R app/assets/stylesheets/bootstrap-admin.css
A app/assets/stylesheets/bootstrap-theme.css
A app/assets/stylesheets/bootstrap.css
A app/assets/stylesheets/fonts/glyphicons-halflings-regular.eot
A app/assets/stylesheets/fonts/glyphicons-halflings-regular.svg
A app/assets/stylesheets/fonts/glyphicons-halflings-regular.ttf
A app/assets/stylesheets/fonts/glyphicons-halflings-regular.woff
M app/assets/stylesheets/publify_admin.css.scss
M app/helpers/admin/base_helper.rb
M app/helpers/admin/categories_helper.rb
M app/helpers/admin/feedback_helper.rb
M app/helpers/admin/post_types_helper.rb
M app/helpers/admin/redirects_helper.rb
M app/helpers/admin/tag_helper.rb
M app/helpers/application_helper.rb
M app/views/accounts/confirm.html.erb
M app/views/accounts/login.html.erb
M app/views/accounts/recover_password.html.erb
M app/views/accounts/signup.html.erb
M app/views/admin/cache/index.html.erb
M app/views/admin/categories/new.html.erb
M app/views/admin/content/_article_list.html.erb
M app/views/admin/content/_categories.html.erb
M app/views/admin/content/_form.html.erb
M app/views/admin/content/index.html.erb
M app/views/admin/dashboard/_comment.html.erb
M app/views/admin/dashboard/_comments.html.erb
M app/views/admin/dashboard/_drafts.html.erb
M app/views/admin/dashboard/_inbound.html.erb
M app/views/admin/dashboard/_welcome.html.erb
M app/views/admin/dashboard/index.html.erb
M app/views/admin/feedback/_button.html.erb
M app/views/admin/feedback/_feedback.html.erb
M app/views/admin/feedback/article.html.erb
M app/views/admin/feedback/edit.html.erb
M app/views/admin/feedback/index.html.erb
M app/views/admin/notes/new.html.erb
M app/views/admin/pages/_form.html.erb
M app/views/admin/pages/_pages.html.erb
M app/views/admin/pages/index.html.erb
M app/views/admin/post_types/new.html.erb
M app/views/admin/profiles/index.html.erb
M app/views/admin/redirects/new.html.erb
M app/views/admin/resources/index.html.erb
M app/views/admin/seo/index.html.erb
M app/views/admin/seo/permalinks.html.erb
M app/views/admin/seo/titles.html.erb
M app/views/admin/settings/display.html.erb
M app/views/admin/settings/feedback.html.erb
M app/views/admin/settings/index.html.erb
M app/views/admin/settings/update_database.html.erb
M app/views/admin/settings/write.html.erb
M app/views/admin/sidebar/_active.html.erb
M app/views/admin/sidebar/index.html.erb
M app/views/admin/tags/new.html.erb
M app/views/admin/themes/index.html.erb
M app/views/admin/users/_form.html.erb
M app/views/admin/users/index.html.erb
M app/views/layouts/accounts.html.erb
M app/views/layouts/administration.html.erb
M app/views/setup/confirm.html.erb
M app/views/setup/index.html.erb
M lib/publify_avatar_gravatar/lib/publify_avatar_gravatar.rb
M lib/sidebar.rb
Log Message:
-----------
Merge branch 'feature/drop-bootstrap2-for-bootstrap3/269' into milestone/publify-8
Commit: 10c4ade36aa69387b5998b3b904ec6fff1f13b61
https://github.com/fdv/publify/commit/10c4ade36aa69387b5998b3b904ec6fff1f13b61
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-13 (Wed, 13 Nov 2013)
Changed paths:
M app/views/admin/categories/new.html.erb
Log Message:
-----------
This should fix the build.
Commit: d40409c2f4eee0c0229d7873d55b67e018d6d7b8
https://github.com/fdv/publify/commit/d40409c2f4eee0c0229d7873d55b67e018d6d7b8
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-13 (Wed, 13 Nov 2013)
Changed paths:
M config/initializers/access_rules.rb
Log Message:
-----------
Merge users with settings.
Removes profile entry as it already exists.
Issue #274.
Commit: fb76d1af41ae9754c0dce84c1ecabcee9cbcd3fe
https://github.com/fdv/publify/commit/fb76d1af41ae9754c0dce84c1ecabcee9cbcd3fe
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-13 (Wed, 13 Nov 2013)
Changed paths:
M app/assets/stylesheets/administration_structure.css.scss
M app/views/layouts/administration.html.erb
Log Message:
-----------
Moves navbar to horizontal.
Issue #270
Commit: a07f1060cd3b330aedfc8c15685dc70cb8a76f2e
https://github.com/fdv/publify/commit/a07f1060cd3b330aedfc8c15685dc70cb8a76f2e
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-13 (Wed, 13 Nov 2013)
Changed paths:
M config/initializers/access_rules.rb
Log Message:
-----------
Merge pull request #282 from fdv/feature/simplify-menus/274
Merge users with settings.
Commit: 1a372e71772e65fed217ffc5f1a011cd3b2ad3a4
https://github.com/fdv/publify/commit/1a372e71772e65fed217ffc5f1a011cd3b2ad3a4
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-13 (Wed, 13 Nov 2013)
Changed paths:
M app/assets/stylesheets/administration_structure.css.scss
M app/views/layouts/administration.html.erb
Log Message:
-----------
Merge pull request #283 from fdv/feature/horizontal-navbar/270
Feature/horizontal navbar/270
Commit: b6649b4fe8c26852b537cd25a52d22c2ca20bc84
https://github.com/fdv/publify/commit/b6649b4fe8c26852b537cd25a52d22c2ca20bc84
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-13 (Wed, 13 Nov 2013)
Changed paths:
M app/helpers/admin/dashboard_helper.rb
M app/helpers/application_helper.rb
Log Message:
-----------
Fixes a bug with profile grants removal
Commit: 051b9b30bb298357cf95ff261d8c1f4073034105
https://github.com/fdv/publify/commit/051b9b30bb298357cf95ff261d8c1f4073034105
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-15 (Fri, 15 Nov 2013)
Changed paths:
M app/views/admin/seo/titles.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Merge branch 'master' into milestone/publify-8
Conflicts:
app/views/admin/seo/titles.html.erb
Commit: 0e37f8fff5bc5fb288c5dc8c1ad97a7b2d789abb
https://github.com/fdv/publify/commit/0e37f8fff5bc5fb288c5dc8c1ad97a7b2d789abb
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-11-15 (Fri, 15 Nov 2013)
Changed paths:
M app/views/admin/settings/index.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
move lang to config for settings
Commit: e7e65448b85d3d08efff967af4dd5013114657f7
https://github.com/fdv/publify/commit/e7e65448b85d3d08efff967af4dd5013114657f7
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-11-15 (Fri, 15 Nov 2013)
Changed paths:
M app/views/admin/settings/update_database.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Move lang to locale for update db settings
Commit: 98eba52fc941c5f04caa31638cedbb704a5d47c6
https://github.com/fdv/publify/commit/98eba52fc941c5f04caa31638cedbb704a5d47c6
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-11-15 (Fri, 15 Nov 2013)
Changed paths:
M app/views/admin/settings/write.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Move lang to locale for write settings
Commit: 2f248efa15ba829c85d9c47b12b3533f62a2f5cd
https://github.com/fdv/publify/commit/2f248efa15ba829c85d9c47b12b3533f62a2f5cd
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-11-16 (Sat, 16 Nov 2013)
Changed paths:
M app/models/note.rb
M spec/models/note_spec.rb
Log Message:
-----------
Fix #284 don't cut word when publish
When publish to twitterm don't cut word.
Commit: bce90ac369d1f546a016cfffdd8be6ddb6c0b7c0
https://github.com/fdv/publify/commit/bce90ac369d1f546a016cfffdd8be6ddb6c0b7c0
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-11-19 (Tue, 19 Nov 2013)
Changed paths:
M lib/tasks/genethumb.rake
Log Message:
-----------
Fix gen thumb task description
Commit: 8b289d03970aeadfccfc9043400eac52eb3b9146
https://github.com/fdv/publify/commit/8b289d03970aeadfccfc9043400eac52eb3b9146
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-22 (Fri, 22 Nov 2013)
Changed paths:
M app/helpers/admin/content_helper.rb
M app/views/admin/content/_form.html.erb
M app/views/admin/content/_images.html.erb
M app/views/admin/pages/_form.html.erb
M app/views/admin/pages/_images.html.erb
M app/views/admin/shared/_macros.html.erb
M app/views/layouts/administration.html.erb
Log Message:
-----------
Fixes editor non AJAX Javascript issues.
Issue #288
Commit: 584170df580a668ee1a6e23e513838ba9a7f7f64
https://github.com/fdv/publify/commit/584170df580a668ee1a6e23e513838ba9a7f7f64
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-23 (Sat, 23 Nov 2013)
Changed paths:
M app/views/admin/content/_form.html.erb
Log Message:
-----------
Post editor:
- moves everything non writing related to a separate modal.
- makes the editor the central part of the screen.
The modal still needs some love to look better, but that's a first step towards a "Medium" ish editor the way I see it.
Issue #272
Commit: 21bc434a661dfc634e77e3875e8b3841004c250a
https://github.com/fdv/publify/commit/21bc434a661dfc634e77e3875e8b3841004c250a
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-23 (Sat, 23 Nov 2013)
Changed paths:
M app/views/admin/pages/_form.html.erb
Log Message:
-----------
- Makes the pages editor settings in a modal.
- Puts the editor at the center of the page.
Issue #272
Commit: 2cf6a68d57cb4fc28163fd1206ab6c2bbee6d054
https://github.com/fdv/publify/commit/2cf6a68d57cb4fc28163fd1206ab6c2bbee6d054
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-23 (Sat, 23 Nov 2013)
Changed paths:
M app/views/admin/content/_form.html.erb
M app/views/admin/pages/_form.html.erb
Log Message:
-----------
Merge pull request #291 from fdv/feature/make-new-publication-options/272
Moves the articles and pages settings into a modal so only the editor is displayed.
Solves issue #272.
Commit: 9c62fcf8c7e55156ccf33e7d919bd25661232060
https://github.com/fdv/publify/commit/9c62fcf8c7e55156ccf33e7d919bd25661232060
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-23 (Sat, 23 Nov 2013)
Changed paths:
M app/apis/meta_weblog/service.rb
M app/apis/meta_weblog/structs.rb
M app/views/admin/content/_form.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
Log Message:
-----------
Drops excerpt on new posts.
Ensure themes can still display them when they exist.
BTW, this feature was soooooo important it did not have a single test.
Issue #290.
Commit: 32edbe48f8857f4235614995c9d65535bf5277a7
https://github.com/fdv/publify/commit/32edbe48f8857f4235614995c9d65535bf5277a7
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-23 (Sat, 23 Nov 2013)
Changed paths:
M app/apis/meta_weblog/service.rb
M app/apis/meta_weblog/structs.rb
M app/views/admin/content/_form.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
Log Message:
-----------
Merge pull request #292 from fdv/feature/drop-excerpt/290
Drops excerpt
Solves #290
Commit: 1f55e7da842320a905e5e187f17e9d25fe7d7adc
https://github.com/fdv/publify/commit/1f55e7da842320a905e5e187f17e9d25fe7d7adc
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-23 (Sat, 23 Nov 2013)
Changed paths:
M app/assets/javascripts/admin_publify.js
M app/assets/javascripts/publify_admin.js
M app/assets/stylesheets/administration_structure.css.scss
M app/controllers/admin/content_controller.rb
M app/views/admin/content/_form.html.erb
A app/views/layouts/editor.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
Log Message:
-----------
First draft for a new editor.
Definitely needs feedback if someone can pull this branch and give me an opinion.
Issue #271
Commit: 8736d9b076c471f0a9c800586cc634bf7cc8bbf0
https://github.com/fdv/publify/commit/8736d9b076c471f0a9c800586cc634bf7cc8bbf0
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-23 (Sat, 23 Nov 2013)
Changed paths:
A app/assets/javascripts/widearea.js
M app/assets/stylesheets/administration_structure.css.scss
A app/assets/stylesheets/widearea.css
M app/views/admin/content/_form.html.erb
M app/views/layouts/editor.html.erb
Log Message:
-----------
Adds widerea support for fullscreen.
Now the HTML definitely needs love.
Issue #271
Commit: 498a2ba7cb7ae990f5525f285502e08e03f6dcdc
https://github.com/fdv/publify/commit/498a2ba7cb7ae990f5525f285502e08e03f6dcdc
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-23 (Sat, 23 Nov 2013)
Changed paths:
M app/assets/javascripts/admin_publify.js
M app/assets/stylesheets/administration_structure.css.scss
M app/views/admin/content/_form.html.erb
Log Message:
-----------
Improves the editor
* Makes the button toolbar less visible
* Makes the editor resize when loading an existing post (still need to understand how to resize it when deleting).
* Make the font smaller, everyone don't use a 30" screen with an insane resolution
TODO :
* Make the quicktag vertical, on the editor side
* Hide the quicktags except when the mouse is over the left or right zone
Commit: dff80a763fd1b21b5cde8f089ce25cfd45b35cf4
https://github.com/fdv/publify/commit/dff80a763fd1b21b5cde8f089ce25cfd45b35cf4
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-23 (Sat, 23 Nov 2013)
Changed paths:
M app/assets/javascripts/admin_publify.js
M app/assets/javascripts/quicktags.js
M app/assets/stylesheets/administration_structure.css.scss
M app/views/admin/content/_form.html.erb
Log Message:
-----------
Even more editor improvement. Love this.
Issue #271
Commit: 49c71ccfd2be47e3f5ed9dd44da2df4f47b70537
https://github.com/fdv/publify/commit/49c71ccfd2be47e3f5ed9dd44da2df4f47b70537
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-23 (Sat, 23 Nov 2013)
Changed paths:
M app/assets/javascripts/admin_publify.js
M app/assets/stylesheets/administration_structure.css.scss
M app/controllers/admin/pages_controller.rb
M app/views/admin/content/_form.html.erb
M app/views/admin/pages/_form.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
Log Message:
-----------
And now it's the pages editor turn.
Issue #271
Commit: c501d0942ccaf689aff6dcfb30c00b0c263a8120
https://github.com/fdv/publify/commit/c501d0942ccaf689aff6dcfb30c00b0c263a8120
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-23 (Sat, 23 Nov 2013)
Changed paths:
M app/assets/javascripts/admin_publify.js
M app/assets/javascripts/publify_admin.js
M app/assets/javascripts/quicktags.js
A app/assets/javascripts/widearea.js
M app/assets/stylesheets/administration_structure.css.scss
A app/assets/stylesheets/widearea.css
M app/controllers/admin/content_controller.rb
M app/controllers/admin/pages_controller.rb
M app/views/admin/content/_form.html.erb
M app/views/admin/pages/_form.html.erb
A app/views/layouts/editor.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
Log Message:
-----------
Merge pull request #293 from fdv/feature/new-editor/271
Adds a new editor, like it
Commit: 8dd79ba2974ad3f91d883f34fc99b8c32f276057
https://github.com/fdv/publify/commit/8dd79ba2974ad3f91d883f34fc99b8c32f276057
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-24 (Sun, 24 Nov 2013)
Changed paths:
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
Log Message:
-----------
Fixes the dashboard that was exploding because the count: 1 needed a specific translation key. Apparently "other" was not enough.
Issue #294.
Commit: ddaca2a2a5fa1e0ae56639d2310f6300c6221aaf
https://github.com/fdv/publify/commit/ddaca2a2a5fa1e0ae56639d2310f6300c6221aaf
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-24 (Sun, 24 Nov 2013)
Changed paths:
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
Log Message:
-----------
Merge pull request #295 from fdv/bug/fix-spam-count/294
Fixes the dashboard that was exploding because the count: 1 needed a spe...
Commit: b649a3e3ae55036216d97a680a911189b359b930
https://github.com/fdv/publify/commit/b649a3e3ae55036216d97a680a911189b359b930
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-24 (Sun, 24 Nov 2013)
Changed paths:
M app/views/layouts/administration.html.erb
Log Message:
-----------
Fixes a bug where the collapsed bottom sidebar would trigger the top menu, making it unusable on a mobile device
Commit: 7e05a9b132eeed8c5914ffd77ee212798f1cffb7
https://github.com/fdv/publify/commit/7e05a9b132eeed8c5914ffd77ee212798f1cffb7
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-24 (Sun, 24 Nov 2013)
Changed paths:
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
Log Message:
-----------
Merge branch 'milestone/publify-8' of github.com:fdv/publify into milestone/publify-8
Commit: 5f78dd964b1f43e07b68b11827bd6ce05f50ae8e
https://github.com/fdv/publify/commit/5f78dd964b1f43e07b68b11827bd6ce05f50ae8e
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-24 (Sun, 24 Nov 2013)
Changed paths:
M app/assets/javascripts/widearea.js
Log Message:
-----------
Fixes an issue when leaving fullscreen mode. We need to resize the textarea or the new text won't appear. This seems to do the trick.
I'd love to have @ook point of view about my crappy Javascript :p
Commit: 8ba62871f436d79d834f4715373bad2c72d0767b
https://github.com/fdv/publify/commit/8ba62871f436d79d834f4715373bad2c72d0767b
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-11-25 (Mon, 25 Nov 2013)
Changed paths:
M app/helpers/admin/content_helper.rb
M app/views/admin/content/_form.html.erb
M app/views/admin/pages/_form.html.erb
Log Message:
-----------
< ook> to speak about publify, I'm still very confused by the "publish" button to save already published post
Now you're not confused anymore (you should have pushed it :p)
Commit: feffc7a74d0341804c62aef66c6e10d07d199cea
https://github.com/fdv/publify/commit/feffc7a74d0341804c62aef66c6e10d07d199cea
Author: Thomas Lecavelier <thomas@lecavelier.name>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M app/controllers/admin/feedback_controller.rb
Log Message:
-----------
Fix crash on non existing bulkop (ie. after a full list of spam marked)
Commit: 610531fb9c4b617e5c1c5b28489d94b8af582b72
https://github.com/fdv/publify/commit/610531fb9c4b617e5c1c5b28489d94b8af582b72
Author: Soon Van <cog@randomecho.com>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M app/views/admin/users/_form.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
Log Message:
-----------
Update profile edit form to use config/locale language files
- Reduce wording in Notification settings section and
makes the section label relate more to the checkboxes
- Contact - Biography should be above all other fields
as that content describes a person more than links do
- Reduce use of "Your" as section help tip already
talks to the current user
Commit: ad85b5b44328bd10da3bc3fd8d0fee4fad53a51f
https://github.com/fdv/publify/commit/ad85b5b44328bd10da3bc3fd8d0fee4fad53a51f
Author: yaf <yannick.francois@free.fr>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M app/views/admin/users/_form.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
Log Message:
-----------
Merge pull request #301 from randomecho/l10n-profile-edit-form
Update profile edit form to use config/locale language files
Commit: e73949a8b05d8fefa63a0ce1745355985c345e5c
https://github.com/fdv/publify/commit/e73949a8b05d8fefa63a0ce1745355985c345e5c
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-12-04 (Wed, 04 Dec 2013)
Changed paths:
M app/helpers/admin/base_helper.rb
M app/views/layouts/administration.html.erb
M config/initializers/access_rules.rb
Log Message:
-----------
Makes the menu bar a little more convenient: since we're using dropdowns, there should not be menus for a single link to click on. This change ensures we only have one link to click to
Issue #296.
Commit: b07a41bb585929bcc57396601ea35d0d02312214
https://github.com/fdv/publify/commit/b07a41bb585929bcc57396601ea35d0d02312214
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-12-04 (Wed, 04 Dec 2013)
Changed paths:
M app/helpers/admin/base_helper.rb
M app/views/layouts/administration.html.erb
M lib/publify_login_system/access_control.rb
Log Message:
-----------
Taking @yaf comments into account: adding menu_name and menu_url methods to access menus.first.name and menus.first.url
Maybe I'm wrong but I kinda disagree with this because it looks too much like getters and getters are the root of all evil.
Issue #296
Commit: 875e04367c953e170925d9e5558b7d037958b268
https://github.com/fdv/publify/commit/875e04367c953e170925d9e5558b7d037958b268
Author: yaf <yannick.francois@free.fr>
Date: 2013-12-04 (Wed, 04 Dec 2013)
Changed paths:
M app/helpers/admin/base_helper.rb
M app/views/layouts/administration.html.erb
M config/initializers/access_rules.rb
M lib/publify_login_system/access_control.rb
Log Message:
-----------
Merge pull request #302 from fdv/feature/feature/improve-menu-bar/296
Makes the menu bar a little more convenient: since we're using dropdowns...
Commit: bfada17a7303787e20b02f8938e7ad8187192439
https://github.com/fdv/publify/commit/bfada17a7303787e20b02f8938e7ad8187192439
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-05 (Thu, 05 Dec 2013)
Changed paths:
M app/views/admin/sidebar/index.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Move lang to locale for sidebar
Commit: 30144acc7126bc1e63e343e96c15229ee8a1e9f5
https://github.com/fdv/publify/commit/30144acc7126bc1e63e343e96c15229ee8a1e9f5
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-06 (Fri, 06 Dec 2013)
Changed paths:
M app/views/admin/settings/feedback.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Move lang to locale for feedback
Commit: e46001706986bf42f426650f36ba0a3ee94e3268
https://github.com/fdv/publify/commit/e46001706986bf42f426650f36ba0a3ee94e3268
Author: Soon Van <cog@randomecho.com>
Date: 2013-12-07 (Sat, 07 Dec 2013)
Changed paths:
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/it.yml
M config/locales/lt.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
Log Message:
-----------
More concise User registration help note explanation [ci skip]
Only updates language translations not already
converted from English and adds a clearer path
to where in admin to add users manually.
Commit: 36b1deaf341f4683017b7429e5a8ea91126da2f6
https://github.com/fdv/publify/commit/36b1deaf341f4683017b7429e5a8ea91126da2f6
Author: Soon Van <cog@randomecho.com>
Date: 2013-12-07 (Sat, 07 Dec 2013)
Changed paths:
M app/views/admin/settings/display.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
Log Message:
-----------
Update Display Settings admin to use config/locale lang files
- Don't need to say Display count settings are "by default"
unless it can be changed elsewhere in admin
- Remove "my" as this should reflect settings for whole blog
- FeedBurner includes capital B
Commit: 5455d0e5bde5fbd3f5fb6152bc857e29fa6a03fb
https://github.com/fdv/publify/commit/5455d0e5bde5fbd3f5fb6152bc857e29fa6a03fb
Author: yaf <yannick.francois@free.fr>
Date: 2013-12-08 (Sun, 08 Dec 2013)
Changed paths:
M app/views/admin/settings/display.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
Log Message:
-----------
Merge pull request #303 from randomecho/admin-settings-explanation
Update Display Settings admin to use config/locale lang files
Commit: c6be05141031f824d925190673f9518df9445e44
https://github.com/fdv/publify/commit/c6be05141031f824d925190673f9518df9445e44
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-08 (Sun, 08 Dec 2013)
Changed paths:
M config/locales/fr.yml
M config/locales/nb-NO.yml
M lang/fr_FR.rb
M lang/nb_NO.rb
Log Message:
-----------
Add lang data to config for display
Commit: 7eedf7e9e21f8d034ac89af50ce838b0f1100647
https://github.com/fdv/publify/commit/7eedf7e9e21f8d034ac89af50ce838b0f1100647
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-08 (Sun, 08 Dec 2013)
Changed paths:
M app/models/note.rb
M spec/models/note_spec.rb
Log Message:
-----------
Add lang data to config for display
Commit: 3d1ee4d83cbf0c7b5bbd4ea4bea4266626902e6e
https://github.com/fdv/publify/commit/3d1ee4d83cbf0c7b5bbd4ea4bea4266626902e6e
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M app/controllers/admin/feedback_controller.rb
M app/models/feedback.rb
M app/views/admin/feedback/index.html.erb
M spec/controllers/admin/feedback_controller_spec.rb
M spec/factories.rb
M spec/models/feedback_spec.rb
Log Message:
-----------
Improve admin feedback code
Commit: 741a1f700c00c5f850fe5ec8e70894e8d8a96e14
https://github.com/fdv/publify/commit/741a1f700c00c5f850fe5ec8e70894e8d8a96e14
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-10 (Tue, 10 Dec 2013)
Changed paths:
R app/views/admin/sidebar/_publish.html.erb
M lang/fr_FR.rb
Log Message:
-----------
Remove unused view and i18n keys
Commit: 0d9fea49465a5110e6d26a1e6a08f5f3450e6bf3
https://github.com/fdv/publify/commit/0d9fea49465a5110e6d26a1e6a08f5f3450e6bf3
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Changed paths:
M app/views/authors/show.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
move lang to locale, author page
Commit: 3849bf1f626f5abec537b56d9a2636e79d067d40
https://github.com/fdv/publify/commit/3849bf1f626f5abec537b56d9a2636e79d067d40
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Changed paths:
M config/locales/fr.yml
M config/locales/ja.yml
M lang/fr_FR.rb
M lang/ja_JP.rb
Log Message:
-----------
Remove month in lang
Commit: e847bc79a5e94a27d797ee4bd5646a5a105e3bf4
https://github.com/fdv/publify/commit/e847bc79a5e94a27d797ee4bd5646a5a105e3bf4
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Changed paths:
M app/views/shared/_atom_item_article.atom.builder
M app/views/shared/_rss_item_article.rss.builder
Log Message:
-----------
Fixes notes RSS and atom title length.
Solved issue #306.
Commit: 6a84a39bdd484ea4ca0e2b9ed0c51cde6f4cda46
https://github.com/fdv/publify/commit/6a84a39bdd484ea4ca0e2b9ed0c51cde6f4cda46
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Changed paths:
R app/views/admin/sidebar/_publish.html.erb
M lang/fr_FR.rb
Log Message:
-----------
Remove unused view and i18n keys
Commit: f87c4a6a05fd7cbe2e451d68a87d52b4e6beb97b
https://github.com/fdv/publify/commit/f87c4a6a05fd7cbe2e451d68a87d52b4e6beb97b
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Changed paths:
M app/views/authors/show.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
move lang to locale, author page
Commit: d04bcf74d17ea0c11f61737ec8937dd1647441c2
https://github.com/fdv/publify/commit/d04bcf74d17ea0c11f61737ec8937dd1647441c2
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Changed paths:
M config/locales/fr.yml
M config/locales/ja.yml
M lang/fr_FR.rb
M lang/ja_JP.rb
Log Message:
-----------
Remove month in lang
Commit: be28609a9e67cb48cdc506d9bad3ed8dadcb4734
https://github.com/fdv/publify/commit/be28609a9e67cb48cdc506d9bad3ed8dadcb4734
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Changed paths:
M app/views/shared/_atom_item_article.atom.builder
M app/views/shared/_rss_item_article.rss.builder
Log Message:
-----------
Fixes notes RSS and atom title length.
Solved issue #306.
Commit: eb9aecf61008154a72cef0a122c4fced0d334bee
https://github.com/fdv/publify/commit/eb9aecf61008154a72cef0a122c4fced0d334bee
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Changed paths:
M app/controllers/admin/feedback_controller.rb
M app/models/feedback.rb
M app/views/admin/feedback/index.html.erb
M spec/controllers/admin/feedback_controller_spec.rb
M spec/factories.rb
M spec/models/feedback_spec.rb
Log Message:
-----------
Merge branch 'refactoring/improve_admin_feedback' into milestone/publify-8
Commit: 777c3a891200c833ec50038c31fcf1354941c2e8
https://github.com/fdv/publify/commit/777c3a891200c833ec50038c31fcf1354941c2e8
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Changed paths:
R app/helpers/admin/resources_helper.rb
M app/views/admin/resources/index.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pt_BR.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
Log Message:
-----------
Move lang to locale from resource helper
Commit: 5c5192c46b7eb101a9001cd2109bae8be77fa64b
https://github.com/fdv/publify/commit/5c5192c46b7eb101a9001cd2109bae8be77fa64b
Author: Soon Van <cog@randomecho.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M app/models/blog.rb
M spec/models/configuration_spec.rb
Log Message:
-----------
Fix typo, grammar on RSS default footer description
Commit: f7ef23627991356ed14560d6e6a52c644584e867
https://github.com/fdv/publify/commit/f7ef23627991356ed14560d6e6a52c644584e867
Author: yaf <yannick.francois@free.fr>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M app/models/blog.rb
M spec/models/configuration_spec.rb
Log Message:
-----------
Merge pull request #308 from randomecho/rss-footer-default-text
Fix typo, grammar on RSS default footer description
Commit: 5b6644cb89e51a9faf053f5c8d69d92b2c1952fe
https://github.com/fdv/publify/commit/5b6644cb89e51a9faf053f5c8d69d92b2c1952fe
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M app/helpers/admin/content_helper.rb
R app/views/admin/content/autosave.js.erb
Log Message:
-----------
Remove autosave.js from view...
This file seems to be unused. even if it use, we must move it to a js
dir
Commit: dc5fbe2b44c4ebfd7ff86425855941a650a04320
https://github.com/fdv/publify/commit/dc5fbe2b44c4ebfd7ff86425855941a650a04320
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M lang/fr_FR.rb
Log Message:
-----------
Remove unused i18n keys
Commit: f8a798801b7d07f989dff9e60ff47f3d3399b13f
https://github.com/fdv/publify/commit/f8a798801b7d07f989dff9e60ff47f3d3399b13f
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-12-14 (Sat, 14 Dec 2013)
Changed paths:
M Gemfile
M app/models/note.rb
Log Message:
-----------
Fixes Twitter POSSE.
Issue #310
Commit: 7ba13eab3d8ca4d7748d5339c9807fba4869a53b
https://github.com/fdv/publify/commit/7ba13eab3d8ca4d7748d5339c9807fba4869a53b
Author: Soon Van <cog@randomecho.com>
Date: 2013-12-19 (Thu, 19 Dec 2013)
Changed paths:
M app/views/admin/tags/new.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
Log Message:
-----------
Move lang to locale for Admin Tags section
Commit: 9015243429e69349d0ae4ee906c6df098cf3bc5e
https://github.com/fdv/publify/commit/9015243429e69349d0ae4ee906c6df098cf3bc5e
Author: yaf <yannick.francois@free.fr>
Date: 2013-12-19 (Thu, 19 Dec 2013)
Changed paths:
M app/views/admin/tags/new.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
Log Message:
-----------
Merge pull request #313 from randomecho/tags-locale
Move lang to locale for Admin Tags section
Commit: 008a197591c17a14266f5dfe924ea9bd8930830f
https://github.com/fdv/publify/commit/008a197591c17a14266f5dfe924ea9bd8930830f
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-19 (Thu, 19 Dec 2013)
Changed paths:
M app/controllers/admin/feedback_controller.rb
M app/views/admin/feedback/_button.html.erb
R app/views/admin/feedback/article.html.erb
M app/views/admin/feedback/index.html.erb
M lang/fr_FR.rb
M spec/controllers/admin/feedback_controller_spec.rb
Log Message:
-----------
Feedback article seems to be unused...
Commit: daaa20f521b2307a3c105027e4d11a31b4aa0a75
https://github.com/fdv/publify/commit/daaa20f521b2307a3c105027e4d11a31b4aa0a75
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-19 (Thu, 19 Dec 2013)
Changed paths:
M lang/fr_FR.rb
Log Message:
-----------
Remove unused i18n keys
Commit: bc8d327922addc1ddf3c093b63cd64d270b99c5a
https://github.com/fdv/publify/commit/bc8d327922addc1ddf3c093b63cd64d270b99c5a
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-19 (Thu, 19 Dec 2013)
Changed paths:
M app/views/setup/confirm.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_TW.rb
Log Message:
-----------
Moe lang to config for confirm setup page
Commit: f130242b612a83a40458d57d1594898c23123fb7
https://github.com/fdv/publify/commit/f130242b612a83a40458d57d1594898c23123fb7
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-19 (Thu, 19 Dec 2013)
Changed paths:
M app/controllers/admin/feedback_controller.rb
M app/views/admin/feedback/_button.html.erb
A app/views/admin/feedback/article.html.erb
M app/views/admin/feedback/index.html.erb
M lang/fr_FR.rb
M spec/controllers/admin/feedback_controller_spec.rb
Log Message:
-----------
Revert "Feedback article seems to be unused..."
This reverts commit 008a197591c17a14266f5dfe924ea9bd8930830f.
Commit: c662670a311a1e3521515badaba521f58b6b7d37
https://github.com/fdv/publify/commit/c662670a311a1e3521515badaba521f58b6b7d37
Author: Soon Van <cog@randomecho.com>
Date: 2013-12-20 (Fri, 20 Dec 2013)
Changed paths:
M app/controllers/admin/tags_controller.rb
M app/views/layouts/administration.html.erb
A config/locales/gflash.da.yml
A config/locales/gflash.de.yml
M config/locales/gflash.en.yml
A config/locales/gflash.es-MX.yml
A config/locales/gflash.fr.yml
A config/locales/gflash.he-IL.yml
A config/locales/gflash.it.yml
A config/locales/gflash.ja.yml
A config/locales/gflash.lt.yml
A config/locales/gflash.nb-NO.yml
A config/locales/gflash.nl.yml
A config/locales/gflash.pl.yml
A config/locales/gflash.pt-BR.yml
A config/locales/gflash.ro.yml
A config/locales/gflash.ru.yml
A config/locales/gflash.zh-CN.yml
A config/locales/gflash.zh-TW.yml
Log Message:
-----------
Move flash to gflash in admin tags controller
gritter gem is already mentioned in Gemfile, so let's start
making use of it and move the flash into gflash.
Uses available existing translations for
"Tag was successfully updated"
Commit: 3a5d9fa53561682f35dda8a4f1b22855c3c83431
https://github.com/fdv/publify/commit/3a5d9fa53561682f35dda8a4f1b22855c3c83431
Author: yaf <yannick.francois@free.fr>
Date: 2013-12-21 (Sat, 21 Dec 2013)
Changed paths:
M app/controllers/admin/tags_controller.rb
M app/views/layouts/administration.html.erb
A config/locales/gflash.da.yml
A config/locales/gflash.de.yml
M config/locales/gflash.en.yml
A config/locales/gflash.es-MX.yml
A config/locales/gflash.fr.yml
A config/locales/gflash.he-IL.yml
A config/locales/gflash.it.yml
A config/locales/gflash.ja.yml
A config/locales/gflash.lt.yml
A config/locales/gflash.nb-NO.yml
A config/locales/gflash.nl.yml
A config/locales/gflash.pl.yml
A config/locales/gflash.pt-BR.yml
A config/locales/gflash.ro.yml
A config/locales/gflash.ru.yml
A config/locales/gflash.zh-CN.yml
A config/locales/gflash.zh-TW.yml
Log Message:
-----------
Merge pull request #314 from randomecho/gflash-tag-admin
Move flash to gflash in admin tags controller
Commit: 5415357f0d957255a5c8e0e411904dc7f3395095
https://github.com/fdv/publify/commit/5415357f0d957255a5c8e0e411904dc7f3395095
Author: Soon Van <cog@randomecho.com>
Date: 2013-12-21 (Sat, 21 Dec 2013)
Changed paths:
M app/controllers/admin/users_controller.rb
M config/locales/gflash.da.yml
M config/locales/gflash.de.yml
M config/locales/gflash.en.yml
M config/locales/gflash.es-MX.yml
M config/locales/gflash.fr.yml
M config/locales/gflash.he-IL.yml
M config/locales/gflash.it.yml
M config/locales/gflash.ja.yml
M config/locales/gflash.lt.yml
M config/locales/gflash.nb-NO.yml
M config/locales/gflash.nl.yml
M config/locales/gflash.pl.yml
M config/locales/gflash.pt-BR.yml
M config/locales/gflash.ro.yml
M config/locales/gflash.ru.yml
M config/locales/gflash.zh-CN.yml
M config/locales/gflash.zh-TW.yml
Log Message:
-----------
Use gflash in admin users controller
Copies found translations where possible
Commit: 9b6c46c4101cb66fdecb52999bac3399e21dacc4
https://github.com/fdv/publify/commit/9b6c46c4101cb66fdecb52999bac3399e21dacc4
Author: yaf <yannick.francois@free.fr>
Date: 2013-12-21 (Sat, 21 Dec 2013)
Changed paths:
M app/controllers/admin/users_controller.rb
M config/locales/gflash.da.yml
M config/locales/gflash.de.yml
M config/locales/gflash.en.yml
M config/locales/gflash.es-MX.yml
M config/locales/gflash.fr.yml
M config/locales/gflash.he-IL.yml
M config/locales/gflash.it.yml
M config/locales/gflash.ja.yml
M config/locales/gflash.lt.yml
M config/locales/gflash.nb-NO.yml
M config/locales/gflash.nl.yml
M config/locales/gflash.pl.yml
M config/locales/gflash.pt-BR.yml
M config/locales/gflash.ro.yml
M config/locales/gflash.ru.yml
M config/locales/gflash.zh-CN.yml
M config/locales/gflash.zh-TW.yml
Log Message:
-----------
Merge pull request #315 from randomecho/gflash-admin-users
Use gflash in admin users controller
Commit: ec0012223bfc1add7698a8c5297bea53b2716e02
https://github.com/fdv/publify/commit/ec0012223bfc1add7698a8c5297bea53b2716e02
Author: Soon Van <cog@randomecho.com>
Date: 2013-12-22 (Sun, 22 Dec 2013)
Changed paths:
M app/controllers/admin/themes_controller.rb
M config/locales/gflash.da.yml
M config/locales/gflash.de.yml
M config/locales/gflash.en.yml
M config/locales/gflash.es-MX.yml
M config/locales/gflash.fr.yml
M config/locales/gflash.he-IL.yml
M config/locales/gflash.it.yml
M config/locales/gflash.ja.yml
M config/locales/gflash.lt.yml
M config/locales/gflash.nb-NO.yml
M config/locales/gflash.nl.yml
M config/locales/gflash.pl.yml
M config/locales/gflash.pt-BR.yml
M config/locales/gflash.ro.yml
M config/locales/gflash.ru.yml
M config/locales/gflash.zh-CN.yml
M config/locales/gflash.zh-TW.yml
M lang/fr_FR.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pt_BR.rb
M lang/zh_CN.rb
Log Message:
-----------
Move to gflash in admin themes controller
Moves over lang keys from available translations.
Removed "successfully" from message in English and other
languages to make use of "Success" heading in popup.
Commit: 1e18e16f65d6db1770daa2c56961e5f3b4206550
https://github.com/fdv/publify/commit/1e18e16f65d6db1770daa2c56961e5f3b4206550
Author: Soon Van <cog@randomecho.com>
Date: 2013-12-22 (Sun, 22 Dec 2013)
Changed paths:
M app/controllers/admin/cache_controller.rb
M config/locales/gflash.da.yml
M config/locales/gflash.de.yml
M config/locales/gflash.en.yml
M config/locales/gflash.es-MX.yml
M config/locales/gflash.fr.yml
M config/locales/gflash.he-IL.yml
M config/locales/gflash.it.yml
M config/locales/gflash.ja.yml
M config/locales/gflash.lt.yml
M config/locales/gflash.nb-NO.yml
M config/locales/gflash.nl.yml
M config/locales/gflash.pl.yml
M config/locales/gflash.pt-BR.yml
M config/locales/gflash.ro.yml
M config/locales/gflash.ru.yml
M config/locales/gflash.zh-CN.yml
M config/locales/gflash.zh-TW.yml
M lang/fr_FR.rb
M lang/nb_NO.rb
Log Message:
-----------
Use gflash in admin cache controller
Removed "Oops, something went wrong." as "Error" heading
and icon should be enough to tell user something went wrong.
Commit: e2a41449172d832fd9a0ed794a18eb82386bab27
https://github.com/fdv/publify/commit/e2a41449172d832fd9a0ed794a18eb82386bab27
Author: Soon Van <cog@randomecho.com>
Date: 2013-12-22 (Sun, 22 Dec 2013)
Changed paths:
M app/controllers/admin/profiles_controller.rb
M config/locales/gflash.da.yml
M config/locales/gflash.de.yml
M config/locales/gflash.en.yml
M config/locales/gflash.es-MX.yml
M config/locales/gflash.fr.yml
M config/locales/gflash.he-IL.yml
M config/locales/gflash.it.yml
M config/locales/gflash.ja.yml
M config/locales/gflash.lt.yml
M config/locales/gflash.nb-NO.yml
M config/locales/gflash.nl.yml
M config/locales/gflash.pl.yml
M config/locales/gflash.pt-BR.yml
M config/locales/gflash.ro.yml
M config/locales/gflash.ru.yml
M config/locales/gflash.zh-CN.yml
M config/locales/gflash.zh-TW.yml
M lang/fr_FR.rb
M lang/ja_JP.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pt_BR.rb
M lang/zh_CN.rb
Log Message:
-----------
Move to gflash in admin profiles controller
Moves over lang keys from available translations.
Commit: 864b6bb248a90877eb565172a35b9b021f246b0c
https://github.com/fdv/publify/commit/864b6bb248a90877eb565172a35b9b021f246b0c
Author: Soon Van <cog@randomecho.com>
Date: 2013-12-22 (Sun, 22 Dec 2013)
Changed paths:
M app/controllers/admin/pages_controller.rb
M config/locales/gflash.da.yml
M config/locales/gflash.de.yml
M config/locales/gflash.en.yml
M config/locales/gflash.es-MX.yml
M config/locales/gflash.fr.yml
M config/locales/gflash.he-IL.yml
M config/locales/gflash.it.yml
M config/locales/gflash.ja.yml
M config/locales/gflash.lt.yml
M config/locales/gflash.nb-NO.yml
M config/locales/gflash.nl.yml
M config/locales/gflash.pl.yml
M config/locales/gflash.pt-BR.yml
M config/locales/gflash.ro.yml
M config/locales/gflash.ru.yml
M config/locales/gflash.zh-CN.yml
M config/locales/gflash.zh-TW.yml
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/ja_JP.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pt_BR.rb
M lang/zh_CN.rb
Log Message:
-----------
Move to gflash in admin pages controller
English success message updated to be shorter to make use of
the popup heading, but other languages with translations left as-is.
Commit: 369ecc3b8d0f959c4c5eda24585ceef0f95bbeb1
https://github.com/fdv/publify/commit/369ecc3b8d0f959c4c5eda24585ceef0f95bbeb1
Author: Soon Van <cog@randomecho.com>
Date: 2013-12-22 (Sun, 22 Dec 2013)
Changed paths:
M app/controllers/admin/resources_controller.rb
M config/locales/gflash.da.yml
M config/locales/gflash.de.yml
M config/locales/gflash.en.yml
M config/locales/gflash.es-MX.yml
M config/locales/gflash.fr.yml
M config/locales/gflash.he-IL.yml
M config/locales/gflash.it.yml
M config/locales/gflash.ja.yml
M config/locales/gflash.lt.yml
M config/locales/gflash.nb-NO.yml
M config/locales/gflash.nl.yml
M config/locales/gflash.pl.yml
M config/locales/gflash.pt-BR.yml
M config/locales/gflash.ro.yml
M config/locales/gflash.ru.yml
M config/locales/gflash.zh-CN.yml
M config/locales/gflash.zh-TW.yml
Log Message:
-----------
Move to gflash in admin resources controller
Adds new notice to when file is deleted.
Adds check and message to make sure user is uploading non-empty file.
Commit: 37e34babd2bffc08aaf883008dddfa0a1b416da9
https://github.com/fdv/publify/commit/37e34babd2bffc08aaf883008dddfa0a1b416da9
Author: Soon Van <cog@randomecho.com>
Date: 2013-12-22 (Sun, 22 Dec 2013)
Changed paths:
M spec/controllers/admin/pages_controller_spec.rb
Log Message:
-----------
Fix spec for gflash on new page creation in admin
Commit: 19a47ca5b51527008d1970f150e6bfbf31733dfe
https://github.com/fdv/publify/commit/19a47ca5b51527008d1970f150e6bfbf31733dfe
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-23 (Mon, 23 Dec 2013)
Changed paths:
M spec/controllers/admin/pages_controller_spec.rb
Log Message:
-----------
Fix specs, assert not nil
Commit: 6f3e44a1f8081eeccf02e1be028f76451ddcdf7a
https://github.com/fdv/publify/commit/6f3e44a1f8081eeccf02e1be028f76451ddcdf7a
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-23 (Mon, 23 Dec 2013)
Changed paths:
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
Log Message:
-----------
Remove unused keys
Commit: 1ab2e651e853d01763827854bf14f6d90cffce66
https://github.com/fdv/publify/commit/1ab2e651e853d01763827854bf14f6d90cffce66
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-23 (Mon, 23 Dec 2013)
Changed paths:
M Gemfile
M app/controllers/accounts_controller.rb
M app/views/layouts/accounts.html.erb
M config/locales/gflash.da.yml
M config/locales/gflash.de.yml
M config/locales/gflash.en.yml
M config/locales/gflash.es-MX.yml
M config/locales/gflash.fr.yml
M config/locales/gflash.he-IL.yml
M config/locales/gflash.it.yml
M config/locales/gflash.ja.yml
M config/locales/gflash.lt.yml
M config/locales/gflash.nb-NO.yml
M config/locales/gflash.nl.yml
M config/locales/gflash.pl.yml
M config/locales/gflash.pt-BR.yml
M config/locales/gflash.ro.yml
M config/locales/gflash.ru.yml
M config/locales/gflash.zh-CN.yml
M config/locales/gflash.zh-TW.yml
Log Message:
-----------
Move from lang to locales accounts controller
Commit: 985ca4c93ffae52f55f7ac06555d32544c985e6e
https://github.com/fdv/publify/commit/985ca4c93ffae52f55f7ac06555d32544c985e6e
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-23 (Mon, 23 Dec 2013)
Changed paths:
M app/controllers/accounts_controller.rb
M app/controllers/admin/pages_controller.rb
M spec/controllers/accounts_controller_spec.rb
M spec/controllers/admin/pages_controller_spec.rb
Log Message:
-----------
Fix spec and clean some spec files
Commit: 1c372cf2c74c913bfbd32d1a6b6ca544e4d0f1e5
https://github.com/fdv/publify/commit/1c372cf2c74c913bfbd32d1a6b6ca544e4d0f1e5
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-23 (Mon, 23 Dec 2013)
Changed paths:
M lang/fr_FR.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pt_BR.rb
M lang/zh_CN.rb
Log Message:
-----------
Remove unused keys
Commit: b6c0b411c1281c5c07f6e9d8c03e494530f02cd0
https://github.com/fdv/publify/commit/b6c0b411c1281c5c07f6e9d8c03e494530f02cd0
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-23 (Mon, 23 Dec 2013)
Changed paths:
M app/controllers/admin/base_controller.rb
M app/controllers/admin/seo_controller.rb
M app/controllers/admin/settings_controller.rb
M config/locales/gflash.da.yml
M config/locales/gflash.de.yml
M config/locales/gflash.en.yml
M config/locales/gflash.es-MX.yml
M config/locales/gflash.fr.yml
M config/locales/gflash.he-IL.yml
M config/locales/gflash.it.yml
M config/locales/gflash.ja.yml
M config/locales/gflash.lt.yml
M config/locales/gflash.nb-NO.yml
M config/locales/gflash.nl.yml
M config/locales/gflash.pl.yml
M config/locales/gflash.pt-BR.yml
M config/locales/gflash.ro.yml
M config/locales/gflash.ru.yml
M config/locales/gflash.zh-CN.yml
M config/locales/gflash.zh-TW.yml
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Move lang to locales for admin base flash
Commit: 5bf2f20934c7ada52cd2b744b217a3dc4f3f2ff2
https://github.com/fdv/publify/commit/5bf2f20934c7ada52cd2b744b217a3dc4f3f2ff2
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-23 (Mon, 23 Dec 2013)
Changed paths:
M app/controllers/admin/content_controller.rb
M config/locales/gflash.da.yml
M config/locales/gflash.de.yml
M config/locales/gflash.en.yml
M config/locales/gflash.es-MX.yml
M config/locales/gflash.fr.yml
M config/locales/gflash.he-IL.yml
M config/locales/gflash.it.yml
M config/locales/gflash.ja.yml
M config/locales/gflash.lt.yml
M config/locales/gflash.nb-NO.yml
M config/locales/gflash.nl.yml
M config/locales/gflash.pl.yml
M config/locales/gflash.pt-BR.yml
M config/locales/gflash.ro.yml
M config/locales/gflash.ru.yml
M config/locales/gflash.zh-CN.yml
M config/locales/gflash.zh-TW.yml
M lang/da_DK.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pt_BR.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Move lang to locale for content controller
Commit: bcf75e7c7d17c16a5a2789eea37b8dc2a8afcf70
https://github.com/fdv/publify/commit/bcf75e7c7d17c16a5a2789eea37b8dc2a8afcf70
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-23 (Mon, 23 Dec 2013)
Changed paths:
M app/controllers/admin/base_controller.rb
M lang/fr_FR.rb
Log Message:
-----------
Remove translation on this token error/warning... Is it ok for you ?
Commit: 085e5856819f9bb2ffa886166080d705bb6c1334
https://github.com/fdv/publify/commit/085e5856819f9bb2ffa886166080d705bb6c1334
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-23 (Mon, 23 Dec 2013)
Changed paths:
M app/controllers/admin/dashboard_controller.rb
M config/locales/gflash.da.yml
M config/locales/gflash.de.yml
M config/locales/gflash.en.yml
M config/locales/gflash.es-MX.yml
M config/locales/gflash.fr.yml
M config/locales/gflash.he-IL.yml
M config/locales/gflash.it.yml
M config/locales/gflash.ja.yml
M config/locales/gflash.lt.yml
M config/locales/gflash.nb-NO.yml
M config/locales/gflash.nl.yml
M config/locales/gflash.pl.yml
M config/locales/gflash.pt-BR.yml
M config/locales/gflash.ro.yml
M config/locales/gflash.ru.yml
M config/locales/gflash.zh-CN.yml
M config/locales/gflash.zh-TW.yml
M lang/fr_FR.rb
M lang/nb_NO.rb
Log Message:
-----------
Move from lang to locales for dashboard publify version messages
Commit: 38da485a3fee0a73e3c81ec4196a1ab59907cef8
https://github.com/fdv/publify/commit/38da485a3fee0a73e3c81ec4196a1ab59907cef8
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-26 (Thu, 26 Dec 2013)
Changed paths:
M app/controllers/admin/feedback_controller.rb
M app/views/admin/feedback/edit.html.erb
M app/views/admin/feedback/index.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/gflash.da.yml
M config/locales/gflash.de.yml
M config/locales/gflash.en.yml
M config/locales/gflash.es-MX.yml
M config/locales/gflash.fr.yml
M config/locales/gflash.he-IL.yml
M config/locales/gflash.it.yml
M config/locales/gflash.ja.yml
M config/locales/gflash.lt.yml
M config/locales/gflash.nb-NO.yml
M config/locales/gflash.nl.yml
M config/locales/gflash.pl.yml
M config/locales/gflash.pt-BR.yml
M config/locales/gflash.ro.yml
M config/locales/gflash.ru.yml
M config/locales/gflash.zh-CN.yml
M config/locales/gflash.zh-TW.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
Log Message:
-----------
Move lang to locale for admin feedback controller
Commit: fcfe4dd534206fd436304a5ac8a8cef3500aba3a
https://github.com/fdv/publify/commit/fcfe4dd534206fd436304a5ac8a8cef3500aba3a
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-26 (Thu, 26 Dec 2013)
Changed paths:
M app/controllers/admin/redirects_controller.rb
M config/locales/gflash.da.yml
M config/locales/gflash.de.yml
M config/locales/gflash.en.yml
M config/locales/gflash.es-MX.yml
M config/locales/gflash.fr.yml
M config/locales/gflash.he-IL.yml
M config/locales/gflash.it.yml
M config/locales/gflash.ja.yml
M config/locales/gflash.lt.yml
M config/locales/gflash.nb-NO.yml
M config/locales/gflash.nl.yml
M config/locales/gflash.pl.yml
M config/locales/gflash.pt-BR.yml
M config/locales/gflash.ro.yml
M config/locales/gflash.ru.yml
M config/locales/gflash.zh-CN.yml
M config/locales/gflash.zh-TW.yml
M lang/fr_FR.rb
M lang/nb_NO.rb
Log Message:
-----------
Move lang to locale for redirect controller
Commit: adec716893b49a3a4133bae9e2c849d3edc422f9
https://github.com/fdv/publify/commit/adec716893b49a3a4133bae9e2c849d3edc422f9
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-26 (Thu, 26 Dec 2013)
Changed paths:
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Remove some unused keys
Commit: 3774618920cd9cb811f531523c00bc603d134107
https://github.com/fdv/publify/commit/3774618920cd9cb811f531523c00bc603d134107
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-27 (Fri, 27 Dec 2013)
Changed paths:
M app/views/admin/users/index.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Move lang to locale for user index
Commit: eda4dbc2f66d48499aa6b26d19a4d9db3c817dcc
https://github.com/fdv/publify/commit/eda4dbc2f66d48499aa6b26d19a4d9db3c817dcc
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-27 (Fri, 27 Dec 2013)
Changed paths:
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Remove some unused keys
Commit: 3079767a237b585e11e88b8b2dcdf293f8f54185
https://github.com/fdv/publify/commit/3079767a237b585e11e88b8b2dcdf293f8f54185
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-28 (Sat, 28 Dec 2013)
Changed paths:
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Remove more unused i18n keys
Commit: b226716a6eae080eaabe59ff665da5a1f980e284
https://github.com/fdv/publify/commit/b226716a6eae080eaabe59ff665da5a1f980e284
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-28 (Sat, 28 Dec 2013)
Changed paths:
M app/controllers/accounts_controller.rb
M app/views/accounts/login.html.erb
M app/views/accounts/recover_password.html.erb
M app/views/accounts/signup.html.erb
M app/views/layouts/accounts.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/fr_FR.rb
M lang/ja_JP.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pt_BR.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
Log Message:
-----------
Move lang to locales and change title
Commit: 065c56e36fa1446f2bd0fb232a735a166894cd22
https://github.com/fdv/publify/commit/065c56e36fa1446f2bd0fb232a735a166894cd22
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-29 (Sun, 29 Dec 2013)
Changed paths:
M app/helpers/admin/base_helper.rb
M app/views/admin/content/_article_list.html.erb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pt_BR.rb
M lang/zh_CN.rb
Log Message:
-----------
remove preview keys and clean helper
Commit: fa1d4e779c5e8b3591fbc9f1699bc58f599205bc
https://github.com/fdv/publify/commit/fa1d4e779c5e8b3591fbc9f1699bc58f599205bc
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-29 (Sun, 29 Dec 2013)
Changed paths:
M app/controllers/admin/settings_controller.rb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
M spec/controllers/admin/settings_controller_spec.rb
Log Message:
-----------
Fix explainations for cache and remove complete key
Commit: 7cc49ad3d19b4fc10140b018e5fa1a6b9d0fa8ed
https://github.com/fdv/publify/commit/7cc49ad3d19b4fc10140b018e5fa1a6b9d0fa8ed
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-29 (Sun, 29 Dec 2013)
Changed paths:
M app/controllers/admin/sidebar_controller.rb
M config/locales/gflash.da.yml
M config/locales/gflash.de.yml
M config/locales/gflash.en.yml
M config/locales/gflash.es-MX.yml
M config/locales/gflash.fr.yml
M config/locales/gflash.he-IL.yml
M config/locales/gflash.it.yml
M config/locales/gflash.ja.yml
M config/locales/gflash.lt.yml
M config/locales/gflash.nb-NO.yml
M config/locales/gflash.nl.yml
M config/locales/gflash.pl.yml
M config/locales/gflash.pt-BR.yml
M config/locales/gflash.ro.yml
M config/locales/gflash.ru.yml
M config/locales/gflash.zh-CN.yml
M config/locales/gflash.zh-TW.yml
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pt_BR.rb
M lang/zh_CN.rb
Log Message:
-----------
Move lang to locales
Commit: 796abf02d0d31f11f45e98adfe667dbf7a4a9fa5
https://github.com/fdv/publify/commit/796abf02d0d31f11f45e98adfe667dbf7a4a9fa5
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-12-30 (Mon, 30 Dec 2013)
Changed paths:
M app/assets/javascripts/admin_publify.js
R app/assets/javascripts/widearea.js
R app/assets/stylesheets/widearea.css
M app/views/admin/content/_form.html.erb
M app/views/admin/pages/_form.html.erb
M app/views/layouts/editor.html.erb
Log Message:
-----------
Cleaning Javascript before we start
* Autosave is broken, see issue #297
* The category link stuff is gone, and it's a mistake. It will come back soon, see issue #318
* WideArea won't work with anything but a textarea
* Auto adapt is no use with contenteditable
Issue #307.
Commit: 446593fb6c5065f53215a660a648440713aa39db
https://github.com/fdv/publify/commit/446593fb6c5065f53215a660a648440713aa39db
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-12-30 (Mon, 30 Dec 2013)
Changed paths:
M app/assets/javascripts/admin_publify.js
M app/assets/stylesheets/administration_structure.css.scss
M app/views/admin/content/_form.html.erb
M app/views/admin/content/new.html.erb
Log Message:
-----------
Uses `contenteditable=true` in a div / h1 instead of a Javascript resized textarea in the article form. If Javascript is disabled, the form uses the `textarea` and `input`
Issue #307.
Commit: 8d398ec357ba757a91badc043c2a32a7f22c6836
https://github.com/fdv/publify/commit/8d398ec357ba757a91badc043c2a32a7f22c6836
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-30 (Mon, 30 Dec 2013)
Changed paths:
M app/controllers/application_controller.rb
M app/controllers/articles_controller.rb
M app/helpers/sidebar_helper.rb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/fr_FR.rb
Log Message:
-----------
Move lang to locale
Commit: d384dfa9427a1fd9bb51dc2a51735e9fc29fc8ff
https://github.com/fdv/publify/commit/d384dfa9427a1fd9bb51dc2a51735e9fc29fc8ff
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-12-30 (Mon, 30 Dec 2013)
Changed paths:
M app/assets/javascripts/admin_publify.js
M app/assets/stylesheets/administration_structure.css.scss
M app/views/admin/pages/_form.html.erb
Log Message:
-----------
Use `contenteditable` div and h1 on page form.
Issue #307.
Commit: 9f43e59f8a43c621a0c4d474248d41f3fadcd9ed
https://github.com/fdv/publify/commit/9f43e59f8a43c621a0c4d474248d41f3fadcd9ed
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2013-12-30 (Mon, 30 Dec 2013)
Changed paths:
M app/assets/javascripts/admin_publify.js
Log Message:
-----------
Ensures placeholder are loaded on new contents.
Issue #307
Commit: 7d0dbe6cce0ad3ae61c13e0bc2933cbdeee9e17c
https://github.com/fdv/publify/commit/7d0dbe6cce0ad3ae61c13e0bc2933cbdeee9e17c
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-30 (Mon, 30 Dec 2013)
Changed paths:
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Remove some unused keys
Commit: 170af3a78310efc630f4a1ef47a28482686c4655
https://github.com/fdv/publify/commit/170af3a78310efc630f4a1ef47a28482686c4655
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2013-12-30 (Mon, 30 Dec 2013)
Changed paths:
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Remove some unused keys
Commit: 2d583643bfcb0f6cfc9a876f5fe40fe1cb620eb1
https://github.com/fdv/publify/commit/2d583643bfcb0f6cfc9a876f5fe40fe1cb620eb1
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-02 (Thu, 02 Jan 2014)
Changed paths:
M app/assets/javascripts/quicktags.js
Log Message:
-----------
Fixes publify:code start tag.
Commit: 3d1c3146a834c17947888660ca9d944561da923f
https://github.com/fdv/publify/commit/3d1c3146a834c17947888660ca9d944561da923f
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-02 (Thu, 02 Jan 2014)
Changed paths:
M app/controllers/application_controller.rb
M app/controllers/articles_controller.rb
M app/helpers/sidebar_helper.rb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Merge branch 'milestone/publify-8' of github.com:fdv/publify into milestone/publify-8
Commit: 72499540ad765ee7ce1260116c76c5d8559e6807
https://github.com/fdv/publify/commit/72499540ad765ee7ce1260116c76c5d8559e6807
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-02 (Thu, 02 Jan 2014)
Changed paths:
M app/assets/javascripts/quicktags.js
M app/controllers/application_controller.rb
M app/controllers/articles_controller.rb
M app/helpers/sidebar_helper.rb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Merge branch 'milestone/publify-8' into bug/use-contenteditable-in-editor/307
Commit: 3d0912aef5537f2433dc3cc1a9b0aa92096b336a
https://github.com/fdv/publify/commit/3d0912aef5537f2433dc3cc1a9b0aa92096b336a
Author: yaf <yannick.francois@free.fr>
Date: 2014-01-02 (Thu, 02 Jan 2014)
Changed paths:
M app/helpers/admin/content_helper.rb
R app/views/admin/content/autosave.js.erb
Log Message:
-----------
Merge pull request #309 from fdv/refactoring/remove-autosave-js-view
Remove autosave.js from view...
Commit: ee8a160b20bf65d79821cdf4c795c8fea71793dd
https://github.com/fdv/publify/commit/ee8a160b20bf65d79821cdf4c795c8fea71793dd
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-04 (Sat, 04 Jan 2014)
Changed paths:
M app/helpers/admin/content_helper.rb
A app/views/admin/content/autosave.js.erb
Log Message:
-----------
Revert "Remove autosave.js from view..."
This reverts commit 5b6644cb89e51a9faf053f5c8d69d92b2c1952fe.
Commit: 164108fc682609292431dbc6006b5fc76bc59479
https://github.com/fdv/publify/commit/164108fc682609292431dbc6006b5fc76bc59479
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-04 (Sat, 04 Jan 2014)
Changed paths:
M app/controllers/grouping_controller.rb
M app/views/articles/_groupings.html.erb
M app/views/categories/index.html.erb
M lang/da_DK.rb
M lang/fr_FR.rb
M lang/ja_JP.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pt_BR.rb
M lang/zh_CN.rb
Log Message:
-----------
Page is generate from article_controller, not grouping...
Commit: f97c7a268dfbd7c90d95de789e47169035627925
https://github.com/fdv/publify/commit/f97c7a268dfbd7c90d95de789e47169035627925
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-05 (Sun, 05 Jan 2014)
Changed paths:
M app/views/admin/profiles/index.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/fr_FR.rb
M lang/ja_JP.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/ru_RU.rb
Log Message:
-----------
Move lang to locale for profiles index
Commit: 20a4b8a948bb441815452d95d81f28b466414944
https://github.com/fdv/publify/commit/20a4b8a948bb441815452d95d81f28b466414944
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-05 (Sun, 05 Jan 2014)
Changed paths:
M app/views/admin/feedback/edit.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
Log Message:
-----------
Move lang to locale for feedback edit
Commit: 70bc33ebbe3c2836c01f69c46c9fdcd64b180889
https://github.com/fdv/publify/commit/70bc33ebbe3c2836c01f69c46c9fdcd64b180889
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-05 (Sun, 05 Jan 2014)
Changed paths:
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Remove unused keys
Commit: 13ae466716fd8e285f985b0f1bad8f9fc299905f
https://github.com/fdv/publify/commit/13ae466716fd8e285f985b0f1bad8f9fc299905f
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-05 (Sun, 05 Jan 2014)
Changed paths:
M app/views/admin/themes/index.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Move lang to locale for theme index
Commit: 02b90844cac673a87498e502066c1f3ae0f9a72c
https://github.com/fdv/publify/commit/02b90844cac673a87498e502066c1f3ae0f9a72c
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-05 (Sun, 05 Jan 2014)
Changed paths:
M app/views/admin/users/new.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
Log Message:
-----------
Move lang to locale for new user page
Commit: fc7b14427125e4e318514f17c16251b45882ff3e
https://github.com/fdv/publify/commit/fc7b14427125e4e318514f17c16251b45882ff3e
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-05 (Sun, 05 Jan 2014)
Changed paths:
M app/views/admin/users/edit.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Move lang to locale for edit user page
Commit: f9ce88a9b9c540f8f17313faf18abe7abf08389a
https://github.com/fdv/publify/commit/f9ce88a9b9c540f8f17313faf18abe7abf08389a
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-05 (Sun, 05 Jan 2014)
Changed paths:
M app/assets/javascripts/admin_publify.js
M app/controllers/admin/content_controller.rb
M app/views/admin/content/autosave.js.erb
Log Message:
-----------
Fixes autosave.
We currently trigger the autosave after the user stops writing for 1 second. Maybe it would be more convenient to trigger it every N second instead.
Solves issue #297.
Advances issue #322.
Commit: c9c3fb664a30355fb8c99f02efaa6b780a777f03
https://github.com/fdv/publify/commit/c9c3fb664a30355fb8c99f02efaa6b780a777f03
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-05 (Sun, 05 Jan 2014)
Changed paths:
M app/controllers/grouping_controller.rb
M app/views/admin/feedback/edit.html.erb
M app/views/admin/profiles/index.html.erb
M app/views/admin/themes/index.html.erb
M app/views/admin/users/edit.html.erb
M app/views/admin/users/new.html.erb
M app/views/articles/_groupings.html.erb
M app/views/categories/index.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Merge branch 'milestone/publify-8' into bug/fix-autosave/297
Commit: a62cefe0d2e65ab6764845c4e4070c6c2a277408
https://github.com/fdv/publify/commit/a62cefe0d2e65ab6764845c4e4070c6c2a277408
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-05 (Sun, 05 Jan 2014)
Changed paths:
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Remove some unused keys
Commit: d98ca7ad2711da4997efc76cf78dc461b52d04e1
https://github.com/fdv/publify/commit/d98ca7ad2711da4997efc76cf78dc461b52d04e1
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-05 (Sun, 05 Jan 2014)
Changed paths:
M app/views/admin/redirects/new.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_TW.rb
Log Message:
-----------
Move lang to locale for redirects
Commit: 3ec9f3d583e8d2b64f35e689de32912f5ff36ac5
https://github.com/fdv/publify/commit/3ec9f3d583e8d2b64f35e689de32912f5ff36ac5
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-05 (Sun, 05 Jan 2014)
Changed paths:
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M spec/controllers/admin/content_controller_spec.rb
Log Message:
-----------
Fix some missing i18n keys and specs
Commit: fa9893ce2a3ce75fa413f1349fe78def9858b627
https://github.com/fdv/publify/commit/fa9893ce2a3ce75fa413f1349fe78def9858b627
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-05 (Sun, 05 Jan 2014)
Changed paths:
M app/assets/stylesheets/administration_structure.css.scss
M app/views/admin/content/_form.html.erb
M app/views/admin/pages/_form.html.erb
Log Message:
-----------
First, let's clean some HTML.
* Carousel is no more needed here.
* If you need to comment your code, you need to remove it.
* I'm leaving the macro thing commented though because I need to make them a modal.
Issue #324
Commit: b28d407e08f719c50a554cd19dc168080f6377ee
https://github.com/fdv/publify/commit/b28d407e08f719c50a554cd19dc168080f6377ee
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-06 (Mon, 06 Jan 2014)
Changed paths:
M spec/controllers/admin/content_controller_spec.rb
Log Message:
-----------
Fix missing spec
Commit: 73b7746c805a74326fde162644109246730e542f
https://github.com/fdv/publify/commit/73b7746c805a74326fde162644109246730e542f
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-06 (Mon, 06 Jan 2014)
Changed paths:
M app/views/admin/dashboard/_comments.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/fr_FR.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Move lang to locale for dashboard latest comments
Commit: 31c824ddf265ce4f270c34fac3fd4c6589dab12b
https://github.com/fdv/publify/commit/31c824ddf265ce4f270c34fac3fd4c6589dab12b
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-06 (Mon, 06 Jan 2014)
Changed paths:
M app/helpers/admin/base_helper.rb
M app/views/admin/categories/new.html.erb
M app/views/admin/notes/new.html.erb
M app/views/admin/post_types/new.html.erb
M app/views/admin/redirects/new.html.erb
M app/views/admin/seo/index.html.erb
M app/views/admin/seo/permalinks.html.erb
M app/views/admin/seo/titles.html.erb
M app/views/admin/settings/display.html.erb
M app/views/admin/settings/feedback.html.erb
M app/views/admin/settings/index.html.erb
M app/views/admin/settings/write.html.erb
M app/views/admin/sidebar/index.html.erb
M app/views/admin/tags/new.html.erb
M app/views/admin/users/_form.html.erb
Log Message:
-----------
Move buttons back to views
That will help to build i18n with context. To remove duplucation, we can
create partial, but helper doesn't help... :-)
Commit: 516b0a6fdb58a8e402aed8aec0bc2c9a59bc7cc5
https://github.com/fdv/publify/commit/516b0a6fdb58a8e402aed8aec0bc2c9a59bc7cc5
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-06 (Mon, 06 Jan 2014)
Changed paths:
M app/views/admin/tags/new.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
Log Message:
-----------
Move lang to locale for tag new
Commit: a7dd9b7f4d4d889a142e4b6ae5bb5109bfa30c33
https://github.com/fdv/publify/commit/a7dd9b7f4d4d889a142e4b6ae5bb5109bfa30c33
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-06 (Mon, 06 Jan 2014)
Changed paths:
M app/helpers/admin/base_helper.rb
M app/helpers/admin/content_helper.rb
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Remove some unused keys
Commit: 0c440c06fba518e6eb02c13e1f49e4585c8bfb62
https://github.com/fdv/publify/commit/0c440c06fba518e6eb02c13e1f49e4585c8bfb62
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-06 (Mon, 06 Jan 2014)
Changed paths:
M app/models/user.rb
M app/views/admin/users/_form.html.erb
M app/views/admin/users/index.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
Log Message:
-----------
Move lang to locale for user index and form
Commit: eaf85a73aa8341e8f9588f89bfa6de8a44f18fc1
https://github.com/fdv/publify/commit/eaf85a73aa8341e8f9588f89bfa6de8a44f18fc1
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-06 (Mon, 06 Jan 2014)
Changed paths:
M app/views/admin/users/_form.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/fr_FR.rb
M lang/he_IL.rb
Log Message:
-----------
move lang to locale user form
Commit: b411cadb69572ab3bfc71e59439d6040a3dbb382
https://github.com/fdv/publify/commit/b411cadb69572ab3bfc71e59439d6040a3dbb382
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-06 (Mon, 06 Jan 2014)
Changed paths:
M app/views/admin/dashboard/index.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/ja_JP.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Move lang to locale for dashboard
Commit: 27dd95e17bb4e99f49607d1119f62ba85d0c4efa
https://github.com/fdv/publify/commit/27dd95e17bb4e99f49607d1119f62ba85d0c4efa
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-06 (Mon, 06 Jan 2014)
Changed paths:
M app/views/admin/shared/_macros.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/ja_JP.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pt_BR.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
Log Message:
-----------
Move lang to locale for macros
Commit: 511746f182eb279695e847e789dda6e99c42df14
https://github.com/fdv/publify/commit/511746f182eb279695e847e789dda6e99c42df14
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-07 (Tue, 07 Jan 2014)
Changed paths:
M app/views/admin/categories/new.html.erb
M app/views/admin/post_types/new.html.erb
M app/views/admin/redirects/new.html.erb
M app/views/admin/seo/index.html.erb
M app/views/admin/seo/permalinks.html.erb
M app/views/admin/seo/titles.html.erb
M app/views/admin/settings/display.html.erb
M app/views/admin/settings/feedback.html.erb
M app/views/admin/settings/index.html.erb
M app/views/admin/settings/write.html.erb
M app/views/admin/sidebar/_active.html.erb
M app/views/admin/sidebar/index.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/fr_FR.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/ru_RU.rb
Log Message:
-----------
Move lang to locale cancel or save/update setings buttons
Commit: d6a4d45dc9988d621b53e3e4cdb5e582c5b77b8c
https://github.com/fdv/publify/commit/d6a4d45dc9988d621b53e3e4cdb5e582c5b77b8c
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M app/views/admin/notes/new.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Move lang to locale for notes
Commit: bb7482e9471e67b3d6af54bcd179e8d27275b89e
https://github.com/fdv/publify/commit/bb7482e9471e67b3d6af54bcd179e8d27275b89e
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M app/views/articles/_comment.html.erb
M app/views/articles/_comment_form.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
M themes/bootstrap/views/articles/_comment_form.html.erb
Log Message:
-----------
Move lang to locale for comment
Commit: 98f84f9d1b5e081ec7b2cd2862f3ddeb6058fcb5
https://github.com/fdv/publify/commit/98f84f9d1b5e081ec7b2cd2862f3ddeb6058fcb5
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M app/helpers/application_helper.rb
R app/helpers/articles_helper.rb
R app/helpers/content_helper.rb
M app/helpers/sidebar_helper.rb
A app/views/articles/_article_links.html.erb
M app/views/articles/index.html.erb
M app/views/articles/read.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/de_DE.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
Log Message:
-----------
Move lang to locale
Commit: dfb9a195e1b80223e3c5e82b4fa508eb50f3445d
https://github.com/fdv/publify/commit/dfb9a195e1b80223e3c5e82b4fa508eb50f3445d
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M app/helpers/application_helper.rb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
R themes/bootstrap/views/articles/_comment_counter
M themes/bootstrap/views/articles/_comment_counter.html.erb
M themes/bootstrap/views/articles/_meta.html.erb
M themes/typographic/views/articles/_article.html.erb
Log Message:
-----------
Fix lang/locale, remove pluralize
Commit: 77eb4ed3e2b2d777eedb779fbc6ec47d74643afa
https://github.com/fdv/publify/commit/77eb4ed3e2b2d777eedb779fbc6ec47d74643afa
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-09 (Thu, 09 Jan 2014)
Changed paths:
M app/helpers/admin/content_helper.rb
M app/views/admin/content/_form.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/da_DK.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/ru_RU.rb
Log Message:
-----------
Move lang to locales
Commit: ebd7e92aeb02cda1705eb4e4168c7e6c428d4f50
https://github.com/fdv/publify/commit/ebd7e92aeb02cda1705eb4e4168c7e6c428d4f50
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-09 (Thu, 09 Jan 2014)
Changed paths:
M app/helpers/admin/content_helper.rb
M app/views/admin/content/_form.html.erb
M app/views/admin/pages/_form.html.erb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/fr_FR.rb
Log Message:
-----------
Move lang to locale (and clean helper)
Commit: b30a8e4ae351219c03fe9e1e26e02eea7a848d51
https://github.com/fdv/publify/commit/b30a8e4ae351219c03fe9e1e26e02eea7a848d51
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-09 (Thu, 09 Jan 2014)
Changed paths:
M app/assets/javascripts/admin_publify.js
M app/assets/javascripts/publify_admin.js
A app/assets/javascripts/widearea.js
M app/assets/stylesheets/administration_structure.css.scss
M app/assets/stylesheets/publify_admin.css.scss
A app/assets/stylesheets/widearea.css
M app/views/admin/content/_form.html.erb
Log Message:
-----------
Makes the articles editor back to using a textarea with widearea to handle fullscreen editing.
Issue #324.
Commit: bd678623bab1c2731332718cf14a27a5f5a4c4f1
https://github.com/fdv/publify/commit/bd678623bab1c2731332718cf14a27a5f5a4c4f1
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-09 (Thu, 09 Jan 2014)
Changed paths:
M app/assets/javascripts/admin_publify.js
M app/views/admin/pages/_form.html.erb
Log Message:
-----------
Makes page form simpler to user.
Issue #324
Commit: e3296607f657d35205ad7cd8b7308be3b6add490
https://github.com/fdv/publify/commit/e3296607f657d35205ad7cd8b7308be3b6add490
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-09 (Thu, 09 Jan 2014)
Changed paths:
M app/helpers/admin/settings_helper.rb
M app/views/admin/settings/index.html.erb
M config/application.rb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M lang/en_US.rb
M lang/fr_FR.rb
M lang/nb_NO.rb
M lang/pl_PL.rb
M lang/ru_RU.rb
A lib/publify_lang.rb
Log Message:
-----------
Move land to locale for lang
Commit: 780789d296244307ce08086cea3ce034bfb78a96
https://github.com/fdv/publify/commit/780789d296244307ce08086cea3ce034bfb78a96
Author: Yannick Francois <yannick.francois@free.fr>
Date: 2014-01-09 (Thu, 09 Jan 2014)
Changed paths:
M app/assets/javascripts/admin_publify.js
M app/assets/javascripts/publify_admin.js
A app/assets/javascripts/widearea.js
M app/assets/stylesheets/administration_structure.css.scss
M app/assets/stylesheets/publify_admin.css.scss
A app/assets/stylesheets/widearea.css
M app/views/admin/content/_form.html.erb
M app/views/admin/pages/_form.html.erb
Log Message:
-----------
Merge branch 'feature/make-the-simple-editor-really-simple-after-all/324' into milestone/publify-8
Commit: cbaa55ee10f9028673bf9a28c21f2147aef193ac
https://github.com/fdv/publify/commit/cbaa55ee10f9028673bf9a28c21f2147aef193ac
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-10 (Fri, 10 Jan 2014)
Changed paths:
M app/views/admin/content/_form.html.erb
Log Message:
-----------
Fixes the permalink generation.
Since the permalink field was absent from the form, the permalink generation could not properly happen.
This solves issue #328
This also solves issue #324
This also deals with issue #322
Commit: d5b9445bf79413fd5f3ec4b914577e8a4028a856
https://github.com/fdv/publify/commit/d5b9445bf79413fd5f3ec4b914577e8a4028a856
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-10 (Fri, 10 Jan 2014)
Changed paths:
M app/views/admin/content/_form.html.erb
Log Message:
-----------
Merge pull request #331 from fdv/bug/broken-permalink-creation/328
Fixes the permalink generation.
Commit: 4819c0addbd8f8171c7cd1c7fd14ff9f6e6708d0
https://github.com/fdv/publify/commit/4819c0addbd8f8171c7cd1c7fd14ff9f6e6708d0
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-10 (Fri, 10 Jan 2014)
Changed paths:
R app/controllers/admin/categories_controller.rb
R app/views/admin/categories/new.html.erb
M config/initializers/access_rules.rb
R spec/controllers/admin/categories_controller_spec.rb
Log Message:
-----------
Removes categories creation from the admin section.
Issue #332.
Commit: f11ab28c8e278d5698da6aa307a40b0ab22a4a31
https://github.com/fdv/publify/commit/f11ab28c8e278d5698da6aa307a40b0ab22a4a31
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-11 (Sat, 11 Jan 2014)
Changed paths:
M app/models/article.rb
M app/views/admin/content/_article_list.html.erb
R app/views/admin/content/_categories.html.erb
M app/views/admin/content/_form.html.erb
M app/views/admin/content/index.html.erb
M spec/models/article_spec.rb
Log Message:
-----------
Removes the categories from article creation, article search and article lists.
Issue #332.
Commit: c5cba8e487991f96023a4e84884348c57cc9217e
https://github.com/fdv/publify/commit/c5cba8e487991f96023a4e84884348c57cc9217e
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-11 (Sat, 11 Jan 2014)
Changed paths:
M Gemfile
M app/apis/blogger_service.rb
M app/apis/meta_weblog/api.rb
M app/apis/meta_weblog/service.rb
M app/apis/movable_type_service.rb
M app/assets/stylesheets/rss.css
M app/controllers/admin/content_controller.rb
M app/controllers/articles_controller.rb
R app/controllers/categories_controller.rb
M app/controllers/grouping_controller.rb
M app/controllers/setup_controller.rb
M app/controllers/xml_controller.rb
R app/helpers/admin/categories_helper.rb
M app/models/article.rb
M app/models/blog.rb
M app/models/blog_sweeper.rb
R app/models/categorization.rb
R app/models/category.rb
M app/views/admin/seo/index.html.erb
M app/views/admin/seo/titles.html.erb
M app/views/articles/archives.html.erb
R app/views/categories/index.html.erb
M app/views/shared/_atom_item_article.atom.builder
M app/views/shared/_rss_item_article.rss.builder
M config/routes.rb
M db/seeds.rb
R lib/category_sidebar/Rakefile
R lib/category_sidebar/app/views/category_sidebar/_content.html.erb
R lib/category_sidebar/init.rb
R lib/category_sidebar/lib/category_sidebar.rb
R lib/category_sidebar/test/category_sidebar_test.rb
M lib/xml_sidebar/app/views/xml_sidebar/_content.html.erb
M lib/xml_sidebar/lib/xml_sidebar.rb
M spec/controllers/admin/content_controller_spec.rb
M spec/controllers/articles_controller_spec.rb
M spec/controllers/backend_controller_spec.rb
R spec/controllers/categories_controller_spec.rb
M spec/controllers/xml_controller_spec.rb
M spec/factories.rb
M spec/models/article_spec.rb
M spec/models/blog_spec.rb
R spec/models/category_spec.rb
M spec/models/configuration_spec.rb
M spec/spec_helper.rb
M themes/bootstrap/README.md
M themes/bootstrap/views/articles/_meta.html.erb
R themes/bootstrap/views/categories/_article.html.erb
R themes/bootstrap/views/categories/index.html.erb
R themes/bootstrap/views/categories/show.html.erb
M themes/bootstrap/views/layouts/default.html.erb
M themes/typographic/stylesheets/layout.css
M themes/typographic/stylesheets/style.css
M themes/typographic/views/articles/_article.html.erb
Log Message:
-----------
Removing category support.
Note for self: next time I want to drop a complete model, the easiest, fastest way is deleting the model files and fix the spec until they work.
Issue #332
Commit: 39d0a4541ebd29bc8789fecb370da8bcbda6517f
https://github.com/fdv/publify/commit/39d0a4541ebd29bc8789fecb370da8bcbda6517f
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-11 (Sat, 11 Jan 2014)
Changed paths:
A db/migrate/115_drops_categories_for_tags.rb
Log Message:
-----------
Adds category removal migration.
This migration does the following:
* Picks up each category
* Checks if a tag having the same permalink exists
* If not, the tag is created
* Every article using that category is added to the mentioned tag.
* Category model is dropped
There's no way back.
Issue #332
Commit: d415cf71b7e918b9ae06a14e41474543a65a9403
https://github.com/fdv/publify/commit/d415cf71b7e918b9ae06a14e41474543a65a9403
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-11 (Sat, 11 Jan 2014)
Changed paths:
M Gemfile
M app/apis/blogger_service.rb
M app/apis/meta_weblog/api.rb
M app/apis/meta_weblog/service.rb
M app/apis/movable_type_service.rb
M app/assets/stylesheets/rss.css
R app/controllers/admin/categories_controller.rb
M app/controllers/admin/content_controller.rb
M app/controllers/articles_controller.rb
R app/controllers/categories_controller.rb
M app/controllers/grouping_controller.rb
M app/controllers/setup_controller.rb
M app/controllers/xml_controller.rb
R app/helpers/admin/categories_helper.rb
M app/models/article.rb
M app/models/blog.rb
M app/models/blog_sweeper.rb
R app/models/categorization.rb
R app/models/category.rb
R app/views/admin/categories/new.html.erb
M app/views/admin/content/_article_list.html.erb
R app/views/admin/content/_categories.html.erb
M app/views/admin/content/_form.html.erb
M app/views/admin/content/index.html.erb
M app/views/admin/seo/index.html.erb
M app/views/admin/seo/titles.html.erb
M app/views/articles/archives.html.erb
R app/views/categories/index.html.erb
M app/views/shared/_atom_item_article.atom.builder
M app/views/shared/_rss_item_article.rss.builder
M config/initializers/access_rules.rb
M config/routes.rb
A db/migrate/115_drops_categories_for_tags.rb
M db/seeds.rb
R lib/category_sidebar/Rakefile
R lib/category_sidebar/app/views/category_sidebar/_content.html.erb
R lib/category_sidebar/init.rb
R lib/category_sidebar/lib/category_sidebar.rb
R lib/category_sidebar/test/category_sidebar_test.rb
M lib/xml_sidebar/app/views/xml_sidebar/_content.html.erb
M lib/xml_sidebar/lib/xml_sidebar.rb
R spec/controllers/admin/categories_controller_spec.rb
M spec/controllers/admin/content_controller_spec.rb
M spec/controllers/articles_controller_spec.rb
M spec/controllers/backend_controller_spec.rb
R spec/controllers/categories_controller_spec.rb
M spec/controllers/xml_controller_spec.rb
M spec/factories.rb
M spec/models/article_spec.rb
M spec/models/blog_spec.rb
R spec/models/category_spec.rb
M spec/models/configuration_spec.rb
M spec/spec_helper.rb
M themes/bootstrap/README.md
M themes/bootstrap/views/articles/_meta.html.erb
R themes/bootstrap/views/categories/_article.html.erb
R themes/bootstrap/views/categories/index.html.erb
R themes/bootstrap/views/categories/show.html.erb
M themes/bootstrap/views/layouts/default.html.erb
M themes/typographic/stylesheets/layout.css
M themes/typographic/stylesheets/style.css
M themes/typographic/views/articles/_article.html.erb
Log Message:
-----------
Merge pull request #334 from fdv/feature/drop-categories-for-tags/332
Drops categories for tags.
Commit: 142e4fce8006838af631d70fd1320529579a926c
https://github.com/fdv/publify/commit/142e4fce8006838af631d70fd1320529579a926c
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-11 (Sat, 11 Jan 2014)
Changed paths:
M app/views/layouts/administration.html.erb
Log Message:
-----------
Merges both menus.
Merges the help and welcome menu.
Moves the new menu to the right.
Issue #329
Commit: 35eb851758e6ce779eed1a835dc2e1adb68be0b5
https://github.com/fdv/publify/commit/35eb851758e6ce779eed1a835dc2e1adb68be0b5
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-11 (Sat, 11 Jan 2014)
Changed paths:
M app/views/layouts/administration.html.erb
Log Message:
-----------
Merge pull request #337 from fdv/feature/merge-menus/329
Merges both menus.
Issue #329.
Commit: 2e1d17a86b527a1b3df153d012c0abc37c51fb38
https://github.com/fdv/publify/commit/2e1d17a86b527a1b3df153d012c0abc37c51fb38
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-11 (Sat, 11 Jan 2014)
Changed paths:
M app/views/admin/feedback/article.html.erb
Log Message:
-----------
Fixes the comment listing format.
Fixes the comment form format.
Issue #335.
Commit: f0e98560b18d194391a5b189271cc8b9067a66fa
https://github.com/fdv/publify/commit/f0e98560b18d194391a5b189271cc8b9067a66fa
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-11 (Sat, 11 Jan 2014)
Changed paths:
M app/views/admin/feedback/article.html.erb
Log Message:
-----------
Merge pull request #338 from fdv/bug/fix-admin-feedback-article-xxx/335
Fixes the comment listing format.
Commit: 27292a8acf11b15ff0c7cd806383f8a225eaa67d
https://github.com/fdv/publify/commit/27292a8acf11b15ff0c7cd806383f8a225eaa67d
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-11 (Sat, 11 Jan 2014)
Changed paths:
M app/assets/javascripts/admin_publify.js
Log Message:
-----------
Fixes the editor loading
Commit: f78cd97d4bdd762a5e3c44e9fdb4d25ee98bd52d
https://github.com/fdv/publify/commit/f78cd97d4bdd762a5e3c44e9fdb4d25ee98bd52d
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-11 (Sat, 11 Jan 2014)
Changed paths:
M app/views/admin/feedback/article.html.erb
Log Message:
-----------
Merge branch 'milestone/publify-8' of github.com:fdv/publify into milestone/publify-8
Commit: aa0278cf9d29d1ef65796e65d46604cd83a89e8b
https://github.com/fdv/publify/commit/aa0278cf9d29d1ef65796e65d46604cd83a89e8b
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-11 (Sat, 11 Jan 2014)
Changed paths:
M app/controllers/admin/users_controller.rb
Log Message:
-----------
Ensures there's always one admin remaining.
Not sure about this, but we may ensure that a user can't destroy himself.
Issue #299
Commit: 488459d0895862839cd998c3c244f532ffb84794
https://github.com/fdv/publify/commit/488459d0895862839cd998c3c244f532ffb84794
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-12 (Sun, 12 Jan 2014)
Changed paths:
R app/assets/images/admin/glyphicons-large.png
M app/assets/stylesheets/administration_structure.css.scss
Log Message:
-----------
Doing some CSS cleaning. This allow to drop the old glyphicon.png since we're now using a Unicode font.
Issue #330
Commit: 1c333d6bfc7b2ff6940582fcb959d7131884c853
https://github.com/fdv/publify/commit/1c333d6bfc7b2ff6940582fcb959d7131884c853
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-12 (Sun, 12 Jan 2014)
Changed paths:
R app/assets/images/admin/glyphicons-large.png
M app/assets/stylesheets/administration_structure.css.scss
Log Message:
-----------
Merge pull request #339 from fdv/feature/clean-administration-css/330
Doing some CSS cleaning. This allow to drop the old glyphicon.png since ...
Commit: 95c1b1f73d02e5267f8152ee3084f4b71a4bd938
https://github.com/fdv/publify/commit/95c1b1f73d02e5267f8152ee3084f4b71a4bd938
Author: Frédéric de Villamil <frederic@de-villamil.com>
Date: 2014-01-12 (Sun, 12 Jan 2014)
Changed paths:
M Gemfile
M app/apis/blogger_service.rb
M app/apis/meta_weblog/api.rb
M app/apis/meta_weblog/service.rb
M app/apis/meta_weblog/structs.rb
M app/apis/movable_type_service.rb
R app/assets/images/admin/glyphicons-halflings.png
R app/assets/images/admin/glyphicons-large.png
M app/assets/javascripts/admin_publify.js
R app/assets/javascripts/bootstrap-affix.js
R app/assets/javascripts/bootstrap-alert.js
R app/assets/javascripts/bootstrap-button.js
R app/assets/javascripts/bootstrap-carousel.js
R app/assets/javascripts/bootstrap-collapse.js
R app/assets/javascripts/bootstrap-dropdown.js
R app/assets/javascripts/bootstrap-modal.js
R app/assets/javascripts/bootstrap-popover.js
R app/assets/javascripts/bootstrap-scrollspy.js
R app/assets/javascripts/bootstrap-tab.js
R app/assets/javascripts/bootstrap-tooltip.js
R app/assets/javascripts/bootstrap-transition.js
R app/assets/javascripts/bootstrap-typeahead.js
M app/assets/javascripts/bootstrap.js
M app/assets/javascripts/publify_admin.js
M app/assets/javascripts/quicktags.js
A app/assets/javascripts/widearea.js
M app/assets/stylesheets/accounts.css
M app/assets/stylesheets/administration_structure.css.scss
R app/assets/stylesheets/bootstrap-accounts.css
R app/assets/stylesheets/bootstrap-admin.css
A app/assets/stylesheets/bootstrap-theme.css
A app/assets/stylesheets/bootstrap.css
A app/assets/stylesheets/fonts/glyphicons-halflings-regular.eot
A app/assets/stylesheets/fonts/glyphicons-halflings-regular.svg
A app/assets/stylesheets/fonts/glyphicons-halflings-regular.ttf
A app/assets/stylesheets/fonts/glyphicons-halflings-regular.woff
M app/assets/stylesheets/publify_admin.css.scss
M app/assets/stylesheets/rss.css
A app/assets/stylesheets/widearea.css
M app/controllers/accounts_controller.rb
M app/controllers/admin/base_controller.rb
M app/controllers/admin/cache_controller.rb
R app/controllers/admin/categories_controller.rb
M app/controllers/admin/content_controller.rb
M app/controllers/admin/dashboard_controller.rb
M app/controllers/admin/feedback_controller.rb
M app/controllers/admin/pages_controller.rb
M app/controllers/admin/profiles_controller.rb
M app/controllers/admin/redirects_controller.rb
M app/controllers/admin/resources_controller.rb
M app/controllers/admin/seo_controller.rb
M app/controllers/admin/settings_controller.rb
M app/controllers/admin/sidebar_controller.rb
M app/controllers/admin/tags_controller.rb
M app/controllers/admin/themes_controller.rb
M app/controllers/admin/users_controller.rb
M app/controllers/application_controller.rb
M app/controllers/articles_controller.rb
R app/controllers/categories_controller.rb
M app/controllers/grouping_controller.rb
M app/controllers/setup_controller.rb
M app/controllers/xml_controller.rb
M app/helpers/admin/base_helper.rb
R app/helpers/admin/categories_helper.rb
M app/helpers/admin/content_helper.rb
M app/helpers/admin/dashboard_helper.rb
M app/helpers/admin/feedback_helper.rb
M app/helpers/admin/post_types_helper.rb
M app/helpers/admin/redirects_helper.rb
R app/helpers/admin/resources_helper.rb
M app/helpers/admin/settings_helper.rb
M app/helpers/admin/tag_helper.rb
M app/helpers/application_helper.rb
R app/helpers/articles_helper.rb
R app/helpers/content_helper.rb
M app/helpers/sidebar_helper.rb
M app/models/article.rb
M app/models/blog.rb
M app/models/blog_sweeper.rb
R app/models/categorization.rb
R app/models/category.rb
M app/models/feedback.rb
M app/models/note.rb
M app/models/user.rb
M app/views/accounts/confirm.html.erb
M app/views/accounts/login.html.erb
M app/views/accounts/recover_password.html.erb
M app/views/accounts/signup.html.erb
M app/views/admin/cache/index.html.erb
R app/views/admin/categories/new.html.erb
M app/views/admin/content/_article_list.html.erb
R app/views/admin/content/_categories.html.erb
M app/views/admin/content/_form.html.erb
M app/views/admin/content/_images.html.erb
M app/views/admin/content/autosave.js.erb
M app/views/admin/content/index.html.erb
M app/views/admin/content/new.html.erb
M app/views/admin/dashboard/_comment.html.erb
M app/views/admin/dashboard/_comments.html.erb
M app/views/admin/dashboard/_drafts.html.erb
M app/views/admin/dashboard/_inbound.html.erb
M app/views/admin/dashboard/_welcome.html.erb
M app/views/admin/dashboard/index.html.erb
M app/views/admin/feedback/_button.html.erb
M app/views/admin/feedback/_feedback.html.erb
M app/views/admin/feedback/article.html.erb
M app/views/admin/feedback/edit.html.erb
M app/views/admin/feedback/index.html.erb
M app/views/admin/notes/new.html.erb
M app/views/admin/pages/_form.html.erb
M app/views/admin/pages/_images.html.erb
M app/views/admin/pages/_pages.html.erb
M app/views/admin/pages/index.html.erb
M app/views/admin/post_types/new.html.erb
M app/views/admin/profiles/index.html.erb
M app/views/admin/redirects/new.html.erb
M app/views/admin/resources/index.html.erb
M app/views/admin/seo/index.html.erb
M app/views/admin/seo/permalinks.html.erb
M app/views/admin/seo/titles.html.erb
M app/views/admin/settings/display.html.erb
M app/views/admin/settings/feedback.html.erb
M app/views/admin/settings/index.html.erb
M app/views/admin/settings/update_database.html.erb
M app/views/admin/settings/write.html.erb
M app/views/admin/shared/_macros.html.erb
M app/views/admin/sidebar/_active.html.erb
R app/views/admin/sidebar/_publish.html.erb
M app/views/admin/sidebar/index.html.erb
M app/views/admin/tags/new.html.erb
M app/views/admin/themes/index.html.erb
M app/views/admin/users/_form.html.erb
M app/views/admin/users/edit.html.erb
M app/views/admin/users/index.html.erb
M app/views/admin/users/new.html.erb
A app/views/articles/_article_links.html.erb
M app/views/articles/_comment.html.erb
M app/views/articles/_comment_form.html.erb
M app/views/articles/_groupings.html.erb
M app/views/articles/archives.html.erb
M app/views/articles/index.html.erb
M app/views/articles/read.html.erb
M app/views/authors/show.html.erb
R app/views/categories/index.html.erb
M app/views/layouts/accounts.html.erb
M app/views/layouts/administration.html.erb
A app/views/layouts/editor.html.erb
M app/views/setup/confirm.html.erb
M app/views/setup/index.html.erb
M app/views/shared/_atom_item_article.atom.builder
M app/views/shared/_rss_item_article.rss.builder
M config/application.rb
M config/initializers/access_rules.rb
M config/locales/da.yml
M config/locales/de.yml
M config/locales/en.yml
M config/locales/es-MX.yml
M config/locales/fr.yml
A config/locales/gflash.da.yml
A config/locales/gflash.de.yml
M config/locales/gflash.en.yml
A config/locales/gflash.es-MX.yml
A config/locales/gflash.fr.yml
A config/locales/gflash.he-IL.yml
A config/locales/gflash.it.yml
A config/locales/gflash.ja.yml
A config/locales/gflash.lt.yml
A config/locales/gflash.nb-NO.yml
A config/locales/gflash.nl.yml
A config/locales/gflash.pl.yml
A config/locales/gflash.pt-BR.yml
A config/locales/gflash.ro.yml
A config/locales/gflash.ru.yml
A config/locales/gflash.zh-CN.yml
A config/locales/gflash.zh-TW.yml
M config/locales/he-IL.yml
M config/locales/it.yml
M config/locales/ja.yml
M config/locales/lt.yml
M config/locales/nb-NO.yml
M config/locales/nl.yml
M config/locales/pl.yml
M config/locales/pt-BR.yml
M config/locales/ro.yml
M config/locales/ru.yml
M config/locales/zh-CN.yml
M config/locales/zh-TW.yml
M config/routes.rb
A db/migrate/115_drops_categories_for_tags.rb
M db/seeds.rb
M lang/da_DK.rb
M lang/de_DE.rb
M lang/en_US.rb
M lang/es_MX.rb
M lang/fr_FR.rb
M lang/he_IL.rb
M lang/it_IT.rb
M lang/ja_JP.rb
M lang/lt_LT.rb
M lang/nb_NO.rb
M lang/nl_NL.rb
M lang/pl_PL.rb
M lang/pt_BR.rb
M lang/ro_RO.rb
M lang/ru_RU.rb
M lang/zh_CN.rb
M lang/zh_TW.rb
R lib/category_sidebar/Rakefile
R lib/category_sidebar/app/views/category_sidebar/_content.html.erb
R lib/category_sidebar/init.rb
R lib/category_sidebar/lib/category_sidebar.rb
R lib/category_sidebar/test/category_sidebar_test.rb
M lib/publify_avatar_gravatar/lib/publify_avatar_gravatar.rb
A lib/publify_lang.rb
M lib/publify_login_system/access_control.rb
M lib/sidebar.rb
M lib/tasks/genethumb.rake
M lib/xml_sidebar/app/views/xml_sidebar/_content.html.erb
M lib/xml_sidebar/lib/xml_sidebar.rb
M spec/controllers/accounts_controller_spec.rb
R spec/controllers/admin/categories_controller_spec.rb
M spec/controllers/admin/content_controller_spec.rb
M spec/controllers/admin/feedback_controller_spec.rb
M spec/controllers/admin/pages_controller_spec.rb
M spec/controllers/admin/settings_controller_spec.rb
M spec/controllers/articles_controller_spec.rb
M spec/controllers/backend_controller_spec.rb
R spec/controllers/categories_controller_spec.rb
M spec/controllers/xml_controller_spec.rb
M spec/factories.rb
M spec/models/article_spec.rb
M spec/models/blog_spec.rb
R spec/models/category_spec.rb
M spec/models/configuration_spec.rb
M spec/models/feedback_spec.rb
M spec/models/note_spec.rb
M spec/spec_helper.rb
M themes/bootstrap/README.md
R themes/bootstrap/views/articles/_comment_counter
M themes/bootstrap/views/articles/_comment_counter.html.erb
M themes/bootstrap/views/articles/_comment_form.html.erb
M themes/bootstrap/views/articles/_meta.html.erb
R themes/bootstrap/views/categories/_article.html.erb
R themes/bootstrap/views/categories/index.html.erb
R themes/bootstrap/views/categories/show.html.erb
M themes/bootstrap/views/layouts/default.html.erb
M themes/typographic/stylesheets/layout.css
M themes/typographic/stylesheets/style.css
M themes/typographic/views/articles/_article.html.erb
Log Message:
-----------
Merge branch 'milestone/publify-8'
Conflicts:
app/views/admin/pages/_form.html.erb
config/locales/ru.yml
lang/ru_RU.rb
Compare: https://github.com/fdv/publify/compare/b1d8a90a2145...95c1b1f73d02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment