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

264 Commits

Author SHA1 Message Date
Mario Visic 4c5d6c92d0 Added poltergeist and a small JS fix. 2012-05-25 00:06:07 +08:00
did d90123e321 public forms are now protected from csrf attacks (see issue #382 2012-05-23 15:03:21 -07:00
did a939629cbf new multi_json gem 2012-05-05 02:39:23 -07:00
Didier Lafforgue f42fb1afe1 finally the new version of the multi_json gem (issue #387) 2012-05-05 11:17:18 +02:00
did 03d13d92d0 fix issue #387 2012-05-04 03:35:07 -07:00
Didier Lafforgue 23600edb1f performance improvements as described in #383 2012-04-26 03:39:23 +02:00
Didier Lafforgue 0502cf3305 bump version to 2.0.0.rc7 2012-04-23 01:04:06 +02:00
Didier Lafforgue 69c51fbe07 new aloha-rails gem (fixing a typo in a css when precompiling it) 2012-04-23 01:03:21 +02:00
Didier Lafforgue 08cf381bc3 simple media plugin for Aloha 2012-04-22 01:14:25 +02:00
Didier Lafforgue f0e8848ffd repair broken build 2012-04-20 00:35:14 +02:00
Didier Lafforgue 9b4fc56e82 fix issue #360 2012-04-19 16:30:16 +02:00
Didier Lafforgue 792ebd142b bump version to 2.0.0.rc6 (forgot something) 2012-04-17 18:43:14 +02:00
Didier Lafforgue 47015d3473 write cucumber tests to illustrate how to deal with a contact form + fix a tiny bug about it 2012-04-17 17:48:42 +02:00
Didier Lafforgue 1d19d606b8 closing textarea tags do not break the page form anymore 2012-04-17 16:13:21 +02:00
Didier Lafforgue 39bb85d163 forgot to push the Gemfile.lock too 2012-04-17 03:11:09 +02:00
Didier Lafforgue 26662acae9 force version of the multi_json gem (1.2.0) 2012-04-16 20:50:07 +02:00
Didier Lafforgue 3eb521ba75 upgrade FOG 2012-04-16 12:36:30 +02:00
Didier Lafforgue d0698b1ffc fix issue #348 2012-04-13 15:29:06 +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
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
Didier Lafforgue 6bd1154886 use the last version of mongoid / rails + bump the new gem version (rc.4) 2012-04-02 21:46:23 +02:00
Mario Visic ea62835b2e Fixed up some deprication warnings. 2012-04-02 21:56:00 +08:00
Didier Lafforgue 3f6e7acda6 fix issue #333 2012-03-28 17:33:20 +02: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 ed15c0d6b5 templatized pages can have now sub pages 2012-03-26 16:31:28 +02:00
Didier Lafforgue 1ef1e3fbf4 bump to rc2 2012-03-14 01:32:16 +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 b3b7519c7c new version of the custom_fields gem 2012-03-08 19:40:48 +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
Didier Lafforgue 3e3691ad4a upgrade to mongoid 2.4.5 + allow authors to edit editable elements from the back-office (bug) 2012-03-01 16:39:38 +01:00
did a1bc3db8a6 path to codemirror/overlay.js has been modified in the last version of the codemirror gem 2012-02-28 06:54:02 -08:00
did 520b68104b fixing tests (wip) + sync javascript objects when updating an entry in a has_many relationship 2012-02-27 03:48:06 -08:00
Didier Lafforgue c5ddabd585 new version of the custom_fields gem 2012-02-20 10:53:46 +01:00
Didier Lafforgue d0cc2984b8 upgrade fog (we need a newer version for the heroku-api gem) 2012-02-17 11:31:51 +01:00
Didier Lafforgue 085a54d7c1 introduce the proxy collection liquid drop so that we can paginate for real + fix the cucumber features for the public part of the engine 2012-02-17 00:51:33 +01:00
Didier Lafforgue 64a050dff9 fixing specs (wip) + cell specs are fine 2012-02-16 01:32:37 +01:00
Didier Lafforgue 62eaeb10f5 templatized page can now use models from the main app + add new liquid filters 2012-02-10 00:57:57 +01:00
did dfd437a762 fix an issue with compass + move to rails 3.2 + switch from mongoid_acts_as_tree to mongoid_tree + implement the UI to deal with has_many field types (wip) 2012-02-01 02:01:42 +01:00
did e2bd55fe35 add the UI for the belongs_to custom field 2012-01-31 01:50:09 +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
did c5692aeb2a fix errors when deploying a new brand new engine instance 2012-01-27 02:27:26 +01:00
did b5fa2c761a change the location url for the API responses + force the use of the default site locale when creating a new entry, content type or page 2012-01-26 07:51:32 -08:00
did 50917a919e Use the 2.0.0.rc branch for the custom_fields gem 2012-01-26 02:41:31 +01:00
did 4600f94922 extend i18n to pages (wip) 2012-01-25 22:07:10 +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
did 739d2db0a9 first api draft 2012-01-23 09:05:50 +01:00
Mario Visic 40c2902e80 Added shoulda matchers. 2012-01-21 15:51:16 +11:00
Mario Visic 0a2bd13058 Merge pull request #283 from cwoodcox/facebook 
Upgrade to devise 1.5.x
 2012-01-20 20:19:08 -08:00