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

54 Commits

Author SHA1 Message Date
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 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 b383086242 wip 2011-11-06 12:18:34 +01:00
did a3f66e19b5 fix issue #243 (Kaminari causing error on Bushido) 2011-11-05 15:18:15 +01:00
did 87d2440f14 working on fixing issues with devise (wip) 2011-11-04 16:55:51 +01:00
did 99e442673c namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +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 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 aad4b09ad7 first draft of the export module (not tested) 2011-07-04 03:22:04 -07: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 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 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 2cba14afec do not run the locomotive core initializer if engine 2011-04-06 01:29:11 +02:00
did 551ef03ff6 simply the installation screens + fix all the broken tests + add tests for bushido 2011-04-05 02:18:17 +02:00
dinedine c0a5a4b443 single site / multi sites option in progress + integrating bushi.do + revert back to mongoid rc.7 2011-04-04 01:59:41 +02:00
did 551d8a5761 big refactoring of the locomotive config file in order to handle bushido / single / multi sites, ...etc 2011-04-01 02:34:19 +02:00
did 031113799e a little bit of refactoring 2011-03-28 01:49:12 +02:00
Sean Grove fc53a5acf4 Update to the new version of bushido gem 2011-03-23 01:27:22 -07:00
Sean Grove 89758570f8 Require bushido files and enable support if needed. 2011-03-21 03:33:17 -07:00
did a66e745746 fix bug #52 2011-03-17 17:41:25 +01:00
did a7959a8de8 fix bug preventing the installation of locomotive as an engine 2011-03-16 18:24:15 +01:00
Dirk Kelly 44f84c266b merge 2011-03-07 19:59:02 +08:00
did a2ea522964 clean translations (a part of it moved to the CustomFields gem) + refactor the custom fields form (mustache) as well as enhance the ui/look&feel + fix some bugs related to the creation/edition of content types and contents 2011-03-05 00:29:40 +01:00
Dirk Kelly 333b6fab5c dont require delayed job 2011-02-22 08:32:40 +08:00
dinedine 6f2033a356 make the email notification more robust 2011-01-18 16:06:36 +01:00
dinedine acaf997b6e build locomotive engine as a gem 2010-10-15 02:05:21 +02:00
dinedine 282fbb7244 merging 2010-10-14 14:37:14 +02:00
dinedine 54063d6b46 create a middleware for serving fonts (solve cross domain issue) + add cache for consume liquid tag + fix image picker 2010-10-11 16:26:46 +02:00
dinedine eabe4903f3 refactor locomotive liquid drops + implement the theme or site import page (95% done) 2010-09-29 00:08:11 +02:00
Jacques Crocker 350aee82a8 Vendoring mongo_session_store so we have one less dependency 2010-09-28 02:19:55 -07:00
Jacques Crocker faccdef5a5 adding mimetype_fu require 2010-09-28 00:46:12 -07:00
Jacques Crocker ea4c09c7ce Updating dependencies, removing jeweler, and cleaning up gemspec 2010-09-27 23:04:40 -07:00
dinedine 39886427e0 first and unfinished draft of the import tool 2010-09-23 00:59:30 +02:00
Jacques Crocker 071196e97b Upgrading to Rails3 rc 2010-07-29 16:21:48 -07:00
Jacques Crocker a09329c030 Cleaning whitespace on all .rb files so commit diffs from now on will be a bit more readable 2010-07-23 13:09:54 -07:00
dinedine 0be89c253d action_mailer_request plugin was not called when Locomotive was used as an engine [fixed] 2010-07-15 13:10:00 +02:00
dinedine 6096d18689 annoying bug with InheritedResources, engine and custom actions 2010-07-14 02:27:38 +02:00
dinedine f4e2d09bdf fix a bug with IR only when Locomotive is used an engine + fix minor stuff 2010-07-14 01:37:02 +02:00
dinedine 0671a55ef8 sitemap + use inherited_sources gem to refactor controllers + fix bugs + clean stuff + save some forms with CMD + S (in progress) 2010-07-13 02:46:17 +02:00
dinedine c38a8ff9dd adding 2 new liquid tags: consume (to retrieve posts from a blog for instance) + nav (display children of a page) + fix a few bugs 2010-07-06 02:05:47 +02:00
dinedine a6bde2b8e5 new custom field type: File + fix minor issue with Date 2010-06-30 15:18:17 +02:00
dinedine c5b5c6ded4 move patches for mongoid / carrierwave + add patch for mongoid + clean stuff 2010-06-30 00:09:47 +02:00
dinedine b7e1cd0926 categories in content types have been improved a lot + cross-site session + meta keys / description for site + clean code + fix bugs 2010-06-16 16:43:29 +02:00
dinedine 29c22c05c1 heroku support + fix minor bugs 2010-06-14 15:04:01 +02:00
dinedine f567b7754f change devise config in routes.rb + clean code + fix broken tests 2010-06-11 00:07:59 +02:00
dinedine 9e7d1d3a08 make an engine of the cms 2010-06-03 17:32:40 +02:00
dinedine eaaa2b0d35 theme asset picker in progress 2010-06-02 02:39:05 +02:00
dinedine 176d378ce5 clean code and refactoring a lot + handle non published page 2010-06-01 02:06:46 +02:00