1ae9557515
back to the original editable_short_text ( #349 )
2012-04-14 13:38:47 +02:00
21469ce367
do not display the content types select box if a page is not templatized
2012-04-14 11:55:24 +02:00
06fa564f37
fix a couple of potential bugs when playing with the site locales
2012-04-13 18:32:55 +02:00
a507d756b7
repair the js slugify method
2012-04-13 18:08:53 +02:00
f7388d14e7
Merge pull request #356 from colibri-software/inline_editor_firefox_fix
...
Inline editor bug in Firefox
2012-04-13 07:21:56 -07:00
ebd3081205
Merge remote-tracking branch 'origin/master'
2012-04-13 22:14:23 +08:00
edca6323fb
Fixed a regression when updating javascript stringify. Fixes #355 .
2012-04-13 22:11:44 +08:00
9dc3f778a4
Merge pull request #351 from willcosgrove/spinny-toggle-buttons
...
Spinny toggle buttons
2012-04-13 06:40:07 -07:00
56a0affbcb
Changed iframe resize function
...
Instead of resizing the iframe based on the height of the body element
of the iframe content, do it based on the entire content height. Also,
don't compare the inner content height to the body height of the outer
page, but use the iframe height instead.
2012-04-13 10:03:31 -03:00
7a595208aa
fix issue #338
2012-04-13 14:38:00 +02:00
560afc6b0a
Fixed my css and javascript problems
2012-04-11 15:35:23 -05:00
cd703970b4
Added new buttons and styling
2012-04-11 14:24:41 -05:00
106cc6fc50
fix issue #346
2012-04-11 00:26:59 +02:00
2798e15481
Made JS permalink regexp more generic for non–latin languages.
...
Fixed specs for permalinks generated by stringex.
2012-04-08 14:41:03 +08:00
ad9bd5f5f3
support cyrilic in slug
2012-04-08 14:40:43 +08:00
7260f36be7
Downcase subdomains and domains when given as user input.
2012-04-06 23:10:16 +08:00
6677689902
Load the locomotive mount path earlier in the JS to make it available for backbone models. Fixes #336
2012-04-06 15:54:54 +08:00
4c1e9fa9c4
Fix the problem where the last domain could not be removed. Closes #335 .
2012-04-02 21:11:30 +08:00
21c5e8a627
small optimization when retrieving a page from a path
2012-03-29 16:17:09 +02:00
7877f11669
Merge branch '2.0.0.rc' of github.com:locomotivecms/engine into 2.0.0.rc
2012-03-28 17:33:48 +02:00
3f6e7acda6
fix issue #333
2012-03-28 17:33:20 +02:00
35e29d0e4b
Merge pull request #331 from pimpin/2.0.0.rc
...
2.0.0.rc
2012-03-27 16:25:49 -07:00
11d92ab80e
nested templatized pages finally done (+ specs) + upgrade gems + change the zindex value of the start button for the inline editor + change version (rc.3) for the next rc release
2012-03-28 00:26:32 +02:00
ed15c0d6b5
templatized pages can have now sub pages
2012-03-26 16:31:28 +02:00
65c570c4aa
Update app/assets/stylesheets/locomotive/inline_editor/layout.css.scss
2012-03-23 16:53:42 +01:00
8b80a3e840
Update app/assets/stylesheets/locomotive/inline_editor/layout.css.scss
2012-03-23 15:57:55 +01:00
a8d57794de
fix issue #292
2012-03-23 01:29:12 +01:00
a9aeffba9b
it is now possible to change the response type of a page + correct translations in French
2012-03-22 19:20:31 +01:00
6b8e3db8c3
add missing files for the last commit about the control editable element + implement feature #326
2012-03-22 02:13:24 +01:00
b3b0a5ac16
new editable element for a page: the control
2012-03-22 00:50:34 +01:00
ab5a4755b8
make the editable elements more robust when working with localization + write tests to prove it
2012-03-21 03:21:29 +01:00
e2f60f2e15
the template of related pages were not updated for the non default locale
2012-03-19 09:15:12 -07:00
cfbe68564d
fixed editable elements (wip)
2012-03-19 02:29:59 +01:00
fbd945cf6d
implement feature #324
2012-03-14 01:16:01 +01:00
79f958c505
create mongoDB indexes for locomotive models without any errors
2012-03-13 16:37:19 +01:00
fad363a92a
use the full witdh when displaying the UI of the has_many type
2012-03-13 16:13:40 +01:00
9a9f270d99
fix issue #317 + with_scope works now with has_many relationships + clean code
2012-03-12 03:09:20 +01:00
1c902a5448
fix a bug about the editable_file not correctly displayed in a snippet given as an argument of the new nav tag
2012-03-09 13:05:44 +01:00
7ab8110e41
with_scope also takes care of order_by (pull request #278 )
2012-03-09 01:01:09 +01:00
effce313bf
Merge pull request #319 from paulsponagl/nav_with_liquid_2.0
...
added a snippet option to the liquid nav tag
2012-03-07 17:44:00 -08:00
0c65516807
fix issue #320
2012-03-08 02:32:59 +01:00
b13c5d1d40
added a snippet option to the liquid nav tag
...
this is useful if you want to render more than
just a page.title string within the nav list item.
(page.menue_image, page.menue_teaser...)
use nav snippet: "<liquid snippet>" to provide a string
or nav snippet: "<snippetname>" to load the snippet from db.
added page.<editable_field> for usage within liquid templates
2012-03-07 16:32:25 +01:00
37042eaa03
the content_entries API returns always a flat list of entries + fix a bug about cycling dependencies when the content_type has a field named source
2012-03-07 02:56:56 +01:00
ac823aac66
entries can be grouped by a belongs_to field in the back-office + add the show action for the content_entries API
2012-03-07 01:39:24 +01:00
f77bdd9826
fix #289 . This fix is different from the one in the master branch. It only the filename (without the whole path and the extension)
2012-03-05 14:17:33 -08:00
a1cbdf9ed8
page templates were not updated if a related snippet got modified (BUG)
2012-03-02 08:37:54 -08:00
05baecad0b
change the path to files added in the content entries + ui settings are a hash not an object
2012-03-02 00:31:45 +01:00
3e3691ad4a
upgrade to mongoid 2.4.5 + allow authors to edit editable elements from the back-office (bug)
2012-03-01 16:39:38 +01:00
74038467aa
Merge branch '2.0.0.rc' of github.com:locomotivecms/engine into 2.0.0.rc
2012-03-01 11:07:42 +01:00
50a3addf45
fix ALL the cucumber tests + also solve a couple of UI bugs with the has_many and many_to_many relationships
2012-03-01 11:07:22 +01:00
c5577240de
add the engine version in the footer (useful)
2012-02-29 01:15:49 +01:00
a1bc3db8a6
path to codemirror/overlay.js has been modified in the last version of the codemirror gem
2012-02-28 06:54:02 -08:00
a2308787f1
fix theme assets tests
2012-02-28 11:25:51 +01:00
520b68104b
fixing tests (wip) + sync javascript objects when updating an entry in a has_many relationship
2012-02-27 03:48:06 -08:00
c6e1276974
fix the broken tests
2012-02-21 01:45:45 +01:00
fa2cd996ce
icons for redirect and templatized pages were not displayed in the back-office + fix the random issue when getting an API token in development (very weird behaviour) + remove the default mongoid scope for pages + force the depth
2012-02-20 17:21:32 +01:00
61281db943
the API for content_types now allows to change the label_field property of a content type
2012-02-20 16:16:59 +01:00
dd9b382637
alpha version of the upgrade script (good results with my existing locomotive sites) + fix bugs according to my tests with my existing live websites + remove useless code (polishing)
2012-02-20 01:15:43 +01:00
02e48f5c36
fix the specs for the page model
2012-02-16 22:07:00 +01:00
73b559260e
fix specs for the content_type and editable_element models
2012-02-16 16:17:30 +01:00
2fd0410b66
tests pass for the account, content_entry and content_asset models
2012-02-16 12:42:41 +01:00
3b5d04238f
remove deprecated warning about ActiveSupport::Concern + add the handle property to Page in order to retrieve them more easily (very useful to display a page from an external controller for instance
2012-02-11 00:39:06 +01:00
1332185d85
the locale was missing when saving an editable element by the inline editor
2012-02-10 01:42:06 +01:00
62eaeb10f5
templatized page can now use models from the main app + add new liquid filters
2012-02-10 00:57:57 +01:00
39d9c354da
API access for the current site + easy way to specify the localization of any controllers + fix a minor bug about adding/removing domains
2012-02-09 11:36:10 +01:00
a5e9e52996
allow the main app to add custom code in the locomotive layout
2012-02-07 15:20:38 +01:00
b4afec5fd3
flags are clickable
2012-02-07 11:59:55 +01:00
f1662770e7
use the default carrierwave settings for envs other than development and production + does not include the templates of snippets in the theme assets index page (it was breaking the layout in locomotive for some snippets)
2012-02-07 11:17:56 +01:00
f2467bbf42
ask for default site locale when creating the first site
2012-02-07 01:29:33 +01:00
112d61ac3b
no more references to zip templates
2012-02-06 08:58:50 -08:00
fa36b95a9d
get rid of warnings about InstanceMethods (deprecated) + make the engine work smoother with an existing app + clean code
2012-02-06 00:54:09 +01:00
25e08596ef
refactor the code (move some pieces of code into the custom_fields gem) + solve a ton of bugs: circular dependencies inside the content_entry presenter, fix Locomotive.mounted_on (broken in rails 3.2), js errors when creating a page, locale switcher broken if a page was not translated in the target locale
2012-02-04 02:10:55 +01:00
2a911d912c
implement the UI for the many_to_many relationship (WIP)
2012-02-03 01:50:45 +01:00
9e9fe49ccf
the has_many ui component is done
2012-02-02 16:53:26 +01:00
1703c05693
can edit memberships now (js bug)
2012-02-01 15:15:20 +01:00
42a2bba538
sort and remove entries from a has_many relationship
2012-02-01 04:09:35 -08:00
dfd437a762
fix an issue with compass + move to rails 3.2 + switch from mongoid_acts_as_tree to mongoid_tree + implement the UI to deal with has_many field types (wip)
2012-02-01 02:01:42 +01:00
e2bd55fe35
add the UI for the belongs_to custom field
2012-01-31 01:50:09 +01:00
c9f07c823f
remove the old way of doing cross domain authentication (use the :domain => all option) + fix a couple of tiny bugs
2012-01-30 10:56:38 +01:00
a85db53520
add .css to dialog.scss
2012-01-28 12:59:04 +01:00
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
c5692aeb2a
fix errors when deploying a new brand new engine instance
2012-01-27 02:27:26 +01:00
b5fa2c761a
change the location url for the API responses + force the use of the default site locale when creating a new entry, content type or page
2012-01-26 07:51:32 -08:00
50917a919e
Use the 2.0.0.rc branch for the custom_fields gem
2012-01-26 02:41:31 +01:00
c0b8587eb2
rename the i18n site module into locales in order to avoid conflicts with the original i18n + rendering a page according to a locale specified in the url seems to work (tests are following)
2012-01-26 02:33:39 +01:00
4600f94922
extend i18n to pages (wip)
2012-01-25 22:07:10 +01:00
5c191e59cd
Merge remote-tracking branch 'origin/2.0.0.rc' into 2.0.0.rc
...
Conflicts:
Gemfile.lock
2012-01-25 22:20:05 +11:00
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
81db1da423
fix spelling error in locales
2012-01-25 18:52:54 +11:00
7ace1d9a48
fix the broken link to the back-office in the toolbar when the inline_editor tag is missing
2012-01-24 22:04:49 +01:00
e523cb952c
access entries of a content type from the API
2012-01-24 21:33:34 +01:00
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
0534c5504f
prevent pow to crash when no flash message (bug) + add api resources for pages
2012-01-24 01:00:41 +01:00
739d2db0a9
first api draft
2012-01-23 09:05:50 +01:00
34f9755d9a
Altered admin menu cells inheritence, fixes #257 without limiting cells version.
2012-01-21 15:10:58 +11:00
4d0f8610c5
bad display of content types if none + add new gems for tinymce and aloha
2012-01-21 01:48:00 +01:00
7af9ea34a6
trying to make it work with the precompilation of assets (issue with Aloha and TinyMCE)
2012-01-20 14:46:09 +01:00
0f3c672777
make the toolbar smaller
2012-01-18 02:04:48 +01:00
fc20fe70c9
fix annoying bug about popups within the submenu
2012-01-18 01:54:26 +01:00
b8b8cef089
make the edition of content types more robust (ex: better errors handler)
2012-01-18 01:43:01 +01:00
Didier Lafforgue
Mario Visic
Didier Lafforgue
Alex Sanford
Will Cosgrove
Sergey Kuleshov
Pierre Merlin
Paul Sponagl
Corey Woodcox