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 |
|
Paul Sponagl
|
df10701746
|
added translations af bennibu
|
2012-01-04 17:43:47 +01:00 |
|
Paul Sponagl
|
dc324893ce
|
german translation additions
|
2012-01-04 14:12:41 +01: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
|
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 |
|
did
|
368f643cf0
|
theme assets page in progress
|
2011-12-07 02:09:13 +01:00 |
|
did
|
37684654ac
|
first attempt to polish the theme assets page + refactor the css (wip)
|
2011-12-03 01:11:31 +01:00 |
|
did
|
fb0e87c64d
|
done (for now) with the my account screen
|
2011-12-02 01:43:49 +01: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
|
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
|
b2a5e1de85
|
new file input behaviour (for now just on editable_file)
|
2011-11-21 03:12:06 -08: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
|
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
|
32f7552a50
|
typo in the French translation for Norway + remove crack from Gemfile
|
2011-10-17 19:15:08 +02:00 |
|
Sharagoz
|
35e2fd2d57
|
Merge branch 'master' of git://github.com/locomotivecms/engine
|
2011-10-08 21:17:03 +02: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 |
|
Mario Visic
|
4c55401728
|
Merge pull request #209 from GarPit/master
Liquid syntax mistake
|
2011-09-16 19:02:03 -07:00 |
|
PitOn
|
6945bed820
|
liquid syntax translated mistake
|
2011-09-16 11:23:03 +04: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
|
4a82935b46
|
Merge pull request #188 from GarPit/master
Russian translation
|
2011-08-31 14:21:47 -07:00 |
|
did
|
cd5f3b9712
|
a couple of Dutch translation keys were missing (issue #181)
|
2011-08-30 23:39:45 +02:00 |
|
GarPit
|
1e5e151be6
|
russian translation
|
2011-08-29 16:54:21 +04:00 |
|
PitOn
|
367b0aab4f
|
formtastic.ru.yml finished
|
2011-08-30 00:35:56 +04:00 |
|
PitOn
|
db5cb0950d
|
devise.ru.tml finished
|
2011-08-30 00:03:47 +04:00 |
|
PitOn
|
a1d976ace1
|
default.ru.yml finished
|
2011-08-29 23:52:42 +04:00 |
|
PitOn
|
a46019da40
|
admin_ui.ru.yml finished
|
2011-08-29 23:48:33 +04:00 |
|
PitOn
|
ef75d4acef
|
devise transaltions
|
2011-08-27 06:33:33 +04:00 |
|
PitOn
|
d9dafd2222
|
default.yml translations
|
2011-08-27 06:27:14 +04:00 |
|
PitOn
|
e8bea2844b
|
more translations
|
2011-08-27 00:45:25 +04:00 |
|
GarPit
|
75e6f2cd08
|
more translations
|
2011-08-17 18:28:49 +04:00 |
|
did
|
4543e597ed
|
complete issue #162
|
2011-08-14 12:51:11 -07:00 |
|
Enrique García Cota
|
cab52f8f7b
|
added/corrected entries in admin_ui.es.yml
|
2011-08-12 14:13:44 +02:00 |
|
GarPit
|
09689a0cc9
|
initial ru translation
|
2011-08-12 15:32:37 +04: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 |
|
did
|
4f7312a659
|
CAS feature + Cells
|
2011-07-25 23:07:32 +02:00 |
|