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

553 Commits

Author SHA1 Message Date
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 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
Mario Visic 34f9755d9a Altered admin menu cells inheritence, fixes #257 without limiting cells version. 2012-01-21 15:10:58 +11: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
did fc20fe70c9 fix annoying bug about popups within the submenu 2012-01-18 01:54:26 +01:00
did b8b8cef089 make the edition of content types more robust (ex: better errors handler) 2012-01-18 01:43:01 +01:00
did 09d6060633 refactoring (rename modules, clean code, remove useless files, ...etc) + improve the inline editor module (locale picker + better ui workflow) 2012-01-17 17:04:45 +01:00
did 801f7bfca5 Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2012-01-17 12:05:52 +01:00
did e210953d01 inline editor work in progress 2012-01-17 12:05:39 +01:00
did 7169abb8c2 stylish buttons in the toolbar 2012-01-17 03:21:30 +01:00
did 89020e7cf5 got a working version of the inline editor 2012-01-17 02:53:49 +01:00
did ebe149110b first draft of the new inline editing toolbar 2012-01-16 23:59:59 +01:00
Mario Visic 4622c4359f Fixed up a failing test due to the i18n module, left a fixme note. 2012-01-15 15:05:31 +11:00
did 4060b1859f use the right path to the back-office in the js components as well as in the middlewares 2012-01-14 14:54:01 +01:00
did 50a2453995 polish again the content_locale picker 2012-01-14 13:12:44 +01:00
did d191d2d783 polish the content_locale picker + does not display the picker if less than 2 locales 2012-01-14 02:08:03 +01: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
Pietro Giorgianni 99d889f6e2 Fix a before_filter preventing to save a content instance with a 
custom field `active' or `visible' set to false.
Fixes #272.
 2012-01-12 16:18:55 +01:00
did 42db5ba656 namespace assets in vendor 2012-01-10 09:09:56 +01:00
did 01c5de36a5 add the ui element to select the languages for a site 2012-01-09 17:24:34 -08: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 0f1b4f59d3 listing all entries (done) + fix bugs + tweak ui 2012-01-04 02:07:53 +01:00
did 81fc524fdc Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2012-01-02 05:54:18 -08:00
did 912251d49b big refactoring (wip) + add/edit entries for content types 2012-01-02 05:54:01 -08:00
Mario Visic a65a871e19 Fixed a tiny bug preventing the robots controller rending. 2011-12-27 21:31:36 +08: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
did 9130544516 refactoring the creation of custom contents 2011-12-22 14:28:12 -08:00
did 2068fe060d it becomes possible to add options for the select type 2011-12-22 07:45:42 -08:00
did 81a6569fe7 UI compoment to add options for the select type field (wip) 2011-12-22 02:59:30 +01: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
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 4efa43e342 Content instances will now generate a unique slug (if existing is taken). Fixes #210. 2011-12-18 01:11:39 +08:00
did 592a110fe5 first attempt to refactor the content types 2011-12-16 13:02:10 +01: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
Robsteranium 282e2486b6 Previous comparison method failed when the sort column is a date with a Nil. This revision doesn't really sort Nils, rather ignore them. 2011-12-14 11:26:24 +00:00
did e500a1985b refactoring of the sites picker is done 2011-12-12 10:35:42 +01:00
did 8271782284 refactoring of the import UI is done 2011-12-11 23:33:38 +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
did d21f32d849 upload many theme assets at once 2011-12-07 03:25:30 -08:00
did 368f643cf0 theme assets page in progress 2011-12-07 02:09:13 +01:00
did af955ef927 delete snippets in ajax + new way of render theme assets in the back-office (backbone view) + change the way to fire growl messages 2011-12-06 12:39:32 +01:00
did dd15e3a758 delete snippets in ajax (wip) 2011-12-05 15:19:57 -08:00
did 5d750bee44 Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2011-12-05 06:40:48 -08:00
did ad8fad3ce5 trying to implement the destroy action for theme assets (wip) 2011-12-05 06:39:52 -08:00
Mario Visic aa68d59979 Merge remote-tracking branch 'origin/rails_3_1' into rails_3_1 2011-12-05 22:31:14 +08:00
Mario Visic 4e6fc04889 Use contents_custom_fields instead of content_custom_fields 2011-12-05 22:29:32 +08:00
did 1b8c1c7157 use the slugify js plugin for the page form 2011-12-05 06:14:50 -08:00
did 8af3445045 snippets done 2011-12-05 04:29:58 -08:00
did 04d9e90492 Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2011-12-05 02:31:43 -08:00
did 07b302beaa refactoring the snippet forms (wip) 2011-12-05 02:31:34 -08:00
Mario Visic 0eac23c3e3 Added target custom fields to the content instance model. 2011-12-05 16:38:07 +08:00
did 37684654ac first attempt to polish the theme assets page + refactor the css (wip) 2011-12-03 01:11:31 +01:00
did 24575d5cff polish the new membership page 2011-12-02 23:31:15 +01:00
did 3fffe7bd91 new way of handling ajax post requests (redirecting if everything is fine) 2011-12-02 18:20:59 +01:00
did 87a04aafe9 rename namespace for the sites backbone views + create backbone view for the creation of a new site 2011-12-02 06:59:41 -08:00
did fb0e87c64d done (for now) with the my account screen 2011-12-02 01:43:49 +01:00
did 99d756f550 Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2011-12-01 15:08:19 -08:00
did 837b974fec working on the screen for editing my account 2011-12-01 15:04:45 -08:00
did 5d271239b7 the screen for editing site has been refactored 2011-11-29 14:58:19 +01:00
did 35012ca2b2 polishing the current site editing screen (wip) 2011-11-29 02:24:02 +01:00
did aebb4f74ec remove directive in gitignore preventing some folders (ending by sites) to be correctly versioned 2011-11-28 13:53:34 -08:00
did 6505b7ab25 add missing js files 2011-11-28 13:50:24 -08:00
did a8d616ba6b remove references to foldable_inputs and custom_input 2011-11-28 06:40:25 -08:00
did cad1f5e68f Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2011-11-27 08:23:12 -08:00
did 71d48fe726 refactor the current site editing screen (screen) 2011-11-27 08:22:54 -08:00
Mario Visic ad6273e2fd Lots of spec fixes (mostly namespacing), down to 107 failing specs. 2011-11-26 17:24:34 +11:00
did cffe64f6be rebuilding the editing page for the site (wip) 2011-11-25 15:10:56 +01:00
did cb735a0539 cleaning 2011-11-25 13:38:31 +01:00
did fcd2146c11 foldable fieldsets fixed on firefox 2011-11-25 12:31:18 +01:00
did 5bb29d9702 fix styling issues with form and firefox 2011-11-25 12:05:30 +01:00
did cda038e320 style submenu on firefox 2011-11-25 11:12:55 +01:00
did 80c9d5091f style submenu popup on firefox 2011-11-25 10:56:56 +01:00
did 47625dfa17 refactor code (wip) + fix bugs (wip) + tweak ui + save an existing page in ajax (HTML5 + FormData) + create a new page in ajax (wip) 2011-11-25 02:04:42 +01:00
did a50df5ad8e menu and submenu in full css3 (without any images) + delete useless images + clean the code (wip) 2011-11-23 05:01:15 -08:00
did b2a5e1de85 new file input behaviour (for now just on editable_file) 2011-11-21 03:12:06 -08:00
did 0b7cc6ebd2 merging 2011-11-21 02:28:12 +01:00
did 1a1a92e12f refactor the presenters + convert the editable_elements partial into a full backbone, coffeescript, handlebar, json stack 2011-11-21 02:27:05 +01: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 a99ba18200 Temporarily removed a module include causing issues. 2011-11-20 22:47:03 +11:00
Mario Visic a7b66f0e25 Lots of fixes to get tets closer to working. 2011-11-20 21:59:12 +11:00
did c267f8ccbc inverse toggle effects + add missing redirect_url field + fix an anoying bug about the locomotive_media plugin 2011-11-20 01:27:23 +01:00
did a6211d594e almost done with the tinyMCE customization 2011-11-20 00:54:33 +01:00
did cd411de4ce implement a generic asset picker 2011-11-19 17:33:16 +01:00
did 63e2a63d1a polishing the locomotive_media plugin (wip) 2011-11-19 16:41:16 +01:00
did 72c2cb2059 rename asset to content_asset + clean the locomotive_media plugin for tinyMCE (wip) 2011-11-19 15:47:56 +01:00
did 5ea81930b4 tinymce integration (wip) + polish the jquery dialog window (wip) 2011-11-19 00:20:37 +01:00
did 2620748b81 restyling the editable elements in css3 (wip) 2011-11-17 18:05:51 +01:00
did 67615a7fe3 polishing (wip) + refactor the js code (wip) 2011-11-16 13:42:42 +01:00
did a9dace0d0f right translation keys for the image picker 2011-11-16 11:24:14 +01:00
did a48b602ea9 sub menu popup in place 2011-11-16 11:19:57 +01:00
did 2c18f401bb adding the last refactored features on the pages section (wip) + clean code 2011-11-16 01:39:16 +01:00
did 80a9a11c7b javascript for add/edit page (wip) 2011-11-14 01:13:58 -08:00
did 596eb78a55 first draft for the json template response (tested on sorting pages) 2011-11-11 00:39:25 -08:00
did bef9dd8e67 fix various namespace errors issues and api changes for the models 2011-11-10 13:41:20 -08:00
did 6122983835 fix the annoying bug of duplicated flash messages + first backbone view for the index pages section 2011-11-10 13:29:59 +01:00
did aa1abd2e92 remove useless piece of code 2011-11-10 02:47:26 +01:00
did 599b1d6395 first work on migrating the javascripts to coffeescript and backbone (wip) 2011-11-10 02:43:19 +01:00
did 248d3803c2 use the last version of formtastic + tweak the css for formtastic with scss + compass (wip) + clean code (wip) 2011-11-09 02:35:59 +01:00
did 1b015efd48 cleaning stylesheets so that they fit the new assets system 2011-11-08 15:34:25 +01:00
did dd75f69b74 fix module collisions and missing namespaces all over the templates (wip) 2011-11-08 01:11:15 +01:00
did b383086242 wip 2011-11-06 12:18:34 +01:00
did 87d2440f14 working on fixing issues with devise (wip) 2011-11-04 16:55:51 +01:00
did 8979957d43 convert stylesheets in sass (wip) + fix the installation module + customize devise (wip) 2011-11-03 14:01:08 +01:00
did 851a255301 fixing assets (wip) 2011-11-01 01:58:44 +01:00
did cdab48f0a9 isolate the engine (urls, helpers, ...etc) + change urls + remove the warning about bson_ext 2011-11-01 00:44:23 +01:00
did 99e442673c namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
did 9f8d2e4146 assets (wip) 2011-10-30 14:28:45 +01:00
did 44007ac664 fix image references in assets 2011-10-30 13:34:16 +01:00
did ed6020be3e upgrade to new gems + remove hosting modules + change settings for Rails 3.1 + move assets to app/assets 2011-10-30 13:17:05 +01:00
did 8298b2a4bf preventing recursive loop when used as engine in an app 2011-10-18 18:45:45 +02:00
did 016d773b2d fix issue #217 (memberships not correctly removed) 2011-09-28 18:27:29 +02:00
Mario Visic 03b6649742 Designers cannot set others to admins, fixes #197 2011-09-17 22:23:43 +08:00
Karl Brightman 93667018c1 Updated with hashrocket 2011-09-16 11:55:30 +08:00
Karl Brightman 75f4835d3e Integrated next and previous methods for content in content types 2011-09-16 11:35:40 +08:00
did 8dfefe5094 fix issue #201 2011-09-14 11:32:14 +02:00
Mario Visic 8dbd51734a Visiting /edit when not authenticated now sends users to the login page. 2011-09-04 01:15:43 +08:00
Didier Lafforgue 761a64b130 Merge pull request #185 from themgt/patch-1 
should sort by Page#depth so slug parts are in the right order
 2011-08-30 15:11:46 -07:00
did dea0b67fe1 fix another bug related to the issue #179 2011-08-30 23:13:34 +02:00
Paul acd731347c should sort by Page#depth so slug parts are in the right order 2011-08-29 16:17:18 +03:00
Arjen Oosterkamp a78bcdaf38 Added .htc file content type to white list 
Added .htc file content type javascripts folder
 2011-08-29 10:46:31 +02:00
Mario Visic cd464e604c Logging in as an account without membership no longer infinetly redirects. 2011-08-28 01:14:02 +08:00
did 265525c1a7 fix issue #175 + the liquid template of content types (back-office) were broken 2011-08-26 00:30:34 +02:00
did 71a592eec1 fix issue #177 2011-08-25 18:27:43 +02:00
did d0566f917e fix issue #179 2011-08-25 14:58:49 +02:00
did aff1d23d90 Merge branch 'master' of github.com:locomotivecms/engine 2011-08-24 15:16:33 +02:00
Mario Visic 22445856ec The add account link is now hidden unless admins have permission. 2011-08-20 17:41:00 +08:00
Mario Visic a7bc648333 Implemented the site ability fix for designers. 2011-08-20 17:33:13 +08:00
Mario Visic 24c9752018 Implemenation for hiding the destroy asset button. 2011-08-20 17:13:06 +08:00
did 7ea25b3a59 in some circonstances, the site_id disappeared when generating the url of a file in a model 2011-08-19 12:06:41 +02:00
did 0e3d601ea9 fix xss vulnerability issue (#170) 2011-08-18 16:06:34 +02:00
Didier Lafforgue 12c9bd1eca Merge pull request #159 from bquorning/patch-1 
Adding indexes
 2011-08-14 12:44:59 -07:00
did b23f2697e9 clean tests and make them pass in the order observed on nix systems 2011-08-13 16:24:02 -07:00
did 67d7b13f4f Add the reverse has_many field feature (mainly based on pull request #142) 2011-08-11 13:45:46 -07:00
Benjamin Quorning e2eb8f2e90 Adding indexes on :position and [[:depth, :asc], [:position, :asc]] to avoid Mongo::OperationFailure: too much data for sort() with no index 2011-08-09 15:07:15 +03:00
did 040a51bc5f when used with devise_cas_authenticable, it does make sense to ask for a password in the new account creation page 2011-07-28 21:11:06 +02:00
did a9b6c234e7 fix issue #150 2011-07-28 16:42:16 +02:00
did 4c8272dfa0 seo information were not imported for contents 2011-07-28 11:53:36 +02:00
did 8da0db2454 improve the solution for the issue #127 and write tests (pull request #139) 2011-07-28 00:39:59 +02:00