Commit Graph

30 Commits

Author SHA1 Message Date
Mario Visic 8ac8289394 Merge remote-tracking branch 'origin/master' into rails_3_1
Conflicts:
	app/models/content_instance.rb
	config/locales/admin_ui.de.yml
	public/javascripts/admin/inline_editor_toolbar.js
	spec/models/content_instance_spec.rb
2012-01-15 00:02:46 +10:30
Mario Visic 23f3705223 Added a contributing section to the readme. 2012-01-14 22:34:39 +10:30
did 4c204ef6a6 refactor and clean code (wip) + the api controller has been deleted and replace by the entry_submission_controller (+ custom responder) 2012-01-09 06:49:59 -08:00
Mario Visic 63192a76f3 Updated readme with update instructions, helps with bug #251. 2011-11-28 09:51:37 +11:00
Mario Visic 1a350e7d0c Updated readme to include community information. 2011-11-27 20:17:08 +11:00
Mario Visic 83da41a2b1 Add the travis-ci button to the readme. 2011-11-27 19:35:08 +11:00
did 6a2f0f17dd complete the Russian version of the engine (#188): add the Russian flag + translate the Russian word in all the other locales 2011-08-31 23:43:52 +02:00
did efe2e63aa3 offical IE maintainer: Alex Sanford 2011-07-14 14:43:59 +02:00
Didier Lafforgue 875d840442 add new contributors (Enrique & Lars) 2011-07-06 00:56:47 -07:00
Didier Lafforgue 59a6e03da2 Merge pull request #81 from bewculture/master
Fixed JS bugs
2011-07-05 11:37:48 -07:00
did eb37cdcf36 fix broken tests + update gemspec / readme 2011-06-23 07:27:03 -07:00
did adfcbb6658 fix conflict issue with the new linecache gem + clean carrierwave local patch 2011-06-12 16:29:59 +02:00
did f9decc0890 switching over mongoid 2.0.2 + fix bug when displaying content labels in the back-office 2011-06-04 17:35:22 +02:00
did 7f9a62b0f4 correct name of Bernd's company 2011-05-20 16:04:09 +02:00
did 152fc83d95 README: change version of components + add a support section 2011-05-20 15:43:47 +02:00
Benjamin Athlan 750551cefb test 3 2011-05-13 18:49:19 +02:00
Benjamin Athlan 32b7f36fe2 test2 2011-05-13 18:42:29 +02:00
Benjamin Athlan 5d9a6b552d test 2011-05-13 18:41:52 +02:00
did 9fa701fdff add Andrea to the list of contributors 2011-05-07 14:16:42 +02:00
did 34ee6e1a64 new contributor (Bernd for the German translation) 2011-02-27 12:41:29 +01:00
did e9a6dda6e6 new contributor: Raphael Costa 2011-02-12 18:37:31 +01:00
dinedine 0dbc726169 add Dirk and Mario to the team :-) 2011-02-04 15:51:47 +01:00
dinedine 5519ca8396 update README 2011-01-04 00:14:45 +01:00
dinedine 39886427e0 first and unfinished draft of the import tool 2010-09-23 00:59:30 +02:00
dinedine 45924d221a update README 2010-08-22 00:49:23 +02:00
dinedine 2608430cae allow users to use shortcut for theme images when editing snippets / layouts / stylesheets + fix minor ui bugs 2010-07-23 00:10:40 +02:00
dinedine 96e4753ed6 specify MIT license + textile filter + fix bug with new tree plugin + fix tests 2010-07-06 17:00:02 +02:00
dinedine 9f20f56b1d fix some bugs about engine startup + add a generator to install assets into the parent app 2010-06-03 22:20:53 +02:00
dinedine f7cabf81c0 fix typo in README 2010-04-13 16:29:10 +02:00
dinedine fff4153302 README in textile 2010-04-13 16:27:44 +02:00