Permalink
Browse files

Release 6.1.1

  • Loading branch information...
1 parent 53c3fc6 commit 54e741acbaa8a7a1fe9122464efad4a6917e8942 @fdv fdv committed Jan 9, 2013
Showing with 636 additions and 494 deletions.
  1. +633 −491 CHANGELOG
  2. +1 −1 README.textile
  3. +1 −1 lib/tasks/release.rake
  4. +1 −1 lib/typo_version.rb
View
1,124 CHANGELOG
@@ -1,909 +1,1051 @@
- French translation of redirections related sentences
+commit 6f828c9cffd57882197fea61fe28e75e40363a28
+Author: Frédéric de Villamil <frederic@de-villamil.com>
+
+ Completes French translation. 75% of the dev team is French and we can't even take care of our own language, such a shame.
-commit 156b63b6dbdbfd2fdcdbdb748fbdea6e453cd217
+commit 3e9af94888a8c349afd1844c43534e6516b8d432
Author: Matijs van Zuijlen <matijs@matijs.net>
- Create a second migration to fix article post types.
+ Fixed rails script location in README.
-commit 1422de9e554d57f5c85cc81c74b892208a73a8e2
-Author: Yannick Francois <yannick.francois@free.fr>
+commit 0127b6ede309f493a66b273209be757360ebe452
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Fix specs
+ Fix formatting nits in README.
-commit 4779a1fb698eb9a02dec9ce0c71267d5542f22b2
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit 0fbd11496c0d0e282bdb4922164577a712d49849
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Yo dawg, I heard you like typos so I put an epic typo in your typo so you can typo while you typo
+ Remove .bundle/config from repository and ignore it.
-commit a44b1ebc0112d5ed349696d3345edc80e88b0f2e
-Author: Yannick Francois <yannick.francois@free.fr>
+commit c82817e53d6618a9ccc0b6ec19a7d5418aa00dcd
+Author: Matijs van Zuijlen <matijs@matijs.net>
- spec cleaning
+ Ignore bin/ directory (for Bundler binstubs).
-commit a95a4cb2ad093b91ba862f2b1119e7246c49dc18
-Author: Yannick Francois <yannick.francois@free.fr>
+commit 1d0cb6826348531ae7bd54f5439ef37dfe435720
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Move .rspec file to rspec.sample, because, each dev would build is own
- dev env :-)
+ Make sure a blog object is available for page specs.
-commit 6fd964a65b284411ab0a3a32ac1ff2f4f6538ecd
-Author: Yannick Francois <yannick.francois@free.fr>
+commit 2e54f8205a0662159ec84232c70af009ce5aba4a
+Author: Matijs van Zuijlen <matijs@matijs.net>
- some refactoring around comment controller
+ Avoid setting the User salt permanently in specs.
-commit 0ed86c55b1440c0512d4114d9ddfc5c068134bb1
-Author: Yannick Francois <yannick.francois@free.fr>
+commit 15e31866bcbc453c5ce85d61b1345d9683efcf67
+Author: Diego Elio Pettenò <flameeyes@flameeyes.eu>
- some refactoring to remove unuse code
+ Update deps to allow newer gem versions.
-commit 3cafb1177cee92a2d24380d6dc6663f11f4100e3
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit e9c893fdd581778dadf5d1e1048ab3178be31ed6
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Update cKEditor
+ Use approximate versions for most dependencies.
-commit d789da4188c1858a8808bc8193a663435aaea2d3
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit b63ec3adf75c22517502f5c10d98289de30c9f6e
+Author: Thomas Lecavelier <thomas@lecavelier.name>
- Update cKEditor second take
+ Gemfile script asserts that RAILS_ENV or development env are defined, which is false in a production only environment. Enhance error message and protect against nil values
-commit 34ec3fbd0a778402bc57133337b24d23ee90ab50
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit eb31591d1568d479628f92e04a15d36a490bfb6c
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Upgrade ckeditor third step
+ Remove ruby-debug19
-commit d41bfcc695882ce6a85c418fcc5ef9775398a370
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit b6c65b4764b6910d6b988a2effd4d5647e030efe
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Upgrade ckeditor last step
+ Update factory_girl dependency and fix deprecations
-commit 76c9b3ca57028582b4ed7542645121159dd2791a
-Author: Yannick Francois <yannick.francois@free.fr>
+commit d1109ddc0eba080cedbdae13bf7cb1e503549765
+Author: Matijs van Zuijlen <matijs@matijs.net>
- clean around text_filter (spec)
+ Remove useless inflect_names option
-commit 815240069a3cfddd861be6672da4d0353770e6e9
-Author: Yannick Francois <yannick.francois@free.fr>
+commit 95dbc177687d377c1f5ceb0102382f3ba1164840
+Author: Matijs van Zuijlen <matijs@matijs.net>
- add scope to resource and use them when it's possible
+ Fix indenting
-commit 67c908215dfe6c6182ff8f24d94da0ad1df249e4
-Author: Yannick Francois <yannick.francois@free.fr>
+commit ae3d729a86e6b4e62490f12577fc696652101e11
+Author: Matijs van Zuijlen <matijs@matijs.net>
- add more scope on resource, (combine one) and use them
+ Only allow POST as a web service request method
-commit 53f7cb0086f4207d5fdfad38853a9eab6d710f74
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit f95f1ff1e79a8a4c014413da300e44d9a33632ec
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Fixes switching back and fort between simple and visual editor.
+ Never allow active record models in :expects
-commit 09c0cf266769c3aae24653f7d4a375583188c69d
-Merge: 53f7cb0 67c9082
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit 863e750659de99725c62b6e8064bd44b7b717e9f
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Merge branch 'master' of github.com:fdv/typo
+ Do not allow default web service API methods
-commit e6cc3068912d85dc7006718b1dd216c898783191
-Merge: e4aa089 09c0cf2
-Author: Thomas Lecavelier <thomas@lecavelier.name>
+commit 7d090c155ce04755e06f99c3bbe40c5e7ac237b1
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Merge branch 'master' into merge_tags
+ Use class_attribute do define storage for API methods
-commit 558c4e4ea09ede816bf529b13fcd75604c9691b9
-Author: Thomas Lecavelier <thomas@lecavelier.name>
+commit 32eaba7b0361669b3ae1771ce9c72b6030b16b28
+Author: Matijs van Zuijlen <matijs@matijs.net>
- TopLayer in admin is now a full page overlay (reduce miss-click risk). Clicking on it close the overlay. Better CSS (background transparancy)
+ Make web_service_exception_reporting a class attribute
-commit 816aa211eae6e3f44e8f05dc4246da2e217f9963
+commit 3ba55f664e8f85a9daebdf6225c697cf20aadefe
Author: Matijs van Zuijlen <matijs@matijs.net>
- Add encoding comments to spec files to satisfy Ruby 1.9.
+ Make before and after invocation interceptor lists into class attributes
-commit 4e275ecb7288e53e4be0afe133dd793890e0a394
+commit fa7271fb229d35562a48a29a8511248d8a7b14b4
Author: Matijs van Zuijlen <matijs@matijs.net>
- Backport fix for rspec issue 258.
+ Make intercepted method lists into class attributes
-commit 618fd2f4e9adb9681052e098b1565dc9f4134082
+commit 6c8442493930e9ba39db9f00c28a599a7312959c
Author: Matijs van Zuijlen <matijs@matijs.net>
- Make String#to_title deal with contents where body is nil.
+ Make web_service_protocols an class attribute
-commit cb15f079cd3f64f276a889e7f538c6347238d210
+commit e3edfa39b49f239cb195b8c8bbec1e436dc72d35
Author: Matijs van Zuijlen <matijs@matijs.net>
- Pass article to partial when password checks out.
+ Make web_service_dispatching_mode a class attribute
-commit f21ebfbc5e76b7a1917544cddff3dd4c5079abaf
+commit be5158b378ae65e3c4a69ca9a2d18dae7ebcc89d
Author: Matijs van Zuijlen <matijs@matijs.net>
- Fix article routing spec: get method no longer works.
+ Store struct members in a class attribute
-commit 575a9e53354cd10357ba7bfe58716cd21479bb21
+commit 5c61f42562e1ae3a3f9920c7870ff3783535061b
Author: Matijs van Zuijlen <matijs@matijs.net>
- Remove unused stub that fails on currently used RSpec.
+ Use class_attribute to store web_service_api
-commit 386b6822928dde424a262a46cde972a399530799
+commit 0cf050e62dac55ead376a146f10d1b20c898457b
Author: Matijs van Zuijlen <matijs@matijs.net>
- Revert "spec cleaning"
+ Use class_attribute to store web_service_api_callbacks
-commit c174cf4a79f8c3c67ec7c1675aff31ad02db448a
+commit e8ec4a20fb5c7283da650a515520d833a9da959d
Author: Matijs van Zuijlen <matijs@matijs.net>
- Fix factory_girl deprecation warning.
+ Use class_attribute to store web_services
-commit daec85a096d9073b557b3402d780ee0a17b28ae0
-Author: Michael Reinsch <michael@mobalean.com>
+commit b8aca5d26279fbb88ea05bedfbb71c3fe76c42ad
+Author: Matijs van Zuijlen <matijs@matijs.net>
- use named scope for selecting published articles
+ Use class_attribute to store web_service_definition_callbacks
-commit 7e0199b3b0246519387ae8ccd859749da8a21854
-Author: Michael Reinsch <michael@mobalean.com>
+commit e1e22b957ed16db3849c39081c1d65832d77d83a
+Author: Matijs van Zuijlen <matijs@matijs.net>
- use published_at, not created_at to determine when comments shall be closed
+ Remove notifications as a relation of content
-commit 901f8d6e72055dd42aff2105e39cb4e5e6cc96e1
-Merge: c174cf4 7e0199b
-Author: Thomas Lecavelier <thomas@lecavelier.name>
+commit 131200579a332299629096a7ac0a142fe81fe156
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Merge pull request #53 from mreinsch/master
+ Explicitely do not use timestamped migrations
-commit 487dfdc84d6adb8807c6c4733070a5fd835357aa
-Author: Yannick Francois <yannick.francois@free.fr>
+commit 549d15a83168f10fe46d66b06d9473a405a35fbd
+Author: Matijs van Zuijlen <matijs@matijs.net>
- FIX broken spec
+ Remove notifications table and model
-commit 39bd190f362585860705ace7a5bf5f0c55544163
-Author: Yannick Francois <yannick.francois@free.fr>
+commit 1d1c20861f975eb359993c89bd8c2f865e343e67
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Move get_or_build article to Article model (from content_controller). I hope it's a better place...
+ Use Rails 3.2
-commit ce95a6a42c422dc530a998992fd158f8c72f2fb5
-Author: Yannick Francois <yannick.francois@free.fr>
+commit 861391d84f53d4ac6aafca540d3347d0d6e43357
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Add simple_editor? to user, and clean user_spec.
+ Remove now-unknown configuration
-commit a0b9612ae5cd3e0afca8f582633a4b6e09450f50
-Author: Yannick Francois <yannick.francois@free.fr>
+commit 2d853973c09d21ce42c51a7556d4dfe0a5151b68
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Clean admin content_controller (use simple_editor? and fix insert_editor action)
+ Add gems implementing functionality removed from Rails
-commit db9416a5dee0f31deb450699f85fefa4c491cfed
-Author: Yannick Francois <yannick.francois@free.fr>
+commit e209a6c65753446791764e4082791968599a8397
+Author: Matijs van Zuijlen <matijs@matijs.net>
- add test on insert_editor action on admin page_controller
+ Remove template handler extension
-commit d9c29940b82e327608c48d2f34a61b1b0344e289
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit a1fe74fdec44460a479e82c4dd13d8ad96f7e5a8
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Making the dashboard a little bit clearer, and the info style a little less flashy
+ Clean up test
-commit a444cf9d339dc581a45c6cbc4510e4a60bbce558
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit bdffc079ca04f8937d8f9d00739e7162bb5532ab
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Making the simple editor a little clearer
+ Upgrade to recent rspec(-rails)
-commit 9d8cbd67a85a79befdb54c1b401cd50f5e3a9a06
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit 2b1d5405a5ecd2903c6c8ac2cbd3a8cb9568bb56
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Setting up things so we can soon (or later) add a second administration color stylesheet (or two, or three...). I have some nice ideas you can easily imagine for that one
+ Fix typo and whitespace
-commit 80e2f77e926fec675da74a53241c0fa50a2a49b0
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit 14b5e9248caf2b18243d2c0fa4b2d9d7bf6ee0d2
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Adding bootstrap dependencies, switching layout and menu to bootstrap
+ Clean up and clarify test for Admin::UsersController#destroy
-commit 6e80af523f61a32198360d61fd6799681a74bd57
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit a97cc17dcdffbd294fb32beee06f21ca4edd63ca
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Removing dependencies to Twitter bootstrap, html cleaning
+ Fix text filter assignment
-commit 160be12102f9c2c0538989f676c820bdd8ac1961
-Author: Yannick Francois <yannick.francois@free.fr>
+commit 33b64c6d8f1580f445991da8ff2118058f289f41
+Author: Matijs van Zuijlen <matijs@matijs.net>
- add rbenv-version to gitignore
+ Replace deprecated confirm: link option
-commit f11eb915354149dec400f5ee764af039572d1e80
-Merge: 6e80af5 160be12
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit fe186a48c02274c4f79ec86b6b02dbfcf7cbf7d3
+Author: Frédéric de Villamil <frederic@de-villamil.com>
- Merge branch 'master' of github.com:fdv/typo
+ Fixes inconsistency on the login / recover password forms
-commit bf4814eaeadd53981cb135ac02110c4e88162dea
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit e91d9a2cd1e1329fbda2d3ecebbafd799899d9a7
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Moves Dashboard to bootstrap
+ Spec for Content#textfilter's default response
-commit 8b2dbe76268bae61cd6609b80e4d81c78f5db9d7
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit 92fd4657f6ca614e57630a74ed88be5cefed5680
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Articles / content
+ Use RSpec syntax
-commit 3d426f10ac8a4eb9336b6554085f5c3b0c93850e
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit 71fc3c54872825d441176f0e5967e26e923a2391
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Porting the comments view to Bootstrap
+ User only assigns its text filter to content if the editor is simple
-commit 733b325b799c64319fe2ddc519ff555335e5d245
+commit 4420ea4ce91be1491b84eff15a142b93e79bc82b
Author: Matijs van Zuijlen <matijs@matijs.net>
- Correct specced admin theme configuration variable.
+ Fix whitespace
-commit 31fc10deadc67a422a1821378c81abc802ac8620
+commit 133065d0627cbf74400a6e5ae6aee22fd5b21740
Author: Matijs van Zuijlen <matijs@matijs.net>
- Remove needless #delete_all method calls.
+ Replace dynamic_form plugin with gem
-commit 33875a993906fcb7c97c9458cad1169ae2182fe1
+commit f43d03b433f36b36f3d9c134e45d56605146ed19
Author: Matijs van Zuijlen <matijs@matijs.net>
- Remove superfluous bits from Gemfile.
+ Fully specify published_at when building test objects
-commit bdda71a5917e162b2f9fd1328a091424d2a9635b
-Merge: 3d426f1 33875a9
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit b56a7d9ff94c13b6597a101af1fba6507a9c4118
+Author: Frédéric de Villamil <frederic@de-villamil.com>
- Merge branch 'master' of github.com:fdv/typo
+ So one year ago as I was redesigning the editor, I left most of the publishing settings hardcoded and no one ever raised a bug. Can't believe it. Either default values are perfect, and we don't need them as an option anymore or no one actually use Typo and we've just been losing our time during the past 6 years.
-commit 25664cbfbb369c768344e64c6b3bd70d75489057
+commit dad8373aef0e43bd8dba4d470db0e087a83164a1
Author: Matijs van Zuijlen <matijs@matijs.net>
- Add back source line to Gemfile.
+ Fix Trigger specs
-commit 8fb9242649f55d580deedf430501ebd8394a8ee1
-Merge: bdda71a 25664cb
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit 473def7712571576bf334bdcb3e7d25d115f437e
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Merge branch 'master' of github.com:fdv/typo
+ Fix notification mailer
-commit a3c5c962cd684e1339d373dedcdc0cdc08aadf05
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit ae28f5920c74d6d64d778a9c6be491ea560dfb7a
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Moving login form to Bootstrap
+ Refactor NotificationMailer implemenation
-commit 038f7379eca68e1dd8608739d8b8a6cf5b8a4075
-Author: Frédéric de Villamil <neuro@asocial.org>
+commit 8f73bd338fd0ddd8e5293b978616cd6bb3c87ecd
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Adding a quick and dirty fix to users won't have to ssh and run initial migration: if the fire triggers fails it's most probably because the database was not loaded, so we run the migration engine as a rescue.
+ Clean up NotificationMailer
-commit 50b4fdedc3146a442182661ae14dd5568c09a55d
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 543e0e0a6397c76599795fa157d9d7b28d2c0a5f
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Migrating setup
+ Use correct attribute name :status_confirmed
-commit bebe22130204638e3e763a3299f18afda2b473e2
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 05b5c7fc058584206e2d2b7a48d1c007a4ba0a95
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Migrating sign up
+ Replace use of Memoizable with memoization pattern
-commit a334e9194735ee0306e339bee48f1e3d2ed07864
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 60e34ba48e27817a94d5abb745a79898cf1d5fe9
+Author: Matijs van Zuijlen <matijs@matijs.net>
- I don't like controllers with empty indexes rendering errors
+ Eliminate use of set_table_name for Feedback
-commit 92b9be985ce55fbe8b4fff5ff923a800a26c2cb9
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit aa1693fe8d626a58bfebfa25b9176a4d6bf7b382
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Fixes a bad encoding issue under 1.9.2
+ Move more methods from Content to ContentBase
-commit e389f5081175739fee93d7d16bcf5f171bb77199
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit b3bd8e1b05165811565823bd1a5ff0998a03b877
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Replacing old will_paginate with scope based Kaminari.
+ Hack to re-enable memoization reload feature
-commit 6492aa32699e5935e920d5aadcdd9676f2db2cf0
-Merge: 92b9be9 e389f50
+commit bb9b517e904657a1ff0ee5e89e6b150eeaee9edf
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Fixes merge conflict
+ Fixing more inconsistencies
-commit 014391950b88f3bb39173fdd22c0b136fb52521a
+commit 7e9e027ff7ae8601ae3bde06d08ef0087ad58086
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Adds customizable 404 pages with optionnal messages in the admin. Next: 500
+ Updating French translation. Provided 3 commiters out of 4 are French, having a partial French version is a shame
-commit 1b47f72eff8e4f7324bb4adf157bcd24c0df2249
-Merge: 6492aa3 0143919
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 77c9be3db1b4f5cc5a30403bfa7d46ca3060e80d
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Merge branch 'master' into bootstrap
+ Specify format and handler separately from template name
-commit 58f3dbe72ecc93106fddd583cf3af48ab605f0f6
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 71a1d1606ce910f294ed97bd30fdb349dde00619
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Removing useless Javascript based category reorder interface. Categories will now be ordered by name, which looks like the most likely way to do it. This is a first step to sub categories as the order interface prevented from having them.
+ Replace deprecated set_inheritance_column
-commit 2bd809bf8651c858bf6a6e6bd295ce0125ea9849
-Merge: 1b47f72 58f3dbe
+commit d288b7a2ea925900ab2639541fce9c63105f62eb
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Merge branch 'master' into bootstrap
+ Fixes the page editor display
-commit f7f5515f196d9403f24e68c5358c8fc4caa9fe2d
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit f4a277b32f0ad8664bd20fa3f9419d8da68e76b1
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Allows admin redirects to act like an URL shortener when posting an empty from.
+ Replace prototype_legacy_helper plugin with gem
-commit 94a56cef7d035c3f8d0748982ed425f472a26c88
-Merge: 2bd809b f7f5515
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 63de8bb1603d65ebcd7a858184ca03a5b167451d
+Merge: f4a277b 7e9e027
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Merge branch 'master' into bootstrap
+ Merge branch 'master' into rails32
-commit 3512e92a210df6e2543e5d4006af22d903d916f7
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit c45001b118287d0f7caf6a5382d7ce119f4697fc
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Removes Ruby 1.8 specific tests
+ Remove completely unused Sidebars module
-commit 2715b5ad5a5adecdbf4787f7edb3f8a8eab70fcb
-Merge: 94a56ce 3512e92
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit a6428456fa93377dcd132941c29854f98e19fa4a
+Merge: 7e9e027 c45001b
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Merge branch 'master' into bootstrap
+ Migrate to Rails 3.2 [merges branch 'rails32']
-commit 75a6137260b74156aaabc9dd0740fd4df19805cd
+commit 85479ab6cdbe28f8a1c71c0dabe0e765d784c474
+Merge: d288b7a a642845
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Updates login, account creation and password recovery
+ Merge branch 'master' of github.com:fdv/typo
-commit 33ba179b26f54c1b9f1905764f329f9669df792a
+commit 3a53d4a9b956989aa69e79849c3e5da14ab68502
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Make the login form slightly better. Sometimes it's just a matter of connceting the dots.
+ Moving to mysql2 gem.
-commit 2128ad4e3a5b25670d22396009e2e8b9528614aa
+commit 9d7aace1d95621184cc587d16ba3f761d08dc82d
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Better omments display
+ Since we're doing an adapter specific test, we need to move it to MySQL2Adapter as we've switched to UTF-8 friendly mysql adapter
-commit 1f9fe927c745e8c88511e770475f7dbf9d600c5b
+commit 1ad850866907fa1da4fe695ac1358a047991433f
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Moving pages to Bootstrap
+ Adding pages previews since a (dead) link was already existing in the admin.
-commit e514bf2353aa2214eb0e56f330cd01c44f9e4923
+commit 980480b19836a9503115c7be53a6e6c5cef923a7
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Resources listing to Bootstrap
+ Fixes bogus editor display
-commit 8d652589ab38ad141eb0848c60036730f80ed8c0
+commit 8c241b582e1484f855bee8b122e3e6d45b719fbf
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Categories now
+ Adding image button for documentation
-commit 8d409b1abc4e27f136f03d8e117295cfaf30b62b
+commit f82ff62211ab5e252190707da25c8450e4b43e77
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Tags to bootstrap
+ Adds setup screenshot
-commit 959a0dd65d3c865ccb4cf6b22d98ddb6dcee60f8
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit d88eeb3b5ab94c837acb6c2c9da71f0fc1f29572
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Settings and users
+ Work around matcher creation weirdness
-commit 9d8c05849b2f3590efc55b7235d90eb729622a38
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit b72cf823d339a7e7b55a42e4dc0b4bbecbcdbbd0
+Author: Matijs van Zuijlen <matijs@matijs.net>
- New editor for articles
+ Move helper bits to ApplicationHelper
-commit 1c6d8dae3f98473540ca7454c10fd1e3626e4686
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 4f73fe370c5c43895ebac890720356fbdb68d6e6
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Adds new editor for pages
+ Allow stand-alone running of view specs
-commit 1d94c294eaf2b833c4e2429117a30f9755e18eaf
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 19d3afd7329d014d37cf0f0ea7c8788b1f6e107a
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Improving the editor a little bit. This definitely needs some cleaning and... to be refactored
+ Use build_stubbed in comment spec
-commit ba172af2df45c9e741ab0bcca3925c3387c479ad
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 8a165e00e77877b47fa85c49f152726829311d92
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Update to the main editor. Kinda like the way it looks like now, but lots of cleaning still needed (plus a major headache generating bug found).
+ Use build_stubbed in content model specs
-commit ae0f789c0ffefb8db6d603503757faeed92c8f3d
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 4805e8afb6486fa8758f0f6f5b6c95f21685e795
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Updated my TODO
+ Stub out blog in comment specs
-commit 2013a32dddf8dc982032da20c05df286f8ff36ef
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit afc3cbd3c8874acaf7aee5f7809d1d2771b61a34
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Fixing the specs. Removing useless specs as we don't rely on tabs anymore. I, however, need to add some more checks there, but on another way
+ More use of build_stubbed in comment spec
-commit 7353d89e1e8094d31942288dc543df7987c6796f
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 5aa39d58533c2298b2473d91342e1df4ed81029a
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Fixes a bug setting up a post as published everytime you edit it even for a draft
+ Fix view specs that broke due to change in blog stubbing
-commit 85785ac752e3dee0c5fb18eb5a8c547f0794a303
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 4191f527b15facdc4596b64b82679458068acb57
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Fixes comment moderation when using Akismet
+ Move article_links helper method to ArticlesHelper
-commit 76f0e0769520b5fa3cdafdd555e03a094be498cc
-Merge: 7353d89 85785ac
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit d67263a6a5e74049ddf0a109301176f2b9d1bf11
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Merge branch 'master' into bootstrap
+ Automatically stub Blog.default with stubbed blog
-commit 2006bffbfb73e54782d77ac91b732c2f81f2ea1f
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 0d6ce426c85bd5dcf335313396fb551d70ec9a52
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Fixes categories views
+ Speed up article index view spec through the power of FactoryGirl
-commit 7bd4ad30c702e3cafa475b0e13971afd6a506dbc
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit c0f4f8dea7e18f13b72f142d1d679e4253ea63db
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Porting post types to Bootstrap
+ Ensure a stubbed blog has a stubbed text filter
-commit 679345450ba451c58fe14430d5e73ba376d6b661
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit fad48dafe49fa69c9fe36cc688d805033afa165a
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Removing legacy use of subtabs_for
+ Make sure text filters exist for comment clean up specs
-commit 86a50e46a1c5604f2c0b130e9d5b70d90a82b1c7
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 572885ebfcf3d974835bad19d7cd790c48fce8d9
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Fixing failing specs on post type controllers
+ Make migrations work again
-commit 5d4bdec10d4a15a279f16b90e86206b14f48adf5
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit f4e5378ff80773b5d9d02ae4b25812a300a8bf1a
+Author: Matijs van Zuijlen <matijs@matijs.net>
- This one fixes the way articles are displayed in the administration and repairs pagination. I need a way to test this, YAF?
+ Make ping specs pass
-commit a5fbcdfd46a382669258f9d861b159b18ea7042b
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit d24f3ce8002acb801900f23ff00de75eea620dc1
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Updating TODO
+ Make text filter specs pass
-commit 54f82caf6e0883a1313cb13c159265df952ef16f
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 049db1bff24beadecb711525fba0c127aa6483c3
+Author: Matijs van Zuijlen <matijs@matijs.net>
- I'm pretty sure someone will be able to tell me why we translated the spam states straight into the state machine, because I f%$#g don't see the point. Plus it breaks all the filterings and display admin side.
+ Remove useless setting of text filter in article build
-commit a59ae1e6ebffce6adf9c5d1ac730ec846ab0ee9b
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit d3b680e7e0e144b18da8c12e1a46aa4a8c19882d
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Adding per state filtering on articles listing + better display for drafts.
- - default: everything but draft.
- - published articles
- - drafts
- - publication pending
- - withdrawn
+ Fix comment spec
-commit 8bfc7ed75b0df72d7aec2249c2f9528c617ec23f
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 11c38f36464b56e61d958e484cd60493c7e13cb0
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Drafts should be displayed like every other article
+ Fix backend controller specs
-commit 57fd4f07e076c8debb4fb845912625dc62270d85
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 0f53710014f312d00734f770db9a993bb3a5de24
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Drafts should be displayed like every other article
+ Limit number of articles controller specs that use render_views
-commit e87d50e0a16ecafe14bcecade6bdc5c604530bb5
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit ff05d49951d7ed1e830b42be7b5aa027ee8a2406
+Author: Matijs van Zuijlen <matijs@matijs.net>
- One should run spec before commiting
+ Move page header to a partial
-commit 1324f8d66a2acd07d3cd26511f4a9e8bf476e253
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 96d32f2c15c274f133555fde6c4565730388f927
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Fixing the way permalinks generation work.
+ Move test for tracking field rendering to page header spec
-commit 0fe87923402fad205ffa7ff71990bde5d2271c5d
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit a22dcc995edd76ce9f66dcf79e72a51f31347c12
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Fixes the way autosave displays buttons:
- - destroy this draft should only appear at autosave and when editing a draft
- - destroy this article should only appear when article is not a draft
+ Simplify article controller spec set up
-commit c53eeeca3fb0b07d80328617d7da301eb24d4dd8
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit f2154b6108ce0446bfab0ec251be7386240f707d
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Updating SEO views
+ Clean up model factory calls in articles controller specs
-commit 6dfb0e4aeb24ff6e2615750fa639fdf1d30a27fa
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 08525591662793d2cac077f3dcef9e2abb750626
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Cleaning some code, removing some unshared partials.
+ Configure Travis CI
-commit 4aac6bba0a7d13e316a1f85b18c60d97e66c51a1
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit da0db455ba42bf5ed64a7ad38d58b303b6f71bc1
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Doing some cleaning in the detroy process:
- – We don't need multiple destroy files when they all share the same code, excepted a message which can be defined from the controller name.
- – An old chinese master once told me "the earlier you return, the better it is", so I reverted the conditions in the destroy methods, which seems much more sensible now that I think about it.
+ Stop ignoring the db schema file
-commit 28c1ce20acab6c87b9d2a1553fd4fe677b7e34b9
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit ab43bf4d33b4d4b3b8f279466a2d3a8965c9515c
+Author: Matijs van Zuijlen <matijs@matijs.net>
- Makes the redirects management work like categories and tags.
+ Speed up application helper specs
-commit 48922b2b1a39ef2702801d71f34b34749256ad7f
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit bd6f82f9839c16335673cf48e8a7350a4359b264
+Author: Matijs van Zuijlen <matijs@matijs.net>
- I may have forgoten to add some files in my last commit.
+ Switch to timestamped migrations
-commit 25149602241184d3b80d5e537cf54d68e509818c
+commit d424724218fcc680f771f38f3ddc037502b8d2a0
Author: Matijs van Zuijlen <matijs@matijs.net>
- Use simplecov instead of rcov with Ruby 1.9.
+ Remove code for old Ruby
-commit e24c3e5ac0d579d0048b85964802f836acf45b25
+commit ae869595f14d490fb03da48cecfd44c00e2a0bf6
Author: Matijs van Zuijlen <matijs@matijs.net>
- Make specs pass.
+ Clean up plugins configuration
+
+commit 5c72ab397548480e07d71911ab6fe166f9445aeb
+Author: Matijs van Zuijlen <matijs@matijs.net>
+
+ Wrap up first 92 migrations and move their seed data to db/seeds.rb
+
+commit 90125d4d9e7acbbe606b1bbc8ab533e9edd98ab7
+Author: Matijs van Zuijlen <matijs@matijs.net>
-commit 2e441914a873e5e4a83de3cd47977fbd55d9c756
+ Remove unused code from migrations
+
+commit 61b29dd8ea6203971e2fb08bc5507fb29853d9a6
+Author: Matijs van Zuijlen <matijs@matijs.net>
+
+ Update seeds to match latest migration
+
+commit 20dcdca35e0fee7146c8a97327f10248f9fef68b
+Author: Matijs van Zuijlen <matijs@matijs.net>
+
+ Allow migrations to succeed before seeding
+
+commit cd35a4b3dc3eef4fe10c13ba7680c2748b1b3e01
+Author: Matijs van Zuijlen <matijs@matijs.net>
+
+ Fix formatting nits
+
+commit 5f6e99f1c5576c30357a63d664141cbd07fa4272
+Author: Matijs van Zuijlen <matijs@matijs.net>
+
+ Delay creation of first post until blog setup
+
+commit 916479811a154c0b282591ae4380de548a235271
+Author: Matijs van Zuijlen <matijs@matijs.net>
+
+ Reciprocate relation between rights and profiles
+
+commit b46041e86c67038b68b5e153f4585a11ed9e8941
+Author: Matijs van Zuijlen <matijs@matijs.net>
+
+ Allow new settings on Sidebars
+
+commit 63a39f571ecf2e1d4d182b4c81a69d02ce0480f2
+Merge: b46041e 1ca0d7d
+Author: Matijs van Zuijlen <matijs@matijs.net>
+
+ Add option to change title of archives sidebar [merge from 'chrisboyle/master']
+
+commit 9f407512c745545b94a131ea7582fba51280a9a5
+Author: Frédéric de Villamil <frederic@de-villamil.com>
+
+ Fixes settings controller migration detection
+
+commit 1a119d004c923cc1f8e0ef55ba0ae0bb9f54473a
+Author: Frédéric de Villamil <frederic@de-villamil.com>
+
+ Replaces our old upload thing by Fog storage
+
+commit d5899c047f9ec1e8212db0061e6cc84f2e5a4999
Author: Frédéric de Villamil <frederic@de-villamil.com>
- We said we would not support 1.8 anymore
+ Adds Amazon S3 uploading capabilities
-commit f85c206d77dab9ad4da1c3dbd8bea44cf3f48a84
+commit d8fb4ed452e8fb8fc5cbfe8478d6b0dc293b76aa
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Fixes the way we generate permalinks.
+ Adds Amazon S3 Support for file upload
-commit 67a98ff39aa946e769e390078dfc031dd842e3d8
+commit afd888e6fa3d4e28ebc3ddba2e215978b81eb3c2
+Author: Soon Van <cog@randomecho.com>
+
+ missing the h in the lithuanian definition
+
+commit aab5383ee810e8bb5689a9468fa271e619ce1d50
Author: Matijs van Zuijlen <matijs@matijs.net>
- Avoid confusion between @feedback and @record.
+ Provide description for spec with matcher that lacks it
-commit 98ed36be1f691a047c074f99f6aed7bc488c3b4f
+commit 7a28a3d05d6f0d1dbe7126a6aa3fb76220e28b05
Author: Matijs van Zuijlen <matijs@matijs.net>
- Allow newer versions of RedCloth.
+ Make Resource#upload work when we only have the bits
-commit d439191413dcc403883a753ae317f93c2ce3b223
+commit f5c964a4969e98e1b6ba2218f0a7042f370e0ba0
+Merge: 7a28a3d afd888e
Author: Matijs van Zuijlen <matijs@matijs.net>
- Cause bundler to fail when database.yml does not exist.
+ Fix typo in English language names [merges branch 'randomecho/copyedits']
-commit 7dd2503b932ff2e7c51f570be38645266e8b9e53
+commit a8ce16c3b051a316088a18e0b8d3c92fdedb1933
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Fixes display on account creation and login
+ Upgrading bootstrap to Bootstrap 2
-commit 28c9364190f27e6cdcea07cf1d8baf758db4b6ba
+commit f525bce0de71bdc92866eaf4046d8dbb142b27f4
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Moving theme selector to Bootstrap
+ Moving login, password recovery and account creation to Bootstrap2
-commit 3f66fa3775b9127d9a430a947c0765b9bf45613b
+commit a35d4f465ceceeb26ded542df6d1b927f47c4426
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Adding sample database.yml for every supported engine
+ Upgrading admin layout to Bootstrap 2. Left nav is to be redesigned
-commit cd31dbca13ac2e6eb154a10b040c5b679c518b3b
+commit 38a01179ee5707fcd1cadb543849ced9049029ff
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Updating sidebar interface
+ Moving settings to Bootstrap2
-commit 379458c7e0787b18763511807f83333ce31ef7cc
+commit c19be92ac12d7f0aa4333fa9e89904a25fafa516
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Removing dead code
+ Moving users out of settings
-commit a3e71a1981ae6b9bfcf65b5cebe08c31f90aafa6
+commit 44dbc7cdd011f743fd8528cb8c4baaa545994ed3
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Database settings
+ Porting left nav to Bootstrap 2. May need some tweaking in the future
-commit e2ac79c612bb1f372c284d7033bf783fd91d2f76
+commit ee1428801d16e16e81600a2deec93113316f4c6c
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Adds the media back into the editor.
+ Fixing left nav
-commit 545f18c9a5a446c0401bdfac8b8d2fcf1ced126a
+commit 11c49d2f5089ad039d991f088429e5d95c50f09f
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Doing some cleaning in the CSS, they really deserved it.
+ Updating dashboard
-commit f332a2d9c95f06c0956555304876d78f4a03915d
+commit dedc63330dac22628940793e1b175f7ef823d342
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Adding Bootstrap as a new default theme.
+ Porting articles to Bootstrap 2
-commit 2c2f5e38c14b36cdd594a96fd3374530439967df
+commit 0f3019d611363cda7bc5f0b6690524cbab769e0e
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Sometimes you don't clean enough, sometimes you clean too much. In both cases it's a fail
+ Porting feedback to Bootstrap 2
-commit 9f3d3208d087384c883fbe52db8d80eea9ad7673
+commit a472ec61545d87167e25fd4d6b0f12f1e3f1e1a3
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Updating theme and adding theme documentation
+ Porting categories to Bootstrap 2
-commit 61dbe33327801cca6e0bde342e2d1dc1713bee02
+commit 4a1b8b40a701dcaf22c4abbad19af57b837bd1f8
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Adds comment count to Bootstrap index
+ Porting tags to Bootstrap 2
-commit b2b4a9f085aec99631eb70366f6c85657a939d7a
+commit 4add82be41f0c8dac9f53f2c3c550cc3168d0263
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Removing the theme editor, for now. It will probably come back under another form later.
+ Porting post types to Bootstrap 2
-commit ece334017de9fae82649a8321cefe4cb50d34d7b
+commit b894f38cc9ff8cf3dfbec8f734f21c65ac907b4c
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Ugly fix to make the menu working. One more thing to fix and I can release
+ Porting redirects to Bootstrap 2
-commit 2a484a1caa91cc22051b6643823b6e8920ccf2c8
+commit 6a9b8b665a65ddded1aad271f5faf82b782aa6f2
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Fixes the user edition
+ Porting pages to Bootstrap 2
-commit 82b7ac31e34b090ecfc422e17e570e91b70b024f
+commit e6916dc9152a54e6a4e50f503f911845de16c6f7
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Fixes indent
+ Porting resources to Bootstrap 2. This part definitely needs some rewrite
-commit 5253418d27a608ab8040dffdfb156f55b57cc061
+commit 7686eed856b1d8de3dbc8984c19dafcf28a8c15c
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Restyling dashboard
+ Porting Themes to Bootstrap 2
-commit 698a1ee2eb7e94c32de48889f056c6a094cd3592
+commit 2d9512e1c702696a5e9e05482c7f2c838c286467
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Fixes comment listing style
+ Porting sidebars to Bootstrap 2.
-commit 1653c3470c1719a2d34145f5fb48cc5f5f26ac54
+commit bdb895eaaaf1871e5438699dc2722b6b3109e5eb
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Hmm this should not be here
+ Making articles and pages look alike
-commit b817335db1f1921b1c38bf4936ea24fab8dacc18
+commit f323bfbef9a4d6a44ec36f6e71967defa0a3d66b
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Fixes admin/comments edition style
+ Porting users to Bootstrap 2
-commit 004259923a91866f0c7c0e0ad2f484c3a7a2e07b
-Author: Matijs van Zuijlen <matijs@matijs.net>
+commit 86ae236f655ac612608b0bd3e43ba3feac9e6f41
+Author: Frédéric de Villamil <frederic@de-villamil.com>
- Remove unused extend ActiveSupport::Memoizable.
+ Porting SEO settings to Bootstrap 2
-commit bbfca4f7df86deda245d2b3bcc3420a1e7068fbf
-Author: Matijs van Zuijlen <matijs@matijs.net>
+commit f61735ef0b9eb98389ee1cb9283d6959c16e2249
+Author: Frédéric de Villamil <frederic@de-villamil.com>
- In the normal case, the password form is not rendered.
+ Updating error messages style
-commit b69b91b429c5fa75b766d9466f6324db2164630c
-Author: Matijs van Zuijlen <matijs@matijs.net>
+commit aae766fe55074953a99552f98a0c89cc89b7af84
+Author: Frédéric de Villamil <frederic@de-villamil.com>
- Clean up User model.
+ Update articles listing display
-commit 202947f405fb7874b6957a0758db68e9a3d74fd1
-Author: Matijs van Zuijlen <matijs@matijs.net>
+commit 300e633fffb87253abc2176460e5c670eb124c2e
+Author: Frédéric de Villamil <frederic@de-villamil.com>
- Activate SimpleCov.
+ Porting setup to Bootstrap 2
-commit b5b0da2e85eff3cca43f2a079a1eb7906a6e1b8b
-Merge: b817335 202947f
+commit 757b9b65a0fb8dd8bbe5df60838d7a8fbc6db827
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Merge branch 'master' of github.com:fdv/typo
+ Fixes display of textarea in sidebar settings
-commit cb44d16b47cc50f470ca1b246d88ea97e1949658
-Author: Matijs van Zuijlen <matijs@matijs.net>
+commit 0f0ec30af03e401af5bd8f1de351268ae0f06850
+Author: Soon Van <cog@randomecho.com>
- Remove outdated comment.
+ congrats message on setup should end with s as a spoken expression
-commit 1bccf13c52178ee5e7785c75cf09dc91234734fe
+commit e1d97b7bd5efd6c7a1d9ece55c877143f10630fd
+Merge: 757b9b6 0f0ec30
Author: Matijs van Zuijlen <matijs@matijs.net>
- Disable thread safe Rails in production.
+ Fix post-install congratulatory message [merges 'randomecho/copyedits']
+
+commit 059c46193ac6396249136f805d2b8babb6eb4369
+Author: Soon Van <cog@randomecho.com>
+
+ proper casing for twitter, url; match sentence casing of headings
-commit fb740cf3c2c13b71d5c2c69596134ff851af985d
-Merge: b5b0da2 1bccf13
+commit 4deb03f7f698dfe6a308dc301515a2dffc16bca1
+Author: Florian Staudacher <florian_staudacher@yahoo.de>
+
+ flickraw require changed
+
+commit 2089756a374feca86a1e163411fa0649d1234b22
+Merge: e1d97b7 4deb03f
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Merge branch 'master' of github.com:fdv/typo
+ Merge pull request #90 from Raven24/patch-1
-commit c0e228d7a75970e67cce4597e593f8a1a347c74e
-Author: Matijs van Zuijlen <matijs@matijs.net>
+commit 095dddb427c7974fba0187c4d473ba3ea042779c
+Merge: 2089756 059c461
+Author: Frédéric de Villamil <frederic@de-villamil.com>
- Clean up Content methods.
+ Merge pull request #83 from randomecho/copyedits
-commit d7f8b19644f87f5feb952ebd99f807b052b960a4
+commit 0dd82ad3b806b2c7c914e91c977fcf44389b1a57
Author: Matijs van Zuijlen <matijs@matijs.net>
- Remove useless calls to #changed.
+ Only show feed links if a sensible link is available
-commit 7211858531958703b48b2323400fc80ad41a4cfb
-Author: Matijs van Zuijlen <matijs@matijs.net>
+commit f9266fee18c5fa83ebd56bc2ed04576c136eacbf
+Author: Xu Yefeng <rarexray@Xu-YefengmatoMacBook.local>
- Remove some unused methods.
+ Add simple chinese language file
-commit f5d0883587b8f9c9849cf3a2e14ea85e607628f0
-Author: Matijs van Zuijlen <matijs@matijs.net>
+commit 64734b33c6433e5ece636c9737b79cf2b9fe022f
+Merge: 0dd82ad f9266fe
+Author: yaf <yannick.francois@free.fr>
- Get behind me, Satan!
+ Merge pull request #93 from rarexray/master
-commit a1fa1a41194d9939aeec24a10a06fae98f209978
-Author: Matijs van Zuijlen <matijs@matijs.net>
+commit 241cdc43a489d911a92b7dca7d99cf97736bf9cb
+Author: Yannick Francois <yannick.francois@free.fr>
- Use Sanitizable in the Article model.
+ fix some specs
-commit 5174867278bbffcd589c4dd190334d817c9d85e6
-Author: Matijs van Zuijlen <matijs@matijs.net>
+commit 2b75ef93f3eb6ab6e750b1a70c17072ecd1d82ab
+Author: Yannick Francois <yannick.francois@free.fr>
- Remove unused themes helper.
+ remove unuse autotest discover
-commit b2b43bd8afdc88364a47ee60e636974ae8dbc6c9
-Merge: fb740cf a1fa1a4
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit d1a5802c3ee1a7683a0b4c81f669e03d3565c379
+Author: Yannick Francois <yannick.francois@free.fr>
- Merge branch 'master' of github.com:fdv/typo
+ remove unused to_param methods
-commit 7551885b16783c257bf80a199a516d07167ba10d
-Author: Matijs van Zuijlen <matijs@matijs.net>
+commit 6c0f8d18a0d6fdc6eacd6ef104c111bd368d5ae2
+Author: Yannick Francois <yannick.francois@free.fr>
- Make settings writers work during #initialize.
+ fix typo in gemfile about link ti prototype legacy helper lib
-commit 3499c7ae0040a78ee55c8bcaab4240a834e86d44
-Author: Matijs van Zuijlen <matijs@matijs.net>
+commit 49cdf0cbbd999b6a3e008ea2671d6ffe895d80b7
+Author: Yannick Francois <yannick.francois@free.fr>
- Avoid accidentally loading old drafts.
+ remove unused stuff and unecessary code
-commit d694c2a28c4e722294ef19862159a768f630a8c1
-Author: Matijs van Zuijlen <matijs@matijs.net>
+commit 44af3bc70a5fc58acfb92c92004d731ea0e82c93
+Author: Yannick Francois <yannick.francois@free.fr>
- Small refactoring.
+ improve nofollow management and test
-commit 6668930865b59b4379733176168e8fdc5d125cfd
-Merge: b2b43bd d694c2a
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 9d99f8192424dcef8a87ea9b48d79f40199866a3
+Author: Yannick Francois <yannick.francois@free.fr>
- Merge branch 'master' of github.com:fdv/typo
+ refactoring spec syntax
-commit 52cce13a9adefc8b0a04bc0e71f3dafbc0d07d60
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 4e30c7eb2bb027e43325b045e2109d544e5168e0
+Author: Yannick Francois <yannick.francois@free.fr>
- Fixes broken login and user creation.
+ remove unused spec
-commit 476837135b9cb9da63351b5e9bdf4beb022bef03
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit ceecd3690886f37dd6b89cff8569e30d9e873487
+Author: Yannick Francois <yannick.francois@free.fr>
- Fixes post types display when there is no post type at all
+ remove unused helper method
-commit 43d1545ee9c2180eb21b0171473ad27eafe7f732
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 16a01560e2768008dfee1e343775048bb0d264b3
+Author: Yannick Francois <yannick.francois@free.fr>
- Moves redirects from settings to articles. Adds consistency to the menu
+ remove unused method from application helper
-commit 591eeb2e32a3c4e9ef5668b9d95b544177091512
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 6a451065dd4dfbb23da6a819975a1a69e859154a
+Author: Yannick Francois <yannick.francois@free.fr>
- No need to call layout "administration" in every controller as it is already called from the parent class and therefore inherits from it.
+ move resource add and remove stuf
-commit 0abd858faa08dd03bcf47f87958b89a24ab030cb
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit e8313e629e4111e91225ac8bee397eac30de62fb
+Author: Yannick Francois <yannick.francois@free.fr>
- Adds some style to autocomplete
+ move code from controller to model
-commit 82c73cd62c3fc616cb44660d9ac6b4dfbe53ddb9
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit 7518772657daea3462feb9106f2c08822b3a8d2e
+Author: Yannick Francois <yannick.francois@free.fr>
- Removing theme catalogue and mentions of Typogarden.
+ move save_attachments to article instead of controller
-commit 0dea7594acd3aa6c107e84ba4ea0d82a2ae1c624
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit a07f664c3e978251c7e905eeb30c46760f63a743
+Author: Yannick Francois <yannick.francois@free.fr>
- Removing theme catalogue from access rules
+ add set_author to article instead of keep this in content controller
-commit 4f94fd88d28be2d5cafc1200d31a48d3c12605c0
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+commit be6b97048b9324a3aafb87283818444142157a2c
+Author: Yannick Francois <yannick.francois@free.fr>
+
+ remove method that just put behind code to fake reducing other methods
- Fixes a bug in the dashboard
+commit 57d7c393352fde67bcd3df6f2a6177a48e164568
+Author: Yannick Francois <yannick.francois@free.fr>
-commit 9f5180e903db4a9923e13241597a0d6f171d702f
-Author: Maarten Mulders <m.th.mulders@xs4all.nl>
+ fix typo in previous refactoring
- Translations and one grammar correction
+commit 05f4dc148e08a18aed299baaf33489cc1a235ec1
+Author: Yannick Francois <yannick.francois@free.fr>
-commit 83d97d0db9c7f17e600db4d8f154a0d5431f4eb4
-Merge: 4f94fd8 9f5180e
-Author: Matijs van Zuijlen <matijs@matijs.net>
+ remove duplicate helper
- Merge pull request #61 from mthmulders/master
+commit 77d2de0f4514c13919a4d20ea4ee89267272edec
+Author: Yannick Francois <yannick.francois@free.fr>
-commit 3f9753c63aa9b6228f9af28a48b7fec66140bd9e
-Author: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+ refactoring to remove duplication
- Make sure that migration 103 does not destroy tag association.
+commit 04d4b945c077f71da81e5707469101f24212e579
+Author: Yannick Francois <yannick.francois@free.fr>
-commit 5ae108a4b3077a24e956daf818655d10b4e49b72
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+ improve really_send_ping method
- Fixes issue 55: ActionView::Template::Error (settings was supposed to be a Hash, but was a String)
+commit b5b6976c5b08c806ec203f2a196eceb83ec7b127
+Author: Yannick Francois <yannick.francois@free.fr>
-commit 63843aa9b75b7677aebfc125e1ad44873ede3356
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+ add specs and indentation to prepare a refactoring on search functions
- Fixes specs for tags autocomplete
+commit 7afaa04229ef94584e0610b537864f0b17e2b782
+Author: Yannick Francois <yannick.francois@free.fr>
-commit 93f4196ff29f45a65a7571906f51077a22580376
-Author: Maarten Mulders <m.th.mulders@xs4all.nl>
+ move set default to default value on getter...
- Some more Dutch translations
+commit 6ff4e17060a7c1ca9805e1c2c4acc9bcd415fc9f
+Author: Yannick Francois <yannick.francois@free.fr>
-commit 7e4f07746f3eb63910da558746aa250582bfc5ab
-Merge: 63843aa 93f4196
-Author: Matijs van Zuijlen <matijs@matijs.net>
+ remove duplucation about password generation
- Merge pull request #64 from mthmulders/master
+commit 1290419ca4dfc43ed0c9bf6d8db8997e9a04a01a
+Author: Yannick Francois <yannick.francois@free.fr>
-commit 4c59f992238bfb7df820dda12da4d7a000ee69ea
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+ move method from content to the only class that use it: article :)
- Moves permalink sanitization to String with a new to_permalink method.
+commit fafcfb83f806505994c8ae85d09ca5b504e3328c
+Author: Yannick Francois <yannick.francois@free.fr>
-commit 7db1582a2e1802fc8d264cfaf074d80a00aed2ad
-Author: Frédéric de Villamil <frederic@de-villamil.com>
+ code cleaning around xml controller
+
+commit e46ac7cf40ccea4e578b4ba1137171a7a4e953ec
+Author: Yannick Francois <yannick.francois@free.fr>
+
+ remove unused scopes
+
+commit 3bba31473e3e727aaf819f0a46e409d4e58128b7
+Author: Yannick Francois <yannick.francois@free.fr>
+
+ re add scope (use in a f**ckin eval expression that we need to remove)
+
+commit 04d3d5792a664f9ab6a0fbcf5b343e0ebe0ffa3f
+Author: Yannick Francois <yannick.francois@free.fr>
+
+ missing scopes...
+
+commit 2a4cc1cebd8796bce05a10d3c8de096dc604675f
+Author: Soon Van <cog@randomecho.com>
+
+ Consistent UI in admin sidebar for Feedback section - #98
- Force categories to use to_permalink
+commit 6f3ab89320f2dc522854a217060d718f90b1d2ce
+Author: Yannick Francois <yannick.francois@free.fr>
+
+ change find_by_published_at.
+
+commit 60b3603a8f488f009cba5ac37e376a820bb033b6
+Author: Soon Van <cog@randomecho.com>
+
+ Show all articles, including drafts, when using default admin filter
+
+commit 0a984d963baf574ea2766d0c760a780fc04ccfde
+Merge: 6f3ab89 60b3603
+Author: yaf <yannick.francois@free.fr>
+
+ Merge pull request #101 from randomecho/issue-87-show-all-articles
+
+commit b8d4081ce50e9c3d7b284f3578dfd5fb5002d164
+Merge: 0a984d9 2a4cc1c
+Author: yaf <yannick.francois@free.fr>
+
+ Merge pull request #99 from randomecho/issue-98-feedback-vs-comments
+
+commit 74341a9620d1fc982c63ae8cd1d27b6e9594a226
+Author: Yannick Francois <yannick.francois@free.fr>
+
+ upgrade rspec and rake gems
+
+commit 997098850eb792cc76d5a317a591539191d89105
+Author: Yannick Francois <yannick.francois@free.fr>
+
+ fix bug on rake package
+
+commit eb530275149b0c14b050f752eb4ee742480c9373
+Author: Yannick Francois <yannick.francois@free.fr>
+
+ just add spec and little style refactoring
+
+commit dc230cb186787b7b6dc826718e2d8e047b63c386
+Author: Yannick Francois <yannick.francois@free.fr>
+
+ remove duplication
-commit aae592454fbc95e129aa3ca88eb3f3eb0b48a3ee
+commit e8069b5960c4bbbc9da34d03abe74426a5fda60a
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Fixing specs for pages. Moving permalink related specs to model which is where they should be
+ Fixes a small UI bug in the login page
-commit cd2e895be9f312c8830dc33620176c59e15d4795
+commit 8363c8a0946dbe796bffc5d5466bfb9ac1196c5d
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Moves the permalink generation to model
+ Fixes a bug where article are not displayed the way they should be
-commit 564c0a6740851ec221b9eec669f6c8a08464d01b
+commit 6cb09f995b9f6cf3382de6420bbe956e72dd75a2
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Adds permalink field to category creation
+ Replaces \w with [[:alnum:]] to avoid acentuated tags to be split on the accentuated character
-commit 5d2c6dcbe5b14cf52c37b6b6176e0932b737f355
+commit c3e111ed2f87bfcdd06a54db2fb74d66c44d6741
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Fixes permalink not being correctly updated when updating a permalink. closes #62
+ Fixes RSS parser so it takes all published_at formats. closes #96
-commit 75c407378096bfc211d33349145f2a08562738ec
+commit 3f90a0698ef651cb53e8781044148871d62e3f17
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Fixes the comment management bulk operations. Closes #46
+ Since we don't want Typo users to mess with command line, we have always setup the blog model and initial data when trying to reach it at first load from the browser. Since we moved the initial schema generation to schema.rb and initial data to seed.rb, this didn't work anymore.
-commit 3139b2d757c8967b051f413d962e40e0a4052ca2
+commit f0566adada8908df67b4b18098933cea843fc4bf
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Makes article controller specs pass
+ Changes the path to redirects so the menu changes to selected status. Solves issue #94
-commit 3f8e52023821cc45268015a98d9f674606c98b52
+commit bcb52c4ea9539edc8e37e9a6c81d7871550a47e0
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Cleans access rules file, adds some more submenu for clarity
+ Page creation works better when actually called
-commit a1dd7990c9661db5e9ba6da1438803bb2a6c659b
+commit 06335be92c0eeb12b9a4d949f012dde5fa7dc000
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Changes the CKEditor theme
+ Fixing SEO titles not being saved and not redirecting where they should
-commit a1e70bb5837ad831576c170a59b93a6dd776c5c4
+commit 5446208df145944e721c587b892eed7c07de462e
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Makes the redirect links clickable (much better heh)
+ Fixes autosave not saving the text when using visual editor.
-commit 9272674bbfe83f7ade32dd56a78c496af774b5ca
+commit cf071695312f9569f74eb8c9c518860c5fc5e4e9
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Fixes CKEditor file upload
+ Gives the simple editor some love
+
+commit 3949648ae807e6ed4c95e6872ca9eb3d1a6d043f
+Author: Yannick Francois <yannick.francois@free.fr>
+
+ fix bug dur to a change in https://github.com/fdv/typo/commit/e8313e629e4111e91225ac8bee397eac30de62fb#L1R131
+
+commit 0549c06cb234d63b977dc13e78f7fb75ea5fe2e8
+Author: Yannick Francois <yannick.francois@free.fr>
+
+ add few specs to Admin::FeedbackConrtoller
+
+commit c9a7b524ff734261d3690451d1f6d8a8de7c9038
+Author: Yannick Francois <yannick.francois@free.fr>
+
+ move article method in admin feedback controller to prepare a extract of it
+
+commit 79d8919aa0ac80c1b2322807e77a9c4081837c74
+Author: Yannick Francois <yannick.francois@free.fr>
+
+ change admin/feedback routes
-commit abb2dcc5017dc6ba81332cb144972228302a05ea
+commit 40e85f1ea7e22e19329ae72a153f9c1bb62764a3
+Author: Yannick Francois <yannick.francois@free.fr>
+
+ remove admin_tools_for that no more use (?)
+
+commit 1db1e482820652856b81a2d2073aa17b096f0367
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Smells like 6.0.10
+ Switch to Rails 3.2.11, secutiry bugfix
-commit f768f674b88afe0fc6eb65469b60ec0b65b15e63
+commit 53c3fc62fdfac7a8a28fd1d7ee0cdebd019cd4c6
+Merge: 1db1e48 40e85f1
Author: Frédéric de Villamil <frederic@de-villamil.com>
- Release of Typo 6.1.0
+ Merge branch 'master' of github.com:fdv/typo
View
2 README.textile
@@ -6,7 +6,7 @@ It provides every feature a modern blogging engine needs: powerful themes, exten
Typo is free software released under the MIT licence and maintained by a bunch of cool people on their spare time.
-The current version is Typo 6.1.0 for Ruby on Rails 3.0.10.
+The current version is Typo 6.1.1 for Ruby on Rails 3.2.11.
!http://blog.typosphere.org/download-typo.png(Download Typo)!:http://typosphere.org/stable.tgz
View
2 lib/tasks/release.rake
@@ -1,7 +1,7 @@
# coding: utf-8
require 'rubygems/package_task'
-PKG_VERSION = "6.1.0"
+PKG_VERSION = "6.1.1"
PKG_NAME = "typo"
PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
RUBY_FORGE_PROJECT = 'typo'
View
2 lib/typo_version.rb
@@ -1,4 +1,4 @@
TYPO_MAJOR = '6'
TYPO_SUB = '1'
-TYPO_MINOR = '0'
+TYPO_MINOR = '1'
TYPO_VERSION = "#{TYPO_MAJOR}.#{TYPO_SUB}.#{TYPO_MINOR}"

0 comments on commit 54e741a

Please sign in to comment.