did
|
cdab48f0a9
|
isolate the engine (urls, helpers, ...etc) + change urls + remove the warning about bson_ext
|
2011-11-01 00:44:23 +01:00 |
|
did
|
99e442673c
|
namespace controllers, models, ...etc (wip)
|
2011-10-31 00:02:41 +01:00 |
|
did
|
ed6020be3e
|
upgrade to new gems + remove hosting modules + change settings for Rails 3.1 + move assets to app/assets
|
2011-10-30 13:17:05 +01:00 |
Mario Visic
|
9f8906d840
|
Merge branch 'master' into 236_paginate_has_many
|
2011-10-29 14:36:01 +08:00 |
|
Mario Visic
|
4939017f8d
|
No Site now renders a 404 error, this will prevent indexing of pages that do not exist.
|
2011-10-29 14:35:23 +08:00 |
|
Mario Visic
|
786d2d9693
|
Added will paginate to liquid.
|
2011-10-24 23:44:35 +08:00 |
|
Mario Visic
|
e6abd6bbe0
|
Path fix for pagination.
|
2011-10-24 23:37:39 +08:00 |
|
Mario Visic
|
2bb9f5ed05
|
Revert "Arrays now paginate correctly."
This reverts commit 25441ff60a.
|
2011-10-24 23:34:43 +08:00 |
|
Mario Visic
|
25441ff60a
|
Arrays now paginate correctly.
|
2011-10-24 22:35:21 +08:00 |
Didier Lafforgue
|
05e3e73210
|
Merge pull request #230 from Sharagoz/master
Norwegian translations
|
2011-10-17 10:07:43 -07:00 |
|
Didier Lafforgue
|
b655431ea6
|
Merge pull request #228 from pacifists/master
added published? and listed? methods for Page drop
|
2011-10-17 10:03:35 -07:00 |
|
did
|
443606f0f3
|
fix issue #216
|
2011-10-17 19:00:10 +02:00 |
Sharagoz
|
35e2fd2d57
|
Merge branch 'master' of git://github.com/locomotivecms/engine
|
2011-10-08 21:17:03 +02:00 |
Rytis Lukoševičius
|
6b9d2317da
|
adding .published? and .listed? methods for the liquid Page drop class
|
2011-10-04 04:35:40 +03:00 |
Andrea Frigido
|
d5534a4a2b
|
Bugfix in snippets with block and editable_elements.
|
2011-09-27 09:01:55 +02:00 |
|
did
|
718b3c67bb
|
improve the with_scope tag based on the work on the editor
|
2011-09-27 00:25:47 +02:00 |
|
did
|
ce24270948
|
fix issue #193
|
2011-09-22 01:38:23 +02:00 |
|
Sharagoz
|
ffc7057669
|
"no" locale added to config options
|
2011-09-19 16:15:25 +02:00 |
Karl Brightman
|
769b0569db
|
Added examples
|
2011-09-16 11:37:48 +08:00 |
|
Karl Brightman
|
75f4835d3e
|
Integrated next and previous methods for content in content types
|
2011-09-16 11:35:40 +08:00 |
|
did
|
8dfefe5094
|
fix issue #201
|
2011-09-14 11:32:14 +02:00 |
|
Mario Visic
|
8dbd51734a
|
Visiting /edit when not authenticated now sends users to the login page.
|
2011-09-04 01:15:43 +08:00 |
|
Didier Lafforgue
|
4a82935b46
|
Merge pull request #188 from GarPit/master
Russian translation
|
2011-08-31 14:21:47 -07:00 |
GarPit
|
1e5e151be6
|
russian translation
|
2011-08-29 16:54:21 +04:00 |
Arjen Oosterkamp
|
a78bcdaf38
|
Added .htc file content type to white list
Added .htc file content type javascripts folder
|
2011-08-29 10:46:31 +02:00 |
|
Didier Lafforgue
|
201063aae0
|
Merge pull request #180 from mariovisic/cache_double_render_error
Issue #176 Fix: Do not render twice for cached pages.
|
2011-08-25 12:56:17 -07:00 |
|
did
|
71a592eec1
|
fix issue #177
|
2011-08-25 18:27:43 +02:00 |
|
Mario Visic
|
fdf55aee88
|
Do not render twice for cached pages.
|
2011-08-25 22:11:57 +08:00 |
|
did
|
01f6a0aad5
|
fix issue #171
|
2011-08-25 15:32:00 +02:00 |
Alex Sanford
|
88fd17a5aa
|
Fixed issue with tablerow tag
|
2011-08-19 10:10:26 -03:00 |
|
did
|
8e26b922f4
|
BSON::ObjectId has to be converted in String in liquid templates
|
2011-08-18 12:03:34 +02:00 |
|
Didier Lafforgue
|
c3ba38216d
|
Merge pull request #167 from pacifists/master
added parent and breadcrumbs methods to page drop
|
2011-08-15 15:38:20 -07:00 |
|
did
|
2d4f3df106
|
has_many target is not exported correctly (issue #165) + fix the import function as well
|
2011-08-15 14:39:53 -07:00 |
|
Didier Lafforgue
|
b4bfea616a
|
Merge pull request #158 from colibri-software/add_admin_user
Added rake task to create new admin user
|
2011-08-14 12:27:03 -07:00 |
|
Rytis Lukoševičius
|
69e24e8fe0
|
added .breadcrumbs method to Page drop. It gives all the ancestors of the page and the page itself
|
2011-08-14 11:34:57 +03:00 |
|
Rytis Lukoševičius
|
025d5a7dda
|
added .parent method to Page drop
|
2011-08-14 11:34:08 +03:00 |
|
did
|
161878f57e
|
add information to set up carrierwave for local filesystems
|
2011-08-11 14:47:12 -07: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 |
|
Alex Sanford
|
c225a8d394
|
Added rake task to create new admin user
|
2011-08-04 13:19:39 -03:00 |
|
Andrea Frigido
|
37c50d27ff
|
Bugfix: import site with empty editable file.
|
2011-08-03 08:58:47 +02:00 |
|
did
|
a9b6c234e7
|
fix issue #150
|
2011-07-28 16:42:16 +02:00 |
|
Didier Lafforgue
|
92ec012472
|
Merge pull request #149 from corgibytes/content_type_names
Fixed issue with the way import was handling content_type name attributes
|
2011-07-28 06:09:23 -07:00 |
|
did
|
6d66275def
|
merge pull request #148
|
2011-07-28 15:03:13 +02:00 |
|
did
|
dbee233d0a
|
add test for the issue #146
|
2011-07-28 13:51:59 +02:00 |
|
did
|
4c8272dfa0
|
seo information were not imported for contents
|
2011-07-28 11:53:36 +02:00 |
M. Scott Ford
|
36914834a1
|
Switched from calling #update to #update_attributes!.
|
2011-07-28 01:21:28 -04:00 |
|
M. Scott Ford
|
a532bb4c60
|
Fixed issues with the way import handled the content_type.name attribute.
|
2011-07-28 01:20:39 -04:00 |
|
Didier Lafforgue
|
7e31d3ea76
|
Merge pull request #143 from Sharagoz/master
Cells gem not initialized in engine
|
2011-07-27 16:34:55 -07:00 |
|
did
|
8da0db2454
|
improve the solution for the issue #127 and write tests (pull request #139)
|
2011-07-28 00:39:59 +02:00 |
|
Didier Lafforgue
|
e74f996c8c
|
Merge pull request #139 from frisoft/master
Added fix for #127
|
2011-07-27 07:58:16 -07:00 |
|
Sharagoz
|
4f34610918
|
initialize Cells when used as an engine
|
2011-07-27 15:56:56 +02:00 |
|
did
|
e05586d387
|
write tests for the last cells menu + write tests for the bushi.do events + refactor the locomotive logger + add the cas_extra_attributes hook
|
2011-07-26 21:20:03 +02:00 |
|
Andrea Frigido
|
1dd432c2c8
|
Added fix for #127
|
2011-07-26 09:51:18 +02:00 |
Sean Grove
|
5e3a4ffa0f
|
Set account.username for the cas lookup
|
2011-07-25 21:21:55 -07:00 |
|
Sean Grove
|
09343dd20a
|
Event data structure tweak.
|
2011-07-25 20:39:09 -07:00 |
|
Sean Grove
|
93a852c705
|
Tweak with a local variable.
|
2011-07-25 20:13:21 -07:00 |
|
Sean Grove
|
8de926bca9
|
Bushido::Hooks -> Bushido::Data
|
2011-07-25 20:00:17 -07:00 |
|
Sean Grove
|
9bab872e5b
|
Updated gem hooks for bushido claimed event
|
2011-07-25 19:37:23 -07:00 |
|
did
|
7b8053241d
|
add more tests for cells + disable the cas_create_user option for the bushi.do env
|
2011-07-26 03:02:13 +02:00 |
|
did
|
4f7312a659
|
CAS feature + Cells
|
2011-07-25 23:07:32 +02:00 |
Kev Zettler
|
13e247691f
|
Merge pull request #137 from Bushido/master
Guiders and new gem version
|
2011-07-22 15:28:03 -07:00 |
|
Sean Grove
|
2a9a49f1b1
|
No more need for debug output
|
2011-07-21 18:48:46 -07:00 |
|
Sean Grove
|
32f57cc43c
|
Output some debug information
|
2011-07-21 18:21:47 -07:00 |
Petr Blaho
|
a491b15801
|
Added possibility to use https in js and css url with liquid tags
|
2011-07-19 23:00:58 +02:00 |
|
Didier Lafforgue
|
294da07565
|
Merge pull request #132 from petrblaho/js_css_url
javascript_url and stylesheet_url liquid tag
|
2011-07-19 09:05:44 -07:00 |
|
Petr Blaho
|
41472c88bd
|
Created stylesheet_url and javascript_url liquid filters
|
2011-07-19 16:27:42 +02:00 |
|
did
|
194a01d15f
|
solve temporarily the issue #127
|
2011-07-19 15:51:29 +02:00 |
|
did
|
47088f9b0e
|
fix issue #115 + clean code + exporting a site works now with ruby 1.8.7
|
2011-07-19 14:52:02 +02:00 |
|
did
|
45ff488ae8
|
enhance the rake task which forces to serialize page templates + do not import twice an asset with the same filename
|
2011-07-19 11:49:15 +02:00 |
|
did
|
53a83b5f79
|
fix broken rake task (rebuild_serialized_page_templates)
|
2011-07-18 23:11:22 +02:00 |
|
did
|
e27c26ebdd
|
Merge branch 'master' of github.com:locomotivecms/engine
|
2011-07-14 15:01:53 +02:00 |
|
did
|
5f29ebd55b
|
when exporting a site, a nil value for the listed page property should be considered as false
|
2011-07-14 15:01:34 +02:00 |
Vladimir Andrijevik
|
ce96d86cdd
|
Fix usage of environment variables for Heroku credentials.
|
2011-07-14 14:23:15 +02:00 |
|
did
|
770ae3a543
|
fix a couple of tiny bugs about: export, import and aloha
|
2011-07-13 11:14:44 +02:00 |
|
did
|
2236b43222
|
fix bug #111
|
2011-07-09 00:47:05 +02:00 |
|
did
|
0ea5275504
|
make the export more solid
|
2011-07-08 23:06:07 +02:00 |
|
did
|
72c1ac9454
|
solve minor bugs
|
2011-07-08 15:03:48 +02:00 |
|
did
|
711110a6e0
|
snippets were missing in the export
|
2011-07-07 16:59:50 +02:00 |
|
did
|
007f34ed8c
|
export didn't work when sub pages
|
2011-07-07 01:34:11 +02:00 |
|
Didier Lafforgue
|
bf4b2be2b9
|
Merge pull request #108 from corgibytes/variables-as-values
Enabled the use of variable values as the default values for editable con
|
2011-07-06 15:06:47 -07:00 |
|
M. Scott Ford
|
314c1293d9
|
Enabled the use of variable values as the default values for editable content.
|
2011-07-06 15:19:55 -04: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 |
|
Didier Lafforgue
|
43670714b9
|
Merge pull request #86 from mariovisic/hotfix/nested_snippets
Fix for issue #84 (Nested snippets)
|
2011-07-05 12:16:30 -07:00 |
|
did
|
bf99a36b58
|
tweak forms + fix minor js bug if no multi sites
|
2011-07-05 20:33:21 +02:00 |
|
did
|
00fd00240f
|
the error message was not displayed correctly during a wrong import + remove the last tracks of the deprecated asset collections
|
2011-07-04 23:11:35 +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
|
91f2f145b3
|
the BIG MERGE is now done
|
2011-07-04 15:43:05 +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
|
aad4b09ad7
|
first draft of the export module (not tested)
|
2011-07-04 03:22:04 -07:00 |
|
did
|
812965ad50
|
tweak the form UI (errors, input separator) + add more tests
|
2011-07-01 02:15:45 +02:00 |
|
did
|
c8f0ad0bbe
|
upgrade rake (0.9.2), cucumber-rails (1.0.2), capybara
|
2011-06-29 03:05:07 +02:00 |
|
did
|
c1f89f1cca
|
fixing the heroku version: engine requires RMagick
|
2011-06-28 18:05:23 +02:00 |
|
did
|
322e617068
|
fixing the heroku version: engine requires cancan
|
2011-06-28 17:43:11 +02:00 |
|
did
|
8c1372afc6
|
fixing the heroku version
|
2011-06-28 17:35:25 +02:00 |
|
did
|
e304d5aa98
|
the account_spec failed randomly + remove useless puts
|
2011-06-28 15:50:37 +02:00 |
|
did
|
5e8eac53d4
|
refactor the way the middlewares are loaded (both app and engine) + tweaks some back-office texts + improve the UI by adding icons on addind a picture links + fix an annoying bug with carrierwave
|
2011-06-28 15:38:13 +02:00 |
|
did
|
2ad01833d8
|
icons for the theme_asset form + add tests (both rspec + features) for the roles
|
2011-06-27 08:27:07 -07:00 |
|
did
|
09171555a7
|
fix CSRF issues with tinymce and some ajax actions + begin to work on the roles feature powered by cancan (in progress, not stable)
|
2011-06-25 09:25:31 -07:00 |
|
did
|
33a29210ba
|
forget to add a field to update the global seo title for a site + fix a tiny bug when destroying session + enhance hints on some form fields
|
2011-06-24 00:49:12 -07:00 |
|
did
|
fa7e4c24d8
|
implement feature #57
|
2011-06-23 05:57:52 -07:00 |
|
did
|
d4b7734003
|
fix issue #90
|
2011-06-23 01:14:36 -07:00 |
|
did
|
d31f1f959a
|
fix issue #91
|
2011-06-22 15:57:24 -07:00 |
|
did
|
40530de8bb
|
remove trailing slash and redirect (SEO)
|
2011-06-22 08:53:29 -07:00 |
|
did
|
a5cd2290ea
|
reflect changes from the bushi.do platform
|
2011-06-21 15:03:23 -07:00 |
|
did
|
3c0f7afec0
|
fix tests + rename and refactor the slugify method (now called permalink)
|
2011-06-21 13:03:24 -07:00 |
|
did
|
be02539695
|
do not include the bushido chat js, just declare a variable instead
|
2011-06-21 20:38:03 +02:00 |
|
did
|
3c31c8dbcf
|
remove all the references to asset_collections
|
2011-06-21 06:12:20 -07:00 |
|
did
|
f4d9acd282
|
fix the tests + finish the integration of Dragonfly + clean code
|
2011-06-20 17:39:59 -07:00 |
|
did
|
57ba3ba273
|
get rid of the yellow banner in production
|
2011-06-21 01:27:13 +02:00 |
|
did
|
87e7ced3c1
|
integrate dragonfly + clean code + fix a js bug when editing a custom field
|
2011-06-20 12:05:12 -07:00 |
|
did
|
ecdb79bb2d
|
removing asset_collections: script + remove references in liquid
|
2011-06-20 04:25:17 -07:00 |
|
did
|
58ab954ec1
|
new task to migrate asset collections to content types
|
2011-06-18 01:31:43 -07:00 |
|
did
|
21ccbb635b
|
removing asset collections
|
2011-06-17 14:32:54 -07:00 |
|
did
|
adfcbb6658
|
fix conflict issue with the new linecache gem + clean carrierwave local patch
|
2011-06-12 16:29:59 +02:00 |
|
did
|
de217b74b7
|
use default rails logger during the first template import + remove some carrierwave method patches now useless with the new version of the gem
|
2011-06-11 01:18:34 +02:00 |
|
did
|
f1d8e7c141
|
clean everything before merging it to the master branch
|
2011-06-10 01:04:13 +02:00 |
|
did
|
2d060dd2d9
|
forgot to add an file
|
2011-06-08 16:34:37 +02:00 |
|
did
|
49080b737d
|
testing out the lastest gems for rails / carrierwave / ...etc
|
2011-06-08 16:33:33 +02:00 |
|
did
|
abcf4f684a
|
help to create public form with has_one field
|
2011-06-03 02:25:19 +02:00 |
|
Mario Visic
|
8c62ec4dba
|
Small refactoring on the snippet tag constructor.
|
2011-06-02 22:34:06 +08:00 |
|
Mario Visic
|
684b1ddf5c
|
Nested snippets now update correctly, fixes #84
|
2011-06-02 21:56:05 +08:00 |
|
did
|
a5bf4664f2
|
[bushido] pass the metrics token to bushido.js
|
2011-06-01 23:47:06 +02:00 |
|
did
|
91119bf54e
|
allow administrators to change the text displayed for each content in the back-office (documentation is coming)
|
2011-06-01 23:43:12 +02:00 |
|
did
|
4618b35318
|
cache-busting asset id for bushido.js + new bushido config var (app_name)
|
2011-06-01 21:09:09 +02:00 |
|
Sean Grove
|
d557af74ea
|
Typo
|
2011-05-30 14:32:34 -07:00 |
|
Sean Grove
|
6834e6db85
|
Tweaks to match the Bushido Events api
|
2011-05-30 14:17:42 -07:00 |
|
did
|
293557a245
|
fix a problem with bushido_app_claimed? if the variable value is an empty string
|
2011-05-29 15:36:14 -07:00 |
|
did
|
dfb4ed48bc
|
refactor bushido message to event
|
2011-05-29 15:25:36 -07:00 |
|
did
|
61886ec1b1
|
installation procedure allows to install the default site template if provided
|
2011-05-28 19:45:29 -07:00 |
|
did
|
c6b272f9f9
|
disable authentication if the app has not been claimed yet
|
2011-05-28 10:52:36 -07:00 |
|
did
|
b467ecbeef
|
display the bushido bar on every page
|
2011-05-27 16:24:11 -07:00 |
|
did
|
d5f5707e42
|
change the URL to the bushido js file
|
2011-05-27 15:39:48 -07:00 |
|
did
|
ef7ac0e721
|
make the bushido installation process the smoothest
|
2011-05-27 15:14:45 -07:00 |
|
did
|
2ce1fadf52
|
simplify the installation procedure for bushido users
|
2011-05-27 08:19:20 -07:00 |
|
Didier Lafforgue
|
408de3dc85
|
Merge pull request #80 from mariovisic/hotfix/import_content_type_date
Fix: Content type fields import does not support dates in yaml
|
2011-05-24 15:39:31 -07:00 |
|
did
|
8ad6ee580e
|
fix issue #78
|
2011-05-24 12:23:05 -07:00 |
|
Mario Visic
|
c7109af0b8
|
Importer now supports date content type fields as strings or date objects.
|
2011-05-17 21:42:47 +08:00 |
|
Didier Lafforgue
|
028312bc9e
|
Merge pull request #71 from onelaw/seo_metadata
Adds support for page- and content instance-specific metadata.
|
2011-05-16 14:28:20 -07:00 |
|
Andrea Frigido
|
bee4f01e56
|
Italian localization.
|
2011-05-04 13:05:16 +02:00 |
|
did
|
6dd810b44e
|
new custom_fields gem version as well as an heroku patch to fix the weird issue about json/heroku
|
2011-05-01 00:28:25 +02:00 |
|
did
|
e429fbf7ca
|
indentation + detect asset urls in a css file even if one long line (case: css generated by sass)
|
2011-04-30 01:58:15 +02:00 |
AJ Schuster
|
f65cd0b2fc
|
Allows for page- and content instance-specific metadata.
Falls back to site metadata when not specified.
|
2011-04-29 16:10:13 -04:00 |
|
did
|
ea050afd5e
|
use absolute urls for the pagination links + allow developers to access the http params within a liquid template + the with_scope handles category fields
|
2011-04-29 01:16:40 +02:00 |
|
Didier Lafforgue
|
5654924e0b
|
Merged pull request #69 from JaimeAndres/liquid_markup.
fixed problem with pagination url, it was creating a relative path instead
|
2011-04-28 15:17:58 -07:00 |
|
did
|
820d55a83c
|
use delayed_job by default on bushi.do
|
2011-04-28 17:17:15 +02:00 |
|
did
|
a01e204d29
|
refactor the way locomotive was updating a template and its descendants + add custom action_mailer settings for the bushi.do env + fix bug about index and 404 pages positions during the import + fix a little display issue when a subdomain is wrong in the site edit page
|
2011-04-28 17:04:18 +02:00 |
|
did
|
537e222f79
|
code indentation (I am a little bit picky)
|
2011-04-27 17:04:33 +02:00 |
|
Didier Lafforgue
|
c27062452e
|
Merged pull request #60 from karlbright/master.
Theme asset filenames made lowercase
|
2011-04-27 07:19:53 -07:00 |