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

251 Commits

Author SHA1 Message Date
Mario Visic
4c5d6c92d0 Added poltergeist and a small JS fix. 2012-05-25 00:06:07 +08: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
1d19d606b8 closing textarea tags do not break the page form anymore 2012-04-17 16:13:21 +02:00
Mario Visic
52247242fc Requiring locomotive is now much less noisy. 2012-03-12 14:04:52 +08: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
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
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
b132c3bba9 merge 2012-01-30 11:14:00 +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
Maik Kempe
0d747b14fe [➠] Include gemspec dependencies in Gemfile. 2012-01-29 19:15:13 +11: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
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
Mario Visic
34f9755d9a Altered admin menu cells inheritence, fixes #257 without limiting cells version. 2012-01-21 15:10:58 +11:00
Corey Woodcox
868c2d2e0e upgrade devise to 1.5.x 2012-01-20 19:32:53 -07:00
did
4d0f8610c5 bad display of content types if none + add new gems for tinymce and aloha 2012-01-21 01:48:00 +01:00
did
7af9ea34a6 trying to make it work with the precompilation of assets (issue with Aloha and TinyMCE) 2012-01-20 14:46:09 +01:00
did
ebe149110b first draft of the new inline editing toolbar 2012-01-16 23:59:59 +01:00
did
531017ab62 merging 2012-01-14 13:14:59 +01:00
Mario Visic
8f5a363d74 Remove cucumber-rails version. 2012-01-14 16:38:42 +10:30
Mario Visic
75b0137230 Merge remote-tracking branch 'origin/master' into rails_3_1 
Conflicts:
	Gemfile
	Gemfile.lock
	features/support/env.rb
	locomotive_cms.gemspec
	spec/cells/locomotive/global_actions_spec.rb
	spec/cells/locomotive/main_menu_cell_spec.rb
	spec/cells/locomotive/settings_menu_cell_spec.rb
 2012-01-14 16:37:24 +10:30
Mario Visic
04b1a7aa90 Bump RedCloth to a newer version to avoid warnings when running tests. 2012-01-14 13:04:34 +08:00
did
0489bbe4c2 implement the mechanism to pick a different locale for content types + implement multi-language for content types + rename scss files to css.scss 2012-01-14 01:38:09 +01:00
did
42db5ba656 namespace assets in vendor 2012-01-10 09:09:56 +01:00
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
did
435d4067c0 namespace vendor assets 2012-01-08 16:27:13 -08:00
did
5dfbb2bdb7 upgrade to the last version of delayed_job_mongoid gem + remove reference to the previous handlebars-rails gem (just add the js file instead) + refactor the way to display the list of content types in the back-office menu 2012-01-08 16:17:31 -08:00
did
a1e692a34d fix tests suite with ruby 1.9.2 2012-01-07 02:49:23 +01:00
did
dc24c1b184 update delayed_job / delayed_job_mongoid gems (issue #267) 2012-01-07 01:39:30 +01:00
Mario Visic
b9755947ff Limit cells to version 3.7, fixes #257 and fixes #260 2012-01-05 01:44:32 +08:00
did
0f1b4f59d3 listing all entries (done) + fix bugs + tweak ui 2012-01-04 02:07:53 +01:00
did
9130544516 refactoring the creation of custom contents 2011-12-22 14:28:12 -08:00
did
d1bb45d7c8 polishing the UI for the content types, refactoring still in progress 2011-12-22 01:31:33 +01:00
did
00283993c0 minimal version of the new UI for content types 2011-12-21 15:24:39 +01:00
did
217000042a refactoring the content types section (wip) 2011-12-19 14:15:11 +01:00
did
a25009824c fix some bugs + refactor look and feel of the import screens (wip) 2011-12-08 07:47:17 -08:00
did
b60b1378f8 no more flash uploader only HTML5 goodness 2011-12-07 07:10:21 -08:00
Mario Visic
39ac60fffe Merge branch 'master' into rails_3_1 
Conflicts:
	Gemfile
 2011-11-27 21:42:58 +11:00
Mario Visic
867878a4f4 Test on ruby 1.9.3, removed the require for ruby-debug19 as it breaks on 1.9.3 2011-11-27 21:21:27 +11:00
Mario Visic
9f56eecd56 Merge branch 'master' into rails_3_1 
Conflicts:
	Gemfile
	Gemfile.lock
	config/boot.rb
 2011-11-27 20:33:45 +11:00