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

190 Commits

Author SHA1 Message Date
did bd28f4c1ec new sites picker 2011-07-05 18:30:12 +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 812965ad50 tweak the form UI (errors, input separator) + add more tests 2011-07-01 02:15:45 +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 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 3c0f7afec0 fix tests + rename and refactor the slugify method (now called permalink) 2011-06-21 13:03:24 -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 6ed9788d50 clean Gemfile 2011-06-21 03:41:32 +02:00
did f4d9acd282 fix the tests + finish the integration of Dragonfly + clean code 2011-06-20 17:39:59 -07:00
did 21ccbb635b removing asset collections 2011-06-17 14:32:54 -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
Mario Visic ee04728d1c Added content type fields with dates (both string and date types in database.yml). 2011-05-17 21:40:54 +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 0e2f040574 Update spec/factories. 2011-05-04 13:13:55 +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
Didier Lafforgue c27062452e Merged pull request #60 from karlbright/master. 
Theme asset filenames made lowercase
 2011-04-27 07:19:53 -07: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 57dff76d8e Added ability to set media attribute within stylesheet_tag 2011-04-11 15:22:41 +08:00
did e03d7b5dcc smoother integration with bushi.do 2011-04-07 01:34:36 +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 ae51a2d804 write specs for the ordered contents 2011-03-10 01:15:48 +01:00
did 50f06a7b85 invalidate dynamic klass after an import + change the id of a link in the nav tag 2011-03-09 00:27:46 +01:00
Dirk Kelly 44f84c266b merge 2011-03-07 19:59:02 +08:00
did 7d5018eedc fix broken tests 2011-03-05 01:51:44 +01:00
Dirk Kelly 9145540ef0 the import build_parent_template regex was missing nested layouts. Test theme has two new pages to test this. 2011-03-03 07:50:22 +08:00
Dirk Kelly f4c242ce1a speccing out the content tag 2011-03-02 09:11:40 +08:00
Dirk Kelly 70104e8f9d Merge branch 'master' of github.com:locomotivecms/engine 2011-02-28 12:49:54 +08:00
did 42b5fc4f24 Merge branch 'no_membership_error' of https://github.com/mariovisic/engine into mariovisic-no_membership_error 2011-02-27 17:16:20 +01:00
did ebc40d1682 the site drop has access to pages 2011-02-27 17:14:14 +01:00
did e6f5353245 add more tests 2011-02-27 11:33:49 +01:00
Mario Visic 22979ff9a7 Refactored the validate_site_membership method in the site dispatcher. Added tests for the site dispatcher. 2011-02-22 17:34:27 +08:00
Dirk Kelly e735aa36e3 accented character caused an exception on my biggeted machine. Removed to avoid in the future 2011-02-22 00:45:53 +08: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
Mario Visic 26a2b7d2a7 Fixed a bug with snippets within blocks 2011-02-16 17:37:26 +08:00
karlbright 9d11d9e019 Added theme_image_tag liquid tag to make it easy to insert theme image files 2011-02-15 15:33:52 +08:00
did 083debc516 add seo_metadata liquid tag (Mario) 2011-02-13 14:40:55 +01:00
did af5ec86c57 merging 2011-02-12 18:13:06 +01:00
did 94be90986d merge Dirk's branch + upgrade a lot of gems (rails, ...etc) 2011-02-12 15:00:57 +01:00
Raphael Costa 7998e3a841 Brazillian Portuguese Translation 2011-02-09 23:29:20 -02: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
Dirk Kelly 7bce392e56 moved to the listed methods in the nav 2011-02-01 16:07:56 +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 2d3c0e974f not showing unlisted pages in the nav 2011-02-01 14:43:07 +08:00
Dirk Kelly 6ba65b1b96 Added an unlisted flag 2011-02-01 14:39:20 +08: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
Dirk Kelly 7d529f22d7 I can't believe I missed the include_page? method. 
Now supports exactly the same standards as the top level list elements, such as unpublished and excluded urls
 2011-01-25 07:54:07 +08:00
Dirk Kelly 825521a5d4 need to reject templatized pages, because they're not real pages. 
Also using children with minimal attributes, like top level.
 2011-01-24 23:20:26 +08:00
Dirk Kelly f512b417f5 added the depth option to nav tag 2011-01-24 17:00:02 +08: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 d5464aa782 add tests 2011-01-18 01:19:18 +01:00
dinedine cfaa5ce66a remove 1..100 2011-01-10 15:05:55 +01:00
dinedine 5301fa083c Merge branch 'master' of https://github.com/mariovisic/engine into mariovisic-master 2011-01-10 14:58:38 +01:00
dinedine 890d5d7e18 the import module takes care of redirection pages (+ tests) 2011-01-10 14:57:44 +01:00
Mario Visic 6b4001165f Altered rendering to set the HTTP 404 status when no page is found 2011-01-09 10:08:32 +08: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 8a3151cf58 change version + bug fix with the webservice module 2011-01-04 12:49:14 +01:00
dinedine d8a8ad4de0 make the webservice helper more robust (because of the numerous api errors in tumblr) 2011-01-03 22:09:19 +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 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 87caa55b80 rspec 2.3 2010-12-19 21:27:32 +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
dinedine 89f106405d fix broken tests + get rid of warnings in cucumber 2010-10-29 17:40:58 +02:00
dinedine cc0b50e22e add rspec tests for the import module + debug the cms to handle correctly the default theme 2010-10-29 01:36:45 +02:00
dinedine 3863272ced finish to merge + tweak minor stuff 2010-10-14 16:01:18 +02:00
dinedine bab4577de0 fixing failed tests 2010-10-12 17:26:05 +02:00
dinedine f7cfcf450e now working with Rails 3.0 and the last Mongoid gem 2010-09-01 16:26:00 +02:00
dinedine 335d7a1aac fix a major bug when updating template children which have the same parent + remove debug output + rspec tests pass 2010-08-31 01:56:54 +02:00
dinedine af5fe62d89 clean and improve the ui concerning the editable elements of a page + fix bugs and refactor a bit 2010-08-28 02:00:05 +02:00
dinedine be36c85e90 implementation of editable_short_text in progress (tests failed) 2010-08-25 00:59:22 +02:00
dinedine 9d78a32340 completely get rid of old layouts + enhance snippets integration + refactor parsing page module 2010-08-22 00:48:24 +02:00
dinedine e25ded881b custom fields has its own repo + upgrade code for Mongoid beta 16 + clean code + fix rspec tests 2010-08-20 17:56:15 +02:00
dinedine 4f06dab51e implement liquid inheritance (in progress) 2010-08-08 13:30:27 +02:00
dinedine cf3a177580 move to liquid 2.1.2 2010-08-04 15:12:14 +02:00
Jacques Crocker ad38eb53a8 Adding MultiPart Page Rendering scenario. Some refactoring also: 
- page step language is a bit more readable
- avoid over using factories. objects created naturally are always preferred!
 2010-08-01 14:36:11 -07:00
Jacques Crocker 2b14c9c992 Woohoo! Got a content page to render in the Cucumber tests 2010-08-01 05:00:34 -07:00
Jacques Crocker 1e1d276ed4 More factory cleanup and workarounds (factory_girl is being retarded) 2010-08-01 03:55:30 -07:00
Jacques Crocker fd6a13858c Cleaning up Cucumber features 
- removing tag actions and replacing with background tasks
- adding some sample pickle steps
- added some basic pickle documentation
 2010-08-01 03:37:49 -07:00
Jacques Crocker 659c805ea9 Adding a couple factories 2010-08-01 03:05:08 -07:00
Jacques Crocker d872805101 Fix up the default body thing 2010-08-01 00:50:29 -07:00
Jacques Crocker 925c7fff8d All Page to be passed in a :body attribute 
This :body attribute will then be used when creating the default body PagePart
 2010-08-01 00:00:06 -07:00
Jacques Crocker 560923f060 Adding growl glue to Gemfile for better growl alerts with autotest 2010-07-30 17:22:58 -07:00
Jacques Crocker 9e76af5a07 Tweaking database_cleaner code 2010-07-30 14:04:18 -07:00
dinedine 54116d9ebb multi site selector with cross domain authentication 2010-07-28 02:42:33 +02:00
Jacques Crocker c6240dd7eb Upgrading to Mongoid 2.0 beta 11 and fixing specs 2010-07-25 19:49:35 -07:00
Jacques Crocker a09329c030 Cleaning whitespace on all .rb files so commit diffs from now on will be a bit more readable 2010-07-23 13:09:54 -07:00