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

590 Commits

Author SHA1 Message Date
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
did d4b2153c7b wrong flash message key for the import controller 2011-07-27 02:26:12 +02:00
did d5111d2a4f fix a minor bug about the contents menu + new devise_bushido_authenticatable gem 2011-07-26 21:38:27 +02:00
did e05586d387 write tests for the last cells menu + write tests for the bushi.do events + refactor the locomotive logger + add the cas_extra_attributes hook 2011-07-26 21:20:03 +02:00
did cb349b3ac0 enable debug mode for bushido + fix minor issues 2011-07-25 23:16:43 +02:00
did 4f7312a659 CAS feature + Cells 2011-07-25 23:07:32 +02:00
did e2b68ba861 restore production settings + fix broken tests + apply the coding convention on the recently modified haml file 2011-07-23 01:26:16 +02:00
Kev Zettler 13e247691f Merge pull request #137 from Bushido/master 
Guiders and new gem version
 2011-07-22 15:28:03 -07:00
did 819d7ac5ff fix issue #131 2011-07-19 16:20:53 +02:00
did 47088f9b0e fix issue #115 + clean code + exporting a site works now with ruby 1.8.7 2011-07-19 14:52:02 +02:00
Kev Zettler 3b5df5e8a8 more awesome tutorials, more helpful on sites that have no data 2011-07-14 21:38:02 -07:00
Didier Lafforgue 4a9da56341 Merge pull request #114 from frisoft/master 
Italian localization update + Locomotive.config.default_locale as default locale for new accounts.
 2011-07-14 01:02:08 -07:00
did 2c562038d8 use ActiveSupport::JSON.encode instead of the to_json method (not reliable) 2011-07-14 00:08:43 +02:00
did 770ae3a543 fix a couple of tiny bugs about: export, import and aloha 2011-07-13 11:14:44 +02:00
Andrea Frigido f6c91ed791 Locomotive.config.default_locale as default locale for new accounts. 2011-07-11 13:13:58 +02:00
Kev Zettler 058e97d376 settings and model edit guides 2011-07-10 11:02:06 -07:00
Kev Zettler ca2fad461d omg awesome guides 2011-07-08 01:20:29 -07:00
did b2ddaf805c show page kind: templatized or redirect 2011-07-07 18:03:55 +02:00
Kev Zettler a342f7e6b1 added hooks and dependencies for tutorial flow 2011-07-06 22:35:15 -07:00
did 37d10aa25b fix bug #104 2011-07-06 11:48:04 -07:00
did 0737919c2c Dutch translation (ticket #92) 2011-07-05 23:55:26 +02:00
did 1a62d8f5ad Adding the ability to set a robots.txt for each site (ticket #87) 2011-07-05 22:34:15 +02:00
did 6ce086520f include potatosalad's work about the menu_toggler 2011-07-05 21:03:10 +02:00
did bf99a36b58 tweak forms + fix minor js bug if no multi sites 2011-07-05 20:33:21 +02:00
did bd28f4c1ec new sites picker 2011-07-05 18:30:12 +02:00
did 71d7e86acd admin role was not correctly set when creating a new website 2011-07-05 11:56:24 +02:00
did 00fd00240f the error message was not displayed correctly during a wrong import + remove the last tracks of the deprecated asset collections 2011-07-04 23:11:35 +02:00
did 1e465e231e remove whilelist for theme assets (no useful since we have got roles now) + a little bit of refactoring 2011-07-04 19:40:14 +02:00
did 91f2f145b3 the BIG MERGE is now done 2011-07-04 15:43:05 +02:00
did 02186d7368 add the export link + fix the bugs for the export module + a little bit of refactoring 2011-07-04 15:25:02 +02:00
did 690b2f2b2e fix a bug when filling in the content type name 2011-07-02 04:48:21 -07:00
did 812965ad50 tweak the form UI (errors, input separator) + add more tests 2011-07-01 02:15:45 +02:00
did c7ea5ab532 add more features for the model section 2011-06-29 14:00:26 +02:00
did 5e8eac53d4 refactor the way the middlewares are loaded (both app and engine) + tweaks some back-office texts + improve the UI by adding icons on addind a picture links + fix an annoying bug with carrierwave 2011-06-28 15:38:13 +02:00
did 2ad01833d8 icons for the theme_asset form + add tests (both rspec + features) for the roles 2011-06-27 08:27:07 -07:00
did be6629d986 done with the roles (tests are coming) + better help messages for theme_assets and snippets 2011-06-26 16:02:48 -07:00
did 1be92e0db4 roles fully implemented for the page / content sections + uniformize drag n drop in the contents section + add the missing selected value for the has_one field 2011-06-25 17:01:11 -07:00
did 09171555a7 fix CSRF issues with tinymce and some ajax actions + begin to work on the roles feature powered by cancan (in progress, not stable) 2011-06-25 09:25:31 -07:00
did 33a29210ba forget to add a field to update the global seo title for a site + fix a tiny bug when destroying session + enhance hints on some form fields 2011-06-24 00:49:12 -07:00
did c9f3989c2b group contents by category for the has_ony / has_many widgets 2011-06-23 16:17:08 -07:00
did 587d383ac5 tweak ui: form, quick link to edit a model in the popup menu 2011-06-23 07:10:17 -07:00
did fa7e4c24d8 implement feature #57 2011-06-23 05:57:52 -07:00
did 4d29500483 new version of custom_fields + allow users to change the permalink of the custom model instances 2011-06-21 14:53:21 -07:00
did 3c0f7afec0 fix tests + rename and refactor the slugify method (now called permalink) 2011-06-21 13:03:24 -07:00
did 3c31c8dbcf remove all the references to asset_collections 2011-06-21 06:12:20 -07:00
did a0293b161b add a new plugin in tinymce to upload any kind of files (Bernd) 2011-06-21 05:47:11 -07:00
did f4d9acd282 fix the tests + finish the integration of Dragonfly + clean code 2011-06-20 17:39:59 -07:00
did 57ba3ba273 get rid of the yellow banner in production 2011-06-21 01:27:13 +02:00
did 87e7ced3c1 integrate dragonfly + clean code + fix a js bug when editing a custom field 2011-06-20 12:05:12 -07:00
did 21ccbb635b removing asset collections 2011-06-17 14:32:54 -07:00
did de217b74b7 use default rails logger during the first template import + remove some carrierwave method patches now useless with the new version of the gem 2011-06-11 01:18:34 +02:00
did cd428e467c back to the sha1 encryptor to be compliant with old accounts 2011-06-11 00:24:10 +02:00
did f1d8e7c141 clean everything before merging it to the master branch 2011-06-10 01:04:13 +02:00
did 49080b737d testing out the lastest gems for rails / carrierwave / ...etc 2011-06-08 16:33:33 +02:00
did f9decc0890 switching over mongoid 2.0.2 + fix bug when displaying content labels in the back-office 2011-06-04 17:35:22 +02:00
did 91119bf54e allow administrators to change the text displayed for each content in the back-office (documentation is coming) 2011-06-01 23:43:12 +02:00
did 61886ec1b1 installation procedure allows to install the default site template if provided 2011-05-28 19:45:29 -07:00
did c6b272f9f9 disable authentication if the app has not been claimed yet 2011-05-28 10:52:36 -07:00
did 8ad6ee580e fix issue #78 2011-05-24 12:23:05 -07:00
did 8f36f5a2d8 solve a bug on has_ony / has_many caused by the caching mechanism 2011-05-21 01:02:03 +02:00
did 34c5d12ebf refactoring the rendering of content fields in a model 2011-05-19 18:00:45 +02:00
did d2f6cc0c53 has_many ui has been implemented 2011-05-19 17:44:04 +02:00
Didier Lafforgue 028312bc9e Merge pull request #71 from onelaw/seo_metadata 
Adds support for page- and content instance-specific metadata.
 2011-05-16 14:28:20 -07:00
did 7dfce2c336 migration to mongoid 2.0.1 2011-05-16 23:06:46 +02:00