did
|
ab507dc165
|
change the default API base path + implement the API for content_assets, content_types and pages resources
|
2012-01-24 21:16:53 +01:00 |
|
did
|
0534c5504f
|
prevent pow to crash when no flash message (bug) + add api resources for pages
|
2012-01-24 01:00:41 +01:00 |
|
did
|
739d2db0a9
|
first api draft
|
2012-01-23 09:05:50 +01:00 |
|
Gil Vandendriessche
|
d665a85591
|
Add sample option on import rake task
|
2012-01-21 16:05:36 +11:00 |
|
Mario Visic
|
07ff99e135
|
Ensure uniqueness and format of an accounts email address.
|
2012-01-21 15:51:38 +11:00 |
|
Mario Visic
|
40c2902e80
|
Added shoulda matchers.
|
2012-01-21 15:51:16 +11:00 |
|
Mario Visic
|
0a2bd13058
|
Merge pull request #283 from cwoodcox/facebook
Upgrade to devise 1.5.x
|
2012-01-20 20:19:08 -08:00 |
|
Mario Visic
|
34f9755d9a
|
Altered admin menu cells inheritence, fixes #257 without limiting cells version.
|
2012-01-21 15:10:58 +11:00 |
|
Corey Woodcox
|
868c2d2e0e
|
upgrade devise to 1.5.x
|
2012-01-20 19:32:53 -07:00 |
|
did
|
4d0f8610c5
|
bad display of content types if none + add new gems for tinymce and aloha
|
2012-01-21 01:48:00 +01: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
|
0f3c672777
|
make the toolbar smaller
|
2012-01-18 02:04:48 +01:00 |
|
did
|
fc20fe70c9
|
fix annoying bug about popups within the submenu
|
2012-01-18 01:54:26 +01:00 |
|
did
|
b8b8cef089
|
make the edition of content types more robust (ex: better errors handler)
|
2012-01-18 01:43:01 +01:00 |
|
did
|
09d6060633
|
refactoring (rename modules, clean code, remove useless files, ...etc) + improve the inline editor module (locale picker + better ui workflow)
|
2012-01-17 17:04:45 +01:00 |
|
did
|
801f7bfca5
|
Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1
|
2012-01-17 12:05:52 +01:00 |
|
did
|
e210953d01
|
inline editor work in progress
|
2012-01-17 12:05:39 +01:00 |
|
did
|
7169abb8c2
|
stylish buttons in the toolbar
|
2012-01-17 03:21:30 +01:00 |
|
did
|
89020e7cf5
|
got a working version of the inline editor
|
2012-01-17 02:53:49 +01:00 |
|
did
|
ebe149110b
|
first draft of the new inline editing toolbar
|
2012-01-16 23:59:59 +01:00 |
|
Mario Visic
|
15f9111ea8
|
Small fix to the global action spec.
|
2012-01-15 17:05:33 +11:00 |
|
Mario Visic
|
9a06042c4b
|
Fixed some main menu tests.
|
2012-01-15 16:50:58 +11:00 |
|
Mario Visic
|
ddfd8c6a07
|
Fixed up some specs for the global action spec.
|
2012-01-15 15:38:07 +11:00 |
|
Mario Visic
|
ae244c2703
|
Fixed a failing test (class missing namespace).
|
2012-01-15 15:05:50 +11:00 |
|
Mario Visic
|
4622c4359f
|
Fixed up a failing test due to the i18n module, left a fixme note.
|
2012-01-15 15:05:31 +11:00 |
|
Mario Visic
|
216b77ab41
|
Fixed up a bad merge of the content instance spec changes.
|
2012-01-15 14:50:23 +11:00 |
|
did
|
4060b1859f
|
use the right path to the back-office in the js components as well as in the middlewares
|
2012-01-14 14:54:01 +01:00 |
|
Mario Visic
|
a50715091d
|
Merge remote-tracking branch 'origin/rails_3_1' into rails_3_1
|
2012-01-15 00:03:06 +10:30 |
|
Mario Visic
|
8ac8289394
|
Merge remote-tracking branch 'origin/master' into rails_3_1
Conflicts:
app/models/content_instance.rb
config/locales/admin_ui.de.yml
public/javascripts/admin/inline_editor_toolbar.js
spec/models/content_instance_spec.rb
|
2012-01-15 00:02:46 +10:30 |
|
Mario Visic
|
c2779dde51
|
Merge pull request #277 from jstirk/pr-229
German locale changes from locomotivecms/engine#229
|
2012-01-14 05:11:19 -08:00 |
|
benni
|
00035287c3
|
Update german locales (admin_ui and formtastic)
Conflicts:
config/locales/admin_ui.de.yml
config/locales/formtastic.de.yml
|
2012-01-14 23:19:57 +10:30 |
|
benni
|
edc1907cfa
|
Fixed i18n bug in german locale when creating a new resource from api.
|
2012-01-14 23:13:18 +10:30 |
|
did
|
531017ab62
|
merging
|
2012-01-14 13:14:59 +01:00 |
|
did
|
50a2453995
|
polish again the content_locale picker
|
2012-01-14 13:12:44 +01:00 |
|
Mario Visic
|
23f3705223
|
Added a contributing section to the readme.
|
2012-01-14 22:34:39 +10:30 |
|
Mario Visic
|
14fc4bf12d
|
Merge remote-tracking branch 'origin/master'
|
2012-01-14 22:07:08 +10:30 |
|
Mario Visic
|
a0d02b2fce
|
Add a failing tests for ContentInstance#set_visibility returning false.
|
2012-01-14 22:06:42 +10:30 |
|
Mario Visic
|
81b89ba389
|
Merge pull request #273 from giorgian/fix_content_not_visible
Fix a before_filter preventing to save a content instance with a
|
2012-01-14 03:36:10 -08:00 |
|
Mario Visic
|
76b611b848
|
Merge pull request #268 from paulsponagl/issue_240
fix issue 240 by using slug to find content-type
|
2012-01-14 03:22:58 -08:00 |
|
Mario Visic
|
9aa6bf89be
|
Merge pull request #270 from giorgian/fix_i18n_files_for_psych
Fix i18n files so that they don't make Psych angry.
|
2012-01-14 02:59:42 -08:00 |
|
Mario Visic
|
7eccb97b44
|
Merge pull request #276 from antulik/master
Added russian translation for tiny_mce image uploader
|
2012-01-14 02:38:01 -08:00 |
|
Anton Katunin
|
3fad905314
|
Added russian translation for tiny_mce image uploader
|
2012-01-14 21:05:41 +10:30 |
|
Mario Visic
|
0476771ee4
|
Merge pull request #271 from twinslash/russian_locale
Added russian localisation to tiny_mcs
|
2012-01-14 02:21:05 -08:00 |
|
Mario Visic
|
e6a527f0f5
|
Merge pull request #275 from twinslash/russian_locale_to_inline_editor
Added ru locale to inline_editor
|
2012-01-14 01:58:14 -08:00 |
|
Mario Visic
|
8f5a363d74
|
Remove cucumber-rails version.
|
2012-01-14 16:38:42 +10:30 |
|
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 |
|
Mario Visic
|
04b1a7aa90
|
Bump RedCloth to a newer version to avoid warnings when running tests.
|
2012-01-14 13:04:34 +08: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 |
|
Mac Shifford
|
3e7babc9dd
|
Added ru locale to inline_editor
|
2012-01-13 11:55:28 +03:00 |
|