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
|
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
|
368f643cf0
|
theme assets page in progress
|
2011-12-07 02:09:13 +01:00 |
|
did
|
5d271239b7
|
the screen for editing site has been refactored
|
2011-11-29 14:58:19 +01:00 |
|
did
|
99e442673c
|
namespace controllers, models, ...etc (wip)
|
2011-10-31 00:02:41 +01:00 |
Sharagoz
|
a843f16be0
|
norwegian locale
|
2011-09-19 17:43:23 +02:00 |
|
Sharagoz
|
c6ab499664
|
added norwegian locale
|
2011-09-19 15:48:43 +02:00 |
|
did
|
6a2f0f17dd
|
complete the Russian version of the engine (#188): add the Russian flag + translate the Russian word in all the other locales
|
2011-08-31 23:43:52 +02:00 |
|
Didier Lafforgue
|
7a4253a7e4
|
Merge pull request #152 from frisoft/master
Bugfix: import and italian localization update.
|
2011-08-11 14:00:48 -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 |
Andrea Frigido
|
3966c7bdae
|
Italian localization update.
|
2011-08-01 16:21:15 +02:00 |
|
Andrea Frigido
|
0fde9917d5
|
Italian localization update.
|
2011-07-11 09:04:12 +02:00 |
|
did
|
37d10aa25b
|
fix bug #104
|
2011-07-06 11:48:04 -07:00 |
|
did
|
6acec074e2
|
spanish translation (ticket #103)
|
2011-07-06 00:33:34 +02:00 |
|
did
|
0737919c2c
|
Dutch translation (ticket #92)
|
2011-07-05 23:55:26 +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
|
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
|
2cc07b3957
|
fix a little typo in the locales
|
2011-06-23 07:44:14 -07:00 |
|
did
|
3c31c8dbcf
|
remove all the references to asset_collections
|
2011-06-21 06:12:20 -07:00 |
|
Andrea Frigido
|
67dd6304e0
|
Tiny_mce and inline_edit italian localization.
|
2011-05-04 18:57:01 +02:00 |
|
Andrea Frigido
|
bee4f01e56
|
Italian localization.
|
2011-05-04 13:05:16 +02:00 |