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

590 Commits

Author SHA1 Message Date
did
37684654ac first attempt to polish the theme assets page + refactor the css (wip) 2011-12-03 01:11:31 +01:00
did
24575d5cff polish the new membership page 2011-12-02 23:31:15 +01:00
did
3fffe7bd91 new way of handling ajax post requests (redirecting if everything is fine) 2011-12-02 18:20:59 +01:00
did
87a04aafe9 rename namespace for the sites backbone views + create backbone view for the creation of a new site 2011-12-02 06:59:41 -08:00
did
fb0e87c64d done (for now) with the my account screen 2011-12-02 01:43:49 +01:00
did
99d756f550 Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2011-12-01 15:08:19 -08:00
did
837b974fec working on the screen for editing my account 2011-12-01 15:04:45 -08: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
aebb4f74ec remove directive in gitignore preventing some folders (ending by sites) to be correctly versioned 2011-11-28 13:53:34 -08:00
did
6505b7ab25 add missing js files 2011-11-28 13:50:24 -08:00
did
a8d616ba6b remove references to foldable_inputs and custom_input 2011-11-28 06:40:25 -08:00
did
cad1f5e68f Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2011-11-27 08:23:12 -08:00
did
71d48fe726 refactor the current site editing screen (screen) 2011-11-27 08:22:54 -08:00
Mario Visic
ad6273e2fd Lots of spec fixes (mostly namespacing), down to 107 failing specs. 2011-11-26 17:24:34 +11:00
did
cffe64f6be rebuilding the editing page for the site (wip) 2011-11-25 15:10:56 +01:00
did
cb735a0539 cleaning 2011-11-25 13:38:31 +01:00
did
fcd2146c11 foldable fieldsets fixed on firefox 2011-11-25 12:31:18 +01:00
did
5bb29d9702 fix styling issues with form and firefox 2011-11-25 12:05:30 +01:00
did
cda038e320 style submenu on firefox 2011-11-25 11:12:55 +01:00
did
80c9d5091f style submenu popup on firefox 2011-11-25 10:56:56 +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
a50df5ad8e menu and submenu in full css3 (without any images) + delete useless images + clean the code (wip) 2011-11-23 05:01:15 -08:00
did
b2a5e1de85 new file input behaviour (for now just on editable_file) 2011-11-21 03:12:06 -08:00
did
0b7cc6ebd2 merging 2011-11-21 02:28:12 +01:00
did
1a1a92e12f refactor the presenters + convert the editable_elements partial into a full backbone, coffeescript, handlebar, json stack 2011-11-21 02:27:05 +01:00
Mario Visic
75041ba21c Specs now run for all models. The account model now passes GREEEEn. 2011-11-20 22:47:41 +11:00
Mario Visic
a99ba18200 Temporarily removed a module include causing issues. 2011-11-20 22:47:03 +11:00
Mario Visic
a7b66f0e25 Lots of fixes to get tets closer to working. 2011-11-20 21:59:12 +11:00
did
c267f8ccbc inverse toggle effects + add missing redirect_url field + fix an anoying bug about the locomotive_media plugin 2011-11-20 01:27:23 +01:00
did
a6211d594e almost done with the tinyMCE customization 2011-11-20 00:54:33 +01:00
did
cd411de4ce implement a generic asset picker 2011-11-19 17:33:16 +01:00
did
63e2a63d1a polishing the locomotive_media plugin (wip) 2011-11-19 16:41:16 +01: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
2620748b81 restyling the editable elements in css3 (wip) 2011-11-17 18:05:51 +01:00
did
67615a7fe3 polishing (wip) + refactor the js code (wip) 2011-11-16 13:42:42 +01:00
did
a9dace0d0f right translation keys for the image picker 2011-11-16 11:24:14 +01:00
did
a48b602ea9 sub menu popup in place 2011-11-16 11:19:57 +01:00
did
2c18f401bb adding the last refactored features on the pages section (wip) + clean code 2011-11-16 01:39:16 +01:00
did
80a9a11c7b javascript for add/edit page (wip) 2011-11-14 01:13:58 -08:00
did
596eb78a55 first draft for the json template response (tested on sorting pages) 2011-11-11 00:39:25 -08:00
did
bef9dd8e67 fix various namespace errors issues and api changes for the models 2011-11-10 13:41:20 -08:00
did
6122983835 fix the annoying bug of duplicated flash messages + first backbone view for the index pages section 2011-11-10 13:29:59 +01:00
did
aa1abd2e92 remove useless piece of code 2011-11-10 02:47:26 +01:00
did
599b1d6395 first work on migrating the javascripts to coffeescript and backbone (wip) 2011-11-10 02:43:19 +01:00
did
248d3803c2 use the last version of formtastic + tweak the css for formtastic with scss + compass (wip) + clean code (wip) 2011-11-09 02:35:59 +01:00
did
1b015efd48 cleaning stylesheets so that they fit the new assets system 2011-11-08 15:34:25 +01:00
did
dd75f69b74 fix module collisions and missing namespaces all over the templates (wip) 2011-11-08 01:11:15 +01:00
did
b383086242 wip 2011-11-06 12:18:34 +01:00
did
87d2440f14 working on fixing issues with devise (wip) 2011-11-04 16:55:51 +01:00
did
8979957d43 convert stylesheets in sass (wip) + fix the installation module + customize devise (wip) 2011-11-03 14:01:08 +01:00
did
851a255301 fixing assets (wip) 2011-11-01 01:58:44 +01:00
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
9f8d2e4146 assets (wip) 2011-10-30 14:28:45 +01:00
did
44007ac664 fix image references in assets 2011-10-30 13:34:16 +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
did
8298b2a4bf preventing recursive loop when used as engine in an app 2011-10-18 18:45:45 +02:00
did
016d773b2d fix issue #217 (memberships not correctly removed) 2011-09-28 18:27:29 +02:00
Mario Visic
03b6649742 Designers cannot set others to admins, fixes #197 2011-09-17 22:23:43 +08:00
Karl Brightman
93667018c1 Updated with hashrocket 2011-09-16 11:55:30 +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
761a64b130 Merge pull request #185 from themgt/patch-1 
should sort by Page#depth so slug parts are in the right order
 2011-08-30 15:11:46 -07:00
did
dea0b67fe1 fix another bug related to the issue #179 2011-08-30 23:13:34 +02:00
Paul
acd731347c should sort by Page#depth so slug parts are in the right order 2011-08-29 16:17:18 +03: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
Mario Visic
cd464e604c Logging in as an account without membership no longer infinetly redirects. 2011-08-28 01:14:02 +08:00
did
265525c1a7 fix issue #175 + the liquid template of content types (back-office) were broken 2011-08-26 00:30:34 +02:00
did
71a592eec1 fix issue #177 2011-08-25 18:27:43 +02:00
did
d0566f917e fix issue #179 2011-08-25 14:58:49 +02:00
did
aff1d23d90 Merge branch 'master' of github.com:locomotivecms/engine 2011-08-24 15:16:33 +02:00
Mario Visic
22445856ec The add account link is now hidden unless admins have permission. 2011-08-20 17:41:00 +08:00
Mario Visic
a7bc648333 Implemented the site ability fix for designers. 2011-08-20 17:33:13 +08:00
Mario Visic
24c9752018 Implemenation for hiding the destroy asset button. 2011-08-20 17:13:06 +08:00
did
7ea25b3a59 in some circonstances, the site_id disappeared when generating the url of a file in a model 2011-08-19 12:06:41 +02:00
did
0e3d601ea9 fix xss vulnerability issue (#170) 2011-08-18 16:06:34 +02:00
Didier Lafforgue
12c9bd1eca Merge pull request #159 from bquorning/patch-1 
Adding indexes
 2011-08-14 12:44:59 -07:00
did
b23f2697e9 clean tests and make them pass in the order observed on nix systems 2011-08-13 16:24:02 -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
Benjamin Quorning
e2eb8f2e90 Adding indexes on :position and [[:depth, :asc], [:position, :asc]] to avoid Mongo::OperationFailure: too much data for sort() with no index 2011-08-09 15:07:15 +03:00
did
040a51bc5f when used with devise_cas_authenticable, it does make sense to ask for a password in the new account creation page 2011-07-28 21:11:06 +02:00
did
a9b6c234e7 fix issue #150 2011-07-28 16:42:16 +02:00
did
4c8272dfa0 seo information were not imported for contents 2011-07-28 11:53:36 +02:00
did
8da0db2454 improve the solution for the issue #127 and write tests (pull request #139) 2011-07-28 00:39:59 +02:00
did
d4b2153c7b wrong flash message key for the import controller 2011-07-27 02:26:12 +02:00
did
d5111d2a4f fix a minor bug about the contents menu + new devise_bushido_authenticatable gem 2011-07-26 21:38:27 +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
did
cb349b3ac0 enable debug mode for bushido + fix minor issues 2011-07-25 23:16:43 +02:00
did
4f7312a659 CAS feature + Cells 2011-07-25 23:07:32 +02:00
did
e2b68ba861 restore production settings + fix broken tests + apply the coding convention on the recently modified haml file 2011-07-23 01:26:16 +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
did
819d7ac5ff fix issue #131 2011-07-19 16:20:53 +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
Kev Zettler
3b5df5e8a8 more awesome tutorials, more helpful on sites that have no data 2011-07-14 21:38:02 -07:00
Didier Lafforgue
4a9da56341 Merge pull request #114 from frisoft/master 
Italian localization update + Locomotive.config.default_locale as default locale for new accounts.
 2011-07-14 01:02:08 -07:00
did
2c562038d8 use ActiveSupport::JSON.encode instead of the to_json method (not reliable) 2011-07-14 00:08:43 +02:00
did
770ae3a543 fix a couple of tiny bugs about: export, import and aloha 2011-07-13 11:14:44 +02:00
Andrea Frigido
f6c91ed791 Locomotive.config.default_locale as default locale for new accounts. 2011-07-11 13:13:58 +02:00
Kev Zettler
058e97d376 settings and model edit guides 2011-07-10 11:02:06 -07:00
Kev Zettler
ca2fad461d omg awesome guides 2011-07-08 01:20:29 -07:00
did
b2ddaf805c show page kind: templatized or redirect 2011-07-07 18:03:55 +02:00
Kev Zettler
a342f7e6b1 added hooks and dependencies for tutorial flow 2011-07-06 22:35:15 -07:00
did
37d10aa25b fix bug #104 2011-07-06 11:48:04 -07:00
did
0737919c2c Dutch translation (ticket #92) 2011-07-05 23:55:26 +02:00
did
1a62d8f5ad Adding the ability to set a robots.txt for each site (ticket #87) 2011-07-05 22:34:15 +02:00
did
6ce086520f include potatosalad's work about the menu_toggler 2011-07-05 21:03:10 +02:00
did
bf99a36b58 tweak forms + fix minor js bug if no multi sites 2011-07-05 20:33:21 +02:00
did
bd28f4c1ec new sites picker 2011-07-05 18:30:12 +02:00
did
71d7e86acd admin role was not correctly set when creating a new website 2011-07-05 11:56:24 +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
690b2f2b2e fix a bug when filling in the content type name 2011-07-02 04:48:21 -07:00
did
812965ad50 tweak the form UI (errors, input separator) + add more tests 2011-07-01 02:15:45 +02:00
did
c7ea5ab532 add more features for the model section 2011-06-29 14:00:26 +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
be6629d986 done with the roles (tests are coming) + better help messages for theme_assets and snippets 2011-06-26 16:02:48 -07:00
did
1be92e0db4 roles fully implemented for the page / content sections + uniformize drag n drop in the contents section + add the missing selected value for the has_one field 2011-06-25 17:01:11 -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
c9f3989c2b group contents by category for the has_ony / has_many widgets 2011-06-23 16:17:08 -07:00
did
587d383ac5 tweak ui: form, quick link to edit a model in the popup menu 2011-06-23 07:10:17 -07:00
did
fa7e4c24d8 implement feature #57 2011-06-23 05:57:52 -07:00
did
4d29500483 new version of custom_fields + allow users to change the permalink of the custom model instances 2011-06-21 14:53:21 -07:00
did
3c0f7afec0 fix tests + rename and refactor the slugify method (now called permalink) 2011-06-21 13:03:24 -07:00
did
3c31c8dbcf remove all the references to asset_collections 2011-06-21 06:12:20 -07:00
did
a0293b161b add a new plugin in tinymce to upload any kind of files (Bernd) 2011-06-21 05:47:11 -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
21ccbb635b removing asset collections 2011-06-17 14:32:54 -07: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
cd428e467c back to the sha1 encryptor to be compliant with old accounts 2011-06-11 00:24:10 +02:00
did
f1d8e7c141 clean everything before merging it to the master branch 2011-06-10 01:04:13 +02:00
did
49080b737d testing out the lastest gems for rails / carrierwave / ...etc 2011-06-08 16:33:33 +02:00
did
f9decc0890 switching over mongoid 2.0.2 + fix bug when displaying content labels in the back-office 2011-06-04 17:35:22 +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
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
8ad6ee580e fix issue #78 2011-05-24 12:23:05 -07:00
did
8f36f5a2d8 solve a bug on has_ony / has_many caused by the caching mechanism 2011-05-21 01:02:03 +02:00
did
34c5d12ebf refactoring the rendering of content fields in a model 2011-05-19 18:00:45 +02:00
did
d2f6cc0c53 has_many ui has been implemented 2011-05-19 17:44:04 +02: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
did
7dfce2c336 migration to mongoid 2.0.1 2011-05-16 23:06:46 +02:00
did
b4c86e39dc patch inspired from the issue described in the pull request #72: the method to retrieve direct template descendants was wrong 2011-05-04 14:53:09 +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
did
77ea45c98b solve a bug when creating new content instance + fix rspec tests for ruby 1.9.2 2011-04-28 23:47:01 +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
49c451ea54 small typo in the index page of the content types + merge Gemfile as well as the gemspec 2011-04-28 01:03:01 +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
did
8b5d5d0a32 change subdomain on heroku + do not save pages, assets, ...etc of a site when it gets saved 2011-04-27 10:09:19 +02:00
TFG
324ed57f63 Adjustments to other views to use the new yield :submenu and yield :actions 2011-04-27 13:57:12 +08:00
TFG
89dd1e1c39 added new shared partials for actions near submenu 2011-04-27 13:57:12 +08:00
did
b58e49fce2 make locomotive work with bushido + refactor some portions of code (routing constraints, ...etc) + fix broken tests 2011-04-25 01:21:38 +02:00
karlbright
30eed79f2b Removed downcase method from theme asset creation. Causes issues when dealing with files that may have uppercase filenames, such as fonts 2011-04-11 15:09:25 +08:00
did
09bd73c7ac enhance carrierwave settings to support bushi.do 2011-04-07 11:53:07 +02:00
Keith Pitt
42a6807597 Allow the name of the custom fields form to be changed 2011-04-07 12:47:01 +08:00
did
f16201f6cd do not run bushido subdomain validation if the value does not get changed + prevent to change the subdomain in Heroku (non multi-sites mode) 2011-04-07 02:18:07 +02:00
did
e03d7b5dcc smoother integration with bushi.do 2011-04-07 01:34:36 +02:00
did
917208812b wrong bushido ENV name + do not ask for subdomain during the installation 2011-04-06 11:44:52 +02:00
did
34c7df04b8 wrong redirection during the installation process 2011-04-05 23:41:50 +02:00
did
551ef03ff6 simply the installation screens + fix all the broken tests + add tests for bushido 2011-04-05 02:18:17 +02:00
dinedine
c0a5a4b443 single site / multi sites option in progress + integrating bushi.do + revert back to mongoid rc.7 2011-04-04 01:59:41 +02:00
did
551d8a5761 big refactoring of the locomotive config file in order to handle bushido / single / multi sites, ...etc 2011-04-01 02:34:19 +02:00
did
d270bf8f69 new custom_fields gem 2011-03-20 21:12:40 +01:00
did
1e5624ce06 fix js bugs 2011-03-20 11:21:07 +01:00
did
630577658d Merge branch 'image_sizing' of https://github.com/themgt/engine into themgt-image_sizing 2011-03-17 17:54:59 +01:00
did
a66e745746 fix bug #52 2011-03-17 17:41:25 +01:00
Paul
e7b33c807a calculating Asset size using rmagick rather than an imagemagick shell command 2011-03-15 18:35:05 +01:00
did
63530a3a30 still a problem with the last heroku gem (json) + fix an issue with invalid assets 2011-03-10 02:59:35 +01:00
did
f38e6a8514 order direction for content types 2011-03-10 00:54:38 +01:00
did
2ba0718647 application error when submitting an asset without a name 2011-03-10 00:17:16 +01:00
did
bbac778dda dates can also be used as highlighted field 2011-03-08 17:25:38 +01:00
did
80f792cfd3 generated sitemaps were invalid according to google web tools 2011-03-08 17:20:53 +01:00
did
e4b34eac3f patch mongoid to enable the limit option for embedded collections + ui widget to allow more than 5 custom models in the content section 2011-03-08 16:05:07 +01:00
Dirk Kelly
44f84c266b merge 2011-03-07 19:59:02 +08:00
did
d3abdd3f37 refactor the asset collections part + disable the image processing for non image assets (use a newer version of locomotive carrierwave for that purpose) 2011-03-05 23:27:26 +01:00
did
110c7a0fc9 request from Bernd (Designhunger) #45 2011-03-05 00:41:44 +01:00
did
a2ea522964 clean translations (a part of it moved to the CustomFields gem) + refactor the custom fields form (mustache) as well as enhance the ui/look&feel + fix some bugs related to the creation/edition of content types and contents 2011-03-05 00:29:40 +01:00
did
2022b08b83 split the General Information section in the page form in two sub sections 2011-03-04 00:03:55 +01:00
did
f0ee8a7b37 new menu layout in CSS3 and SASS (will make our life easier when integrating new modules) 2011-03-03 23:51:07 +01:00
Dirk Kelly
2482567db3 avoid updating child pages which have a default_attribute on change of a template they inherit from 2011-03-03 15:35:37 +08:00
Dirk Kelly
c998d4150c Added fullpath and the error message to liquid syntax error. Translations are pretty dodgy (sorry) 2011-03-03 08:18:19 +08:00
Dirk Kelly
be4169c991 Beginning to improve the error messages with variables to make the import function more verbose on problems 2011-03-03 08:05:04 +08:00
Dirk Kelly
97e3ddb6e3 reading that default attribute on inheriting editable_elements and calling the method on that page (instead of getting it from the parent) 2011-03-02 14:38:57 +08:00
Dirk Kelly
ea81025d33 storing default_attribute on the editable_element if a default attribute has been parsed. 2011-03-02 14:38:32 +08:00
Dirk Kelly
adbae00457 changed the editable inheritance tag to be assignable, avoiding confusion between that and the content tag inheritance 2011-03-02 09:13:45 +08:00
Dirk Kelly
778a55245c added the inheritable attribute to editable elements 2011-03-02 08:13:03 +08:00
Dirk Kelly
ed88eb82b0 added inheritable? to the parent check on editable_contents 2011-03-02 08:12:42 +08:00
Dirk Kelly
e059ce2023 Making the error message a bit more useful 2011-02-28 13:42:50 +08:00
did
abcc61a8e6 add the missing index view for theme assets + update the 2 locomotive.rb files (generator + default) 2011-02-27 12:18:48 +01:00
did
68e1a543bf Merge branch 'master' of https://github.com/designhunger/engine into designhunger-master 2011-02-27 12:03:30 +01:00
Mario Visic
1c04b39c7e Fixed a bug that was preventing deleting sites 2011-02-26 21:12:26 +08:00
Bernd Hauser
09f3162861 fix in default.de.yml 2011-02-23 14:57:33 +01:00
did
2244aa782a Merge branch 'nested-snippets-fix' of https://github.com/mariovisic/engine into mariovisic-nested-snippets-fix 2011-02-19 01:34:32 +01:00
did
bd992cc882 fix issue #37 plus other ones related to theme assets and assets 2011-02-19 00:51:57 +01:00
Mario Visic
26a2b7d2a7 Fixed a bug with snippets within blocks 2011-02-16 17:37:26 +08:00
did
94be90986d merge Dirk's branch + upgrade a lot of gems (rails, ...etc) 2011-02-12 15:00:57 +01:00
dinedine
6ac4ff0393 revert a piece of the theme assets refactoring + upgrade Gemfile as well as the gemspec 2011-02-04 11:18:34 +01:00
dinedine
c178346969 fix the creation of theme assets (and add tests of course) + upgrade Gemfile + remove the mongoid patches 2011-02-04 10:39:23 +01:00
Keith Pitt
e3f40558a0 Provide the error message aswell 2011-02-04 16:21:50 +08:00
Keith Pitt
da3bd6cef2 Include error backtrace in output 2011-02-04 15:57:26 +08:00
Keith Pitt
713d30bdb6 Hacked the admin images controller to work 2011-02-04 15:44:42 +08:00
Dirk Kelly
c11c18c445 Fixes issue where custom content wouldn't get created. 2011-02-03 07:40:06 +08:00
Dirk Kelly
7d30d00ec4 minimal attributes to include listed 2011-02-01 17:05:36 +08:00
Dirk Kelly
1c91bfb673 returning the height 2011-02-01 16:30:20 +08:00
Dirk Kelly
2b438966f5 including the listed module 2011-02-01 16:17:12 +08:00
Dirk Kelly
9a1f45de36 including the styles to keep the slug and content types the same height 2011-02-01 16:17:05 +08:00
Dirk Kelly
cc387a91f7 style updates 2011-02-01 16:07:31 +08:00
Dirk Kelly
b627b9bcb9 going for the positive, instead of the double negative (listed not unlisted) 2011-02-01 16:07:18 +08:00
Dirk Kelly
d672c0b946 moved content type above the templated option to avoid content jumps, added some translations 2011-02-01 15:08:56 +08:00
Dirk Kelly
db4d2af1bc Added unlisted selector to page form 2011-02-01 14:50:32 +08:00
Dirk Kelly
6ba65b1b96 Added an unlisted flag 2011-02-01 14:39:20 +08:00
dinedine
da51dbc14e more information in the logs when errors during the import + import asset collections without custom fields 2011-01-30 00:20:15 +01:00
dinedine
e896618c99 fix minor ui issue in the theme assets section 2011-01-29 17:24:37 +01:00
dinedine
a525e4ccd5 fixing bugs 2011-01-29 13:05:42 +01:00
dinedine
a7dfe1152d fix encoding issue in Ruby 1.9 2011-01-27 14:07:10 +01:00
dinedine
2e774b2a97 conflict between the index scope in the page model and the mongoid index method 2011-01-27 10:49:42 +01:00
dinedine
69c9dbbbcf new Gemfile + fixing broken tests + improve the way we fetch the sicurrent te when serving fonts 2011-01-26 14:07:33 +01:00
dinedine
456521bbed sitemap functionnality works with engine 2011-01-22 14:09:29 +01:00
dinedine
415ce9fb82 bson_ext is now in 1.2.0 + add lastmod for the sitemap xml + fix issue #19 2011-01-21 12:04:59 +01:00
dinedine
d56af954f2 fix issue #15 2011-01-18 18:13:06 +01:00
dinedine
6f2033a356 make the email notification more robust 2011-01-18 16:06:36 +01:00
dinedine
2fc99bf90a rename translation files (convention) + email notification when adding contents (api) 2011-01-18 15:24:42 +01:00
dinedine
6eead019d4 Merge branch 'master' of https://github.com/mariovisic/engine 2011-01-18 01:23:02 +01:00
dinedine
d5464aa782 add tests 2011-01-18 01:19:18 +01:00
dinedine
bc32848f6a Merge branch 'highlighted_field_value' of https://github.com/dirkkelly/locomotive into dirkkelly-highlighted_field_value 2011-01-18 00:40:45 +01:00
Mario Visic
f70c651e57 Fixed a bug preventing the name of the current site from updating 2011-01-16 11:49:00 +08:00
Dirk Kelly
5eab8e35bf calling page.title on a content_instance page would call highlighted_field_value. 
This method was protected and would hence raise an inline exception.

I'm not sure why we would protect highlighted_field_value?
 2011-01-14 15:47:53 +08:00
dinedine
3686496bb2 still got errors with dates display + admin default root points to signin 2011-01-11 12:42:12 +01:00
Mario Visic
64eff89c97 Added a redirect page extension, integrated into the application and added new tests 2011-01-06 22:48:41 +08:00
dinedine
c828301f37 fonts did not work when stored in amazon s3 2011-01-03 21:53:33 +01:00
dinedine
572ee360a1 preserve page orders when importing theme + handle favicon as theme asset + add tests for the nav tag + polish code (remove useless logs) 2011-01-03 11:50:09 +01:00
dinedine
210ce3d2d8 enhance the nav tag + some optimization in the back-office when rendering the pages tree 2011-01-02 23:58:06 +01:00
dinedine
99b54d4d1b fix bug with jammit-s3 and safari css hack + new version of aloha + bug with Heroku / Theme uploader without DJ + other minor things 2010-12-30 15:24:47 +01:00
dinedine
8d610dee49 Importing theme works with ruby 1.9.2 + clean code 2010-12-27 12:59:54 +01:00
dinedine
d0a089fb77 DelayedJob is disabled by default 2010-12-19 21:34:01 +01:00
dinedine
62564021b6 the theme import module can work without delayedjob + fix bugs 2010-12-17 00:42:38 +01:00
dinedine
e6226abece use jammit to compress stylesheet/javascript files 2010-12-14 18:00:12 +01:00
dinedine
bbb09b58cf ruby 1.9.2 compliant 2010-11-08 18:42:14 +01:00
dinedine
a1d9a5d548 reflect changes from the last imported theme (enhancements + bugs fixed) 2010-10-31 00:30:30 +02:00