github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,265 Commits 13 Branches 7 Tags 15 MiB
52247242fc
Commit Graph

1265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mario Visic
52247242fc Requiring locomotive is now much less noisy. 2012-03-12 14:04:52 +08:00
Didier Lafforgue
37374207e8 wrong spaces in one of the locale yml files 2012-03-12 03:21:28 +01:00
Didier Lafforgue
fbb92010e9 Merge branch '2.0.0.rc' of github.com:locomotivecms/engine into 2.0.0.rc 2012-03-12 03:13:00 +01:00
Didier Lafforgue
9a9f270d99 fix issue #317 + with_scope works now with has_many relationships + clean code 2012-03-12 03:09:20 +01:00
Didier Lafforgue
5e31865f3b Merge pull request #323 from paulsponagl/de_locale_changes_final_2.0 
De locale changes final 2.0
 2012-03-09 14:14:59 -08:00
Paul Sponagl
fa9cbe2276 Neuer -> Neue 2012-03-09 16:26:19 +01:00
Paul Sponagl
ca4640addb Final German translation 2012-03-09 16:20:03 +01:00
Didier Lafforgue
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
Didier Lafforgue
7ab8110e41 with_scope also takes care of order_by (pull request #278) 2012-03-09 01:01:09 +01:00
Didier Lafforgue
4cccff065a merge 2012-03-08 19:43:42 +01:00
Didier Lafforgue
b3b7519c7c new version of the custom_fields gem 2012-03-08 19:40:48 +01:00
did
1f49eca09f with_scope did not resolve (ie the Liquid way) correctly the values 2012-03-08 09:24:33 -08:00
Didier Lafforgue
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
Didier Lafforgue
038d19d3af merge pull request #318 2012-03-08 02:43:26 +01:00
Didier Lafforgue
0c65516807 fix issue #320 2012-03-08 02:32:59 +01:00
Paul Sponagl
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
Didier Lafforgue
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
Didier Lafforgue
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
did
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
did
1da5617b80 it did not display the no_site page 2012-03-05 00:09:54 -08:00
Didier Lafforgue
fcf32f9d53 update deutch translations 2012-03-03 11:23:39 +01:00
did
a1cbdf9ed8 page templates were not updated if a related snippet got modified (BUG) 2012-03-02 08:37:54 -08:00
Didier Lafforgue
989f608755 change the default way to config AWS for carrierwave + fix issue #299 2012-03-02 01:46:02 +01:00
Didier Lafforgue
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
Didier Lafforgue
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
Didier Lafforgue
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
Didier Lafforgue
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
Didier Lafforgue
b994b87194 fixing cucumber tests (still wip) 2012-02-29 02:11:56 +01:00
Didier Lafforgue
c5577240de add the engine version in the footer (useful) 2012-02-29 01:15:49 +01:00
did
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
Didier Lafforgue
a2308787f1 fix theme assets tests 2012-02-28 11:25:51 +01:00
did
520b68104b fixing tests (wip) + sync javascript objects when updating an entry in a has_many relationship 2012-02-27 03:48:06 -08:00
Didier Lafforgue
c6e1276974 fix the broken tests 2012-02-21 01:45:45 +01:00
Didier Lafforgue
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
Didier Lafforgue
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
Didier Lafforgue
c5ddabd585 new version of the custom_fields gem 2012-02-20 10:53:46 +01:00
Didier Lafforgue
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
Didier Lafforgue
dae0b665ac script to upgrade from 1.0. to 2.0 (wip) 2012-02-19 10:38:56 +01:00
Didier Lafforgue
8f1ac5968f better way of declaring a hosting env 2012-02-18 15:55:20 +01:00
Didier Lafforgue
ffee024a96 a little bit of cleaning + prepare the engine to make it work with the hosting extensions 2012-02-18 01:57:06 +01:00
Didier Lafforgue
d0cc2984b8 upgrade fog (we need a newer version for the heroku-api gem) 2012-02-17 11:31:51 +01:00
Didier Lafforgue
ecf6998a68 fix the cucumber tests for pages 2012-02-17 09:56:11 +01:00
Didier Lafforgue
4269a00985 fixing cucumber tests (wip) 2012-02-17 01:16:22 +01:00
Didier Lafforgue
085a54d7c1 introduce the proxy collection liquid drop so that we can paginate for real + fix the cucumber features for the public part of the engine 2012-02-17 00:51:33 +01:00
Didier Lafforgue
02e48f5c36 fix the specs for the page model 2012-02-16 22:07:00 +01:00
Didier Lafforgue
73b559260e fix specs for the content_type and editable_element models 2012-02-16 16:17:30 +01:00
Didier Lafforgue
2fd0410b66 tests pass for the account, content_entry and content_asset models 2012-02-16 12:42:41 +01:00
Didier Lafforgue
6619d4e5dc all the non-models specs have been fixed 2012-02-16 02:45:14 +01:00
Didier Lafforgue
64a050dff9 fixing specs (wip) + cell specs are fine 2012-02-16 01:32:37 +01:00
Didier Lafforgue
87c8f3bfd7 enhance the nav tag (allow custom css classes for the list and the selected menu item) + clean the locomotive.rb template file 2012-02-15 18:26:58 +01:00