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
|
c5692aeb2a
|
fix errors when deploying a new brand new engine instance
|
2012-01-27 02:27:26 +01: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 |
|
Mario Visic
|
34f9755d9a
|
Altered admin menu cells inheritence, fixes #257 without limiting cells version.
|
2012-01-21 15:10:58 +11: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
|
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 |
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
|
dd75f69b74
|
fix module collisions and missing namespaces all over the templates (wip)
|
2011-11-08 01:11:15 +01:00 |
|
did
|
87d2440f14
|
working on fixing issues with devise (wip)
|
2011-11-04 16:55:51 +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
|
8298b2a4bf
|
preventing recursive loop when used as engine in an app
|
2011-10-18 18:45:45 +02: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 |
|
did
|
4f7312a659
|
CAS feature + Cells
|
2011-07-25 23:07:32 +02:00 |