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

432 Commits

Author SHA1 Message Date
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
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 912251d49b big refactoring (wip) + add/edit entries for content types 2012-01-02 05:54:01 -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 81a6569fe7 UI compoment to add options for the select type field (wip) 2011-12-22 02:59:30 +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 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
Mario Visic 4ae6fe7977 False values for custom fields are now correctly exported. Fixes #250. 2011-12-15 22:11:54 +08: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 d21f32d849 upload many theme assets at once 2011-12-07 03:25:30 -08:00
did 4da434deb1 replace Asset by ContentAsset in the export module 2011-12-07 00:52:13 -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
Mario Visic 4e6fc04889 Use contents_custom_fields instead of content_custom_fields 2011-12-05 22:29:32 +08: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 35012ca2b2 polishing the current site editing screen (wip) 2011-11-29 02:24:02 +01:00
Mario Visic cecdfa4762 Merge branch 'master' into rails_3_1 2011-11-27 21:17:58 +11:00
Mario Visic 791c5f9d43 Merge pull request #223 from frisoft/master 
Method missing "disable_parent_editable_elements" for nil
 2011-11-27 01:53:25 -08: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
Mario Visic 5c6794d69c Fixed some failing dragonfly specs. 2011-11-27 19:02:20 +11:00
Mario Visic 7f7ed896cf use starts_with? instead of start_with, fixes #253 and #251 2011-11-27 18:22:00 +11:00
Mario Visic ad6273e2fd Lots of spec fixes (mostly namespacing), down to 107 failing specs. 2011-11-26 17:24:34 +11:00
Mario Visic fa138b28d0 Fixed some failing export specs. 2011-11-26 16:22:48 +11: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 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 769cf7548c Updated gemfile with kaminari again. 2011-11-20 21:36:10 +11:00
Mario Visic 5f893d51c0 Merge remote-tracking branch 'origin/master' into rails_3_1 
Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/will_paginate.rb
	lib/locomotive/engine.rb
	lib/locomotive/hosting/bushido/account_ext.rb
	lib/locomotive/hosting/bushido/enabler.rb
	lib/locomotive/hosting/bushido/hooks.rb
 2011-11-20 21:08:23 +11:00
did 72c2cb2059 rename asset to content_asset + clean the locomotive_media plugin for tinyMCE (wip) 2011-11-19 15:47:56 +01:00
Sean Grove ef5caad897 Proper mongoid exists? syntax 2011-11-16 12:04:51 -08:00
Sean Grove d1306aec53 Horrific rebasing strategy, but working code. 2011-11-16 11:39:47 -08:00
Sean Grove ed96ab1cf5 BUSHIDO_FIX: Adds bushido hooks user.added user.removed, and updates app.claimed to work with bushido_user_id as the permanent id 
Conflicts:

	lib/locomotive/hosting/bushido/hooks.rb
 2011-11-16 11:38:23 -08:00
Sean Grove 43dee9391d Uses a more careful approach when removing a user based on the bushido user.removed hook 2011-11-16 11:38:01 -08:00
Sean Grove 5a4a9f5475 BUSHIDO_FIX: Adds bushido hooks user.added user.removed, and updates app.claimed to work with bushido_user_id as the permanent id 
Conflicts:

	lib/locomotive/hosting/bushido/hooks.rb
 2011-11-16 11:37:30 -08:00
Sean Grove b2bfec1bc4 BUSHIDO_FIX: Adds hooks for user.added and user.removed, updates app.claimed event, switches to using bushido_user_id as permanent unchanging user id 2011-11-16 11:32:00 -08: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