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

1329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Athlan
32b7f36fe2 test2 2011-05-13 18:42:29 +02:00
Benjamin Athlan
5d9a6b552d test 2011-05-13 18:41:52 +02:00
Andrea Frigido
a9dd7b8963 Tiny_mce locoimage italian localization. 2011-05-10 16:18:49 +02:00
did
9fa701fdff add Andrea to the list of contributors 2011-05-07 14:16:42 +02:00
did
7dafc66359 typo for the french translation of the italian locale + right italy flag 2011-05-07 13:48:49 +02:00
Didier Lafforgue
c71739540b Merge pull request #74 from frisoft/master 
Italian localization
 2011-05-07 04:20:35 -07:00
Andrew Bennett
28a4ec4ac2 Remove git submodule references in cache and add to repo instead. 
Fixes locomotivecms/engine#49, locomotivecms/engine#55, and locomotivecms/engine#67
 2011-05-04 19:40:05 -06:00
Andrea Frigido
67dd6304e0 Tiny_mce and inline_edit italian localization. 2011-05-04 18:57:01 +02:00
Andrea Frigido
35de96bc1b Merge remote-tracking branch 'upstream/master' 2011-05-04 16:43:45 +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
Andrea Frigido
0e2f040574 Update spec/factories. 2011-05-04 13:13:55 +02: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
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
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
356715bc77 Merge branch 'master' of github.com:locomotivecms/engine 2011-04-28 01:17:07 +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
did
721e008121 multi-sites off by default 2011-04-27 18:44:49 +02:00
did
537e222f79 code indentation (I am a little bit picky) 2011-04-27 17:04:33 +02:00
did
2942ce58c8 merged manually pull request #62: extended german language 2011-04-27 16:58:58 +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
483dfc350b merging sgrove-master into master 2011-04-27 16:09:21 +02: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
1e70560b7b bump version + fix typo for the heroku credentials 2011-04-27 01:12:32 +02:00
did
8b27880df3 new actionmailer-with-request gem 2011-04-27 00:50:47 +02: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
Jaime Andres
860b206b0a fixed problem with pagination url, it was creating a relative path instead of an absolute path 2011-04-19 00:33:54 -05:00
karlbright
cd4c5127e0 Merge branch 'master' of github.com:karlbright/engine 2011-04-11 15:27:49 +08:00
karlbright
57dff76d8e Added ability to set media attribute within stylesheet_tag 2011-04-11 15:22:41 +08: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
ee1dfc1e9e Upgraded to latest version of rails 2011-04-07 13:07:50 +08:00
Keith Pitt
42a6807597 Allow the name of the custom fields form to be changed 2011-04-07 12:47:01 +08:00
Keith Pitt
8c3a799e9f Version of mongo requires bson_ext version >= 1.3.0 2011-04-07 12:46:51 +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
2cba14afec do not run the locomotive core initializer if engine 2011-04-06 01:29:11 +02:00
did
9ec642136f debugging the heroku deployment 2011-04-06 00:56:44 +02:00
did
e59088a2a0 debugging heroku version 2011-04-06 00:50:58 +02:00
did
9dedde8b07 trying to remove json warning + new heroku gem version 2011-04-06 00:31:56 +02:00
did
ec1b0fea3a fix bson_ext issue (new version of mongo) + add the bushido gem 2011-04-05 23:49:17 +02:00
did
34c7df04b8 wrong redirection during the installation process 2011-04-05 23:41:50 +02:00