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
Commit Graph

1406 Commits

Author SHA1 Message Date
Didier Lafforgue 219f6e1339 upgrade to custom_fields 2.0.0.rc4 2012-02-07 11:46:07 +01:00
Didier Lafforgue f1662770e7 use the default carrierwave settings for envs other than development and production + does not include the templates of snippets in the theme assets index page (it was breaking the layout in locomotive for some snippets) 2012-02-07 11:17:56 +01:00
Didier Lafforgue f2467bbf42 ask for default site locale when creating the first site 2012-02-07 01:29:33 +01:00
did 112d61ac3b no more references to zip templates 2012-02-06 08:58:50 -08:00
did 5fd244e66c do not mention DelayedJob anymore 2012-02-06 02:44:02 -08:00
did fa36b95a9d get rid of warnings about InstanceMethods (deprecated) + make the engine work smoother with an existing app + clean code 2012-02-06 00:54:09 +01:00
did 25e08596ef refactor the code (move some pieces of code into the custom_fields gem) + solve a ton of bugs: circular dependencies inside the content_entry presenter, fix Locomotive.mounted_on (broken in rails 3.2), js errors when creating a page, locale switcher broken if a page was not translated in the target locale 2012-02-04 02:10:55 +01:00
did 2a911d912c implement the UI for the many_to_many relationship (WIP) 2012-02-03 01:50:45 +01:00
did 9e9fe49ccf the has_many ui component is done 2012-02-02 16:53:26 +01:00
did 1703c05693 can edit memberships now (js bug) 2012-02-01 15:15:20 +01:00
did 42a2bba538 sort and remove entries from a has_many relationship 2012-02-01 04:09:35 -08: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 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
Mario Visic 442e254202 Fixed a problem in the spec_helper preventing tests from being run. 2012-01-29 19:41:53 +11:00
Maik Kempe 0d747b14fe [➠] Include gemspec dependencies in Gemfile. 2012-01-29 19:15:13 +11:00
did a85db53520 add .css to dialog.scss 2012-01-28 12:59:04 +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 9f7ac8630e Merge branch '2.0.0.rc' of github.com:locomotivecms/engine into 2.0.0.rc 2012-01-28 01:05:47 -08:00
did b33d081c28 use the view_context method to reach helper methods from a controller 2012-01-28 01:05:26 -08:00
Gregory horion 0d5d2af27f give me the rool url in the 2.0.0rc please 
Conflicts:

	config/routes.rb
 2012-01-28 16:12:10 +11: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 192518d258 disable the rethrow exceptions option for the liquid templates 2012-01-26 02:43:55 +01:00
did 50917a919e Use the 2.0.0.rc branch for the custom_fields gem 2012-01-26 02:41:31 +01:00
did c0b8587eb2 rename the i18n site module into locales in order to avoid conflicts with the original i18n + rendering a page according to a locale specified in the url seems to work (tests are following) 2012-01-26 02:33:39 +01:00
did 11383f9c05 remove useless tmp files from git 2012-01-25 22:34:48 +01:00
did 4600f94922 extend i18n to pages (wip) 2012-01-25 22:07:10 +01:00
Mario Visic e849318cc4 Fixed a few remaining typos. 2012-01-25 22:24:36 +11:00
Mario Visic 44b3579e02 Removed the locomotive init. 2012-01-25 22:24:13 +11:00
Mario Visic 5c191e59cd Merge remote-tracking branch 'origin/2.0.0.rc' into 2.0.0.rc 
Conflicts:
	Gemfile.lock
 2012-01-25 22:20:05 +11: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
Corey Woodcox 7aadd9d129 add a message for deprecated config option 2012-01-25 18:52:55 +11:00
Corey Woodcox 1a5050a0c1 case sensitive search is a monster. 2012-01-25 18:52:54 +11:00
Corey Woodcox 81db1da423 fix spelling error in locales 2012-01-25 18:52:54 +11:00
did 7ace1d9a48 fix the broken link to the back-office in the toolbar when the inline_editor tag is missing 2012-01-24 22:04:49 +01:00
did e523cb952c access entries of a content type from the API 2012-01-24 21:33:34 +01:00
did ab507dc165 change the default API base path + implement the API for content_assets, content_types and pages resources 2012-01-24 21:16:53 +01:00
did 0534c5504f prevent pow to crash when no flash message (bug) + add api resources for pages 2012-01-24 01:00:41 +01:00
did 739d2db0a9 first api draft 2012-01-23 09:05:50 +01:00
Gil Vandendriessche d665a85591 Add sample option on import rake task 2012-01-21 16:05:36 +11:00
Mario Visic 07ff99e135 Ensure uniqueness and format of an accounts email address. 2012-01-21 15:51:38 +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 0f3c672777 make the toolbar smaller 2012-01-18 02:04:48 +01:00