Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'stable' of gitorious.org:camelot/camelot into stable

  • Loading branch information...
commit ad6fc64cdb8367d20e2c37db3fafe50e2a64e55d 2 parents 69b0377 + d2abaf9
Erik Janssens authored
View
2  camelot/__init__.py
@@ -26,7 +26,7 @@
the Django admin interface. Start building applications at warp speed, simply
by adding some additional information to you Elixir model."""
-__version__ = 'master'
+__version__ = '12.06.29'
View
5 camelot/view/controls/formview.py
@@ -354,6 +354,11 @@ def set_toolbar_actions(self, actions):
toolbar.addAction( qaction )
toolbar.addWidget( BusyWidget() )
layout.insertWidget( 0, toolbar, 0, Qt.AlignTop )
+ # @todo : this show is needed on OSX or the form window
+ # is hidden after the toolbar is added, maybe this can
+ # be solved using windowflags, since this causes some
+ # flicker
+ self.show()
@QtCore.pyqtSlot( bool )
def action_triggered( self, _checked = False ):
View
4 doc/sphinx/source/migrate/11-12-30.rst
@@ -1,7 +1,7 @@
.. _migrate-11.12.30:
-Migrate from Camelot 11.12.30 to master
-=======================================
+Migrate from Camelot 11.12.30 to 12.06.29
+=========================================
The place of the default `metadata` has changed. So the top line at the
model files should change from::
View
7 news.txt
@@ -1,5 +1,8 @@
-Master
-------
+12.06.29
+--------
+
+ * ``camelot_manage``has been removed, since it did not contain essential functions
+ for the development of Camelot applications.
* Port the ``camelot_example`` application and :ref:`tutorial-videostore` to `Declarative`
Please sign in to comment.
Something went wrong with that request. Please try again.