Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 85aebcb
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Tue Nov 1 17:58:37 2011 +0100

    Picture in element layout fixes

commit 4b713d1
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Tue Nov 1 17:58:21 2011 +0100

    Fixes switching of standard and flash uploader

commit 962913a
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Tue Nov 1 17:57:59 2011 +0100

    Fixes a bug with single quote strings in update page notice

commit da87cee
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Tue Nov 1 17:20:55 2011 +0100

    Changes License to BSD and prepared readme for release

commit 67e3764
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Tue Nov 1 16:48:40 2011 +0100

    RSS Feed refactoring and fixes.

    You can now define elements that shroud be in your feed and mark contents as rss title and rss description.

commit 055dbaa
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Tue Nov 1 13:12:27 2011 +0100

    Standardset styling for searchresults

commit 7d0c30a
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Tue Nov 1 13:09:02 2011 +0100

    Standardset styling

commit 8c17a82
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Tue Nov 1 13:08:47 2011 +0100

    Refactored search results

commit 582d1ae
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Tue Nov 1 13:08:21 2011 +0100

    Error messages translation

commit 28d72c0
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Tue Nov 1 13:08:06 2011 +0100

    Setting trashed elements not public

commit b48ee02
Author: Robin Böning <robin.boening@nethosting4you.de>
Date:   Tue Nov 1 10:33:45 2011 +0100

    Fixes page caching. Closes #84

commit 235f497
Merge: 9ef37be f1d23e7
Author: Robin Böning <robin.boening@nethosting4you.de>
Date:   Tue Nov 1 10:14:58 2011 +0100

    Merge branch 'next_stable' of github.com:magiclabs/alchemy_cms into next_stable

    Conflicts:
    	lib/rails/generators/alchemy/plugin/templates/config.yml

commit 9ef37be
Author: Robin Böning <robin.boening@nethosting4you.de>
Date:   Tue Nov 1 10:08:57 2011 +0100

    adds description for icon

commit f1d23e7
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Tue Nov 1 10:05:08 2011 +0100

    Fixes cache sweeping. Closes #85

commit 89354cd
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Mon Oct 31 20:44:27 2011 +0100

    Fixes bug in standard set contact form view

commit 9c9833a
Merge: 62875e7 a04df11
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Mon Oct 31 20:27:07 2011 +0100

    Merge branch 'next_stable' of github.com:magiclabs/alchemy_cms into next_stable

commit 62875e7
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Mon Oct 31 20:26:26 2011 +0100

    Fixes a bug in TrashController where trashed Elements could not be rendered

commit a04df11
Author: Robin Böning <robin@magiclabs.de>
Date:   Mon Oct 31 00:36:21 2011 +0100

    fixes Issue #81 - render_elements method finds a Page regardless of the language when using fallback option

commit 2d5e80f
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Sun Oct 30 21:33:24 2011 +0100

    rc6

commit 9da9e8e
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Sun Oct 30 21:17:14 2011 +0100

    Fixes bug in where a content could not be updated via ajax

commit aca1a96
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Fri Oct 28 21:54:49 2011 +0200

    Radiobutton style and default for button enabling

commit c2ce897
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Fri Oct 28 20:47:38 2011 +0200

    Adding a small button class

commit fc7685f
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Fri Oct 28 19:17:21 2011 +0200

    Refactors plugin generator Rails 3 style

commit 8bbf373
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Fri Oct 28 17:45:01 2011 +0200

    Updating jQuery and jQuery UI.

    And adding new modules autocomplete and datepicker

commit 6244fa2
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Fri Oct 28 17:44:19 2011 +0200

    Slight layout fixes

commit fe8f3c7
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Thu Oct 27 18:22:34 2011 +0200

    Overlay bg color

commit 0104304
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Thu Oct 27 17:59:28 2011 +0200

    Some layout fixes

commit 0260d4e
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Thu Oct 27 17:42:13 2011 +0200

    Fresh new GUI

commit 1dbebc8
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Wed Oct 26 19:58:29 2011 +0200

    Reverts the changes of authorization files declaration

commit 36c929b
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Wed Oct 26 19:27:54 2011 +0200

    Fixes auth files declaration

commit 1fce9ca
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Wed Oct 26 18:08:30 2011 +0200

    Removes authorization_rules loading from plugins

commit 0d60344
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Wed Oct 26 17:57:00 2011 +0200

    Fixes issue #80: Installer fails under Ruby 1.9

commit 0b9b1fd
Author: Thomas von Deyen <tvd@magiclabs.de>
Date:   Wed Oct 26 13:50:15 2011 +0200

    Fixes Gem dependencies

commit a102009
Merge: 49515e9 81cff2b
Author: Thomas von Deyen <tvdeyen@gmail.com>
Date:   Wed Oct 26 00:43:03 2011 -0700

    Merge pull request #79 from masche842/next_stable

    Yaml-Syntax

commit 81cff2b
Author: masche842 <marc@zilia.com>
Date:   Wed Oct 26 14:49:16 2011 +0800

    changed syntax in locales to be compatible with psych

commit 49515e9
Author: Thomas von Deyen <tvdeyen@gmail.com>
Date:   Tue Oct 25 00:53:29 2011 +0300

    Update README.md
  • Loading branch information
Thomas von Deyen committed Nov 2, 2011
1 parent 21b4bdb commit b89af99
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
2 changes: 0 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ About

**CAUTION: This branch is a pre alpha development branch. For productive environments use [master](https://github.com/magiclabs/alchemy_cms), or [next_stable](https://github.com/magiclabs/alchemy_cms/tree/next_stable) branch.**

Alchemy is a fully featured Content Management System (CMS) with an gorgeous Userinterface.

Features
--------

Expand Down
10 changes: 10 additions & 0 deletions app/sweepers/pages_sweeper.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,14 @@ def check_multipage_elements(page)
end
end

def expire_page(page)
return if page.do_not_sweep
expire_action(
:controller => '/pages',
:action => :show,
:urlname => page.urlname_was,
:lang => multi_language? ? page.language_code : nil
)
end

end

0 comments on commit b89af99

Please sign in to comment.