github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,403 Commits 13 Branches 7 Tags 15 MiB
Commit Graph

43 Commits

Author SHA1 Message Date
Didier Lafforgue da2d689bdc fix issue #412 2012-05-26 14:35:04 +02:00
Didier Lafforgue e225ad2278 fix issue #385 2012-05-07 00:31:59 +02:00
Didier Lafforgue 23600edb1f performance improvements as described in #383 2012-04-26 03:39:23 +02:00
Didier Lafforgue 486c6a12a2 fix issue #367 2012-04-20 00:31:48 +02:00
Didier Lafforgue 06fa564f37 fix a couple of potential bugs when playing with the site locales 2012-04-13 18:32:55 +02:00
Didier Lafforgue 7a595208aa fix issue #338 2012-04-13 14:38:00 +02:00
Mario Visic f74306503b Use unidecoder for converting non ascii charcters for page slugs. Fixes #340 2012-04-08 15:13:07 +08:00
Mario Visic 22d55cf0e0 Slugs should not have 'dot' in them. 2012-04-08 14:42:19 +08:00
Sergey Kuleshov 2798e15481 Made JS permalink regexp more generic for non–latin languages. 
Fixed specs for permalinks generated by stringex.
 2012-04-08 14:41:03 +08:00
Mario Visic 7260f36be7 Downcase subdomains and domains when given as user input. 2012-04-06 23:10:16 +08:00
Mario Visic ea62835b2e Fixed up some deprication warnings. 2012-04-02 21:56:00 +08:00
Didier Lafforgue 11d92ab80e nested templatized pages finally done (+ specs) + upgrade gems + change the zindex value of the start button for the inline editor + change version (rc.3) for the next rc release 2012-03-28 00:26:32 +02:00
Didier Lafforgue a9aeffba9b it is now possible to change the response type of a page + correct translations in French 2012-03-22 19:20:31 +01:00
Didier Lafforgue 6b8e3db8c3 add missing files for the last commit about the control editable element + implement feature #326 2012-03-22 02:13:24 +01:00
Didier Lafforgue ab5a4755b8 make the editable elements more robust when working with localization + write tests to prove it 2012-03-21 03:21:29 +01:00
Didier Lafforgue cfbe68564d fixed editable elements (wip) 2012-03-19 02:29:59 +01:00
Didier Lafforgue fbd945cf6d implement feature #324 2012-03-14 01:16:01 +01:00
Didier Lafforgue 9a9f270d99 fix issue #317 + with_scope works now with has_many relationships + clean code 2012-03-12 03:09:20 +01:00
Didier Lafforgue 1c902a5448 fix a bug about the editable_file not correctly displayed in a snippet given as an argument of the new nav tag 2012-03-09 13:05:44 +01:00
Didier Lafforgue 7ab8110e41 with_scope also takes care of order_by (pull request #278) 2012-03-09 01:01:09 +01:00
Didier Lafforgue 0c65516807 fix issue #320 2012-03-08 02:32:59 +01:00
Didier Lafforgue ac823aac66 entries can be grouped by a belongs_to field in the back-office + add the show action for the content_entries API 2012-03-07 01:39:24 +01:00
did f77bdd9826 fix #289. This fix is different from the one in the master branch. It only the filename (without the whole path and the extension) 2012-03-05 14:17:33 -08:00
did a1cbdf9ed8 page templates were not updated if a related snippet got modified (BUG) 2012-03-02 08:37:54 -08:00
Didier Lafforgue 02e48f5c36 fix the specs for the page model 2012-02-16 22:07:00 +01:00
Didier Lafforgue 73b559260e fix specs for the content_type and editable_element models 2012-02-16 16:17:30 +01:00
Didier Lafforgue 2fd0410b66 tests pass for the account, content_entry and content_asset models 2012-02-16 12:42:41 +01:00
did c9f07c823f remove the old way of doing cross domain authentication (use the :domain => all option) + fix a couple of tiny bugs 2012-01-30 10:56:38 +01:00
did b93c7f8f51 remove the import/export functionalities (replaced by the API and the new locomotive editor) + upgrade gems (codemirror, ...etc) 2012-01-28 12:41:00 +01:00
Mario Visic 840609cbce Merge remote-tracking branch 'origin/master' into rails_3_1 
Conflicts:
	Gemfile
	Gemfile.lock
	app/cells/locomotive/menu_cell.rb
	app/helpers/admin/content_types_helper.rb
	app/models/content_instance.rb
	app/models/page.rb
	app/views/admin/shared/menu/_contents.html.haml
	config/initializers/locomotive.rb
	config/locales/admin_ui.de.yml
	config/locales/admin_ui.en.yml
	config/locales/admin_ui.es.yml
	config/locales/admin_ui.fr.yml
	config/locales/admin_ui.it.yml
	config/locales/admin_ui.nl.yml
	config/locales/admin_ui.no.yml
	config/locales/admin_ui.pt-BR.yml
	config/locales/admin_ui.ru.yml
	lib/generators/locomotive/install/templates/locomotive.rb
	lib/locomotive/configuration.rb
	locomotive_cms.gemspec
	spec/models/locomotive/account_spec.rb
 2012-01-25 22:16:43 +11:00
Mario Visic 216b77ab41 Fixed up a bad merge of the content instance spec changes. 2012-01-15 14:50:23 +11:00
did e9ef4d48c3 content_instance becomes now content_entry with its shortcut content_type.entries + change references to the old custom_fields API 2011-12-23 00:45:32 +01:00
Mario Visic eb5f0557ff Merge branch 'master' into rails_3_1 
Conflicts:
	app/models/content_instance.rb
	spec/models/locomotive/content_instance_spec.rb
 2011-12-18 01:18:56 +08:00
Mario Visic 9a1a0f016f Merge branch 'master' into rails_3_1 
Conflicts:
	app/models/content_type.rb
	config/boot.rb
 2011-12-15 22:29:07 +08:00
Mario Visic 1c139af4e0 Small namespace fixes to specs. 2011-12-08 23:36:53 +08:00
Mario Visic 4e6fc04889 Use contents_custom_fields instead of content_custom_fields 2011-12-05 22:29:32 +08:00
Mario Visic ad6273e2fd Lots of spec fixes (mostly namespacing), down to 107 failing specs. 2011-11-26 17:24:34 +11:00
Mario Visic 2a5861e8a7 Specs now correctly use a multisite test app. 2011-11-25 23:59:44 +11:00
Mario Visic 06f4fc98e3 Fixed a bunch of model tests. 2011-11-25 00:37:17 +11:00
Mario Visic 40ef3e4fff Fixed a couple of failing tests. 2011-11-22 00:08:18 +11:00
Mario Visic e21a40c157 Some fixes for the content asset spec. 2011-11-20 22:52:20 +11:00
Mario Visic 75041ba21c Specs now run for all models. The account model now passes GREEEEn. 2011-11-20 22:47:41 +11:00
Mario Visic a7b66f0e25 Lots of fixes to get tets closer to working. 2011-11-20 21:59:12 +11:00