did
|
8f43ef401a
|
updates on heroku servers should fix the issue with the heroku gem (http://goo.gl/PIxZe)
|
2011-03-10 09:19:25 +01:00 |
|
did
|
6befc700c5
|
upgrade heroku gem (part 2)
|
2011-03-10 02:46:18 +01:00 |
|
did
|
8456033269
|
upgrade heroku gem
|
2011-03-10 02:40:25 +01:00 |
|
did
|
2ba0718647
|
application error when submitting an asset without a name
|
2011-03-10 00:17:16 +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 |
|
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 |
|
did
|
c3cc358934
|
Merge branch 'multi-level-sub_menu' of https://github.com/dirkkelly/locomotive into dirkkelly-multi-level-sub_menu
|
2011-03-07 21:49:01 +01:00 |
|
did
|
11ccb31088
|
clean code
|
2011-03-07 20:31:08 +01:00 |
|
Dirk Kelly
|
44f84c266b
|
merge
|
2011-03-07 19:59:02 +08:00 |
|
did
|
d2f5757d5b
|
little trick to increase performance in dev mode when used as an engine + do some cleaning in the TODO file
|
2011-03-06 23:36:30 +01:00 |
|
did
|
865c811d0b
|
upgrade the gemspec file (new carrierwave and custom_fields gems
|
2011-03-06 22:09:24 +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 |
|
Dirk Kelly
|
2c1a6c381c
|
the template parsers was broken on ree, made it a bit simpler, just look for slashes
|
2011-03-04 17:53:20 +08:00 |
|
Dirk Kelly
|
9aa68c4611
|
oversight on the fact you shouldn't have to put template in quotes. return of the gsub
|
2011-03-03 13:23:37 +08: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
|
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
|
95cd56cba2
|
sending a default tag will call the method on the page. Ignoring the default text in the tags.
{% editable_short_text coolertitle, default: title %}{% endeditable_short_text %}
|
2011-03-02 11:28:54 +08:00 |
|
Dirk Kelly
|
74277b48ed
|
the rescue wasn't trying the name, causing private method call exceptions
|
2011-03-02 10:05:50 +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
|
cc51e75f5c
|
change the tag name for retrieving a value to be 'content'
{% content somecooltitlebro, inherit: true %}
|
2011-03-02 08:22:41 +08:00 |
|
Dirk Kelly
|
77d7587150
|
allow inheritable to be sent through as a tag
|
2011-03-02 08:15:54 +08:00 |
|
Dirk Kelly
|
04b0849dc5
|
Added the liquid tag for content, retrieves an editable element from self or parent if inherited: true
|
2011-03-02 08:14:58 +08:00 |
|
Dirk Kelly
|
70104e8f9d
|
Merge branch 'master' of github.com:locomotivecms/engine
|
2011-02-28 12:49:54 +08:00 |
|
Dirk Kelly
|
0b11a3813b
|
simplified the theme_image_tag a little
|
2011-02-28 12:09:42 +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
|
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 |
|
Dirk Kelly
|
6070da8a5c
|
added some helper methods to content_types liquid drops (via @KarlBright)
|
2011-02-25 11:47:12 +08:00 |
|
Bernd Hauser
|
32701d7894
|
german language added
|
2011-02-23 12:40:56 +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
|
333b6fab5c
|
dont require delayed job
|
2011-02-22 08:32:40 +08:00 |
|
Dirk Kelly
|
f18456c629
|
not required delayed_job_mongoid
|
2011-02-22 08:23:46 +08:00 |
|
Mario Visic
|
f5b4e30d0a
|
Logging into a site without membership now correctly displays an error message and redirects to login.
|
2011-02-20 21:39:02 +08:00 |
|
did
|
2f72d26d4c
|
Merge branch 'master' of https://github.com/karlbright/engine into karlbright-master
|
2011-02-19 00:58:13 +01:00 |
|
did
|
bd992cc882
|
fix issue #37 plus other ones related to theme assets and assets
|
2011-02-19 00:51:57 +01: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
|
59618d4f66
|
when importing theme, force the position of a page as an integer
|
2011-02-13 00:01:42 +01:00 |
|
did
|
af5ec86c57
|
merging
|
2011-02-12 18:13:06 +01:00 |
|
did
|
44a7c33f9f
|
preserve positions of the index and 404 page
|
2011-02-12 15:32:35 +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
|
eaab196d06
|
Brazilian Portuguese Translations
|
2011-02-11 23:44:35 -02:00 |
|
Raphael Costa
|
7998e3a841
|
Brazillian Portuguese Translation
|
2011-02-09 23:29:20 -02:00 |
|
dinedine
|
0be4c93924
|
import theme from the rails console is now possible
|
2011-02-04 15:43:43 +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 |
|
dinedine
|
2402ef2cd4
|
positions for the index and not found pages were messed up when importing site
|
2011-02-03 11:22:19 +01:00 |
|
Dirk Kelly
|
7bce392e56
|
moved to the listed methods in the nav
|
2011-02-01 16:07:56 +08:00 |
|
Dirk Kelly
|
2d3c0e974f
|
not showing unlisted pages in the nav
|
2011-02-01 14:43:07 +08:00 |
|
dinedine
|
02039159d7
|
add getter to the size of an asset collection in liquid
|
2011-01-30 00:30:24 +01: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
|
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 |
|
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
|
85bee3a110
|
Merge branch 'add_or_update_editable_element' of https://github.com/dirkkelly/locomotive into dirkkelly-add_or_update_editable_element
|
2011-01-18 00:28:41 +01:00 |
|
Dirk Kelly
|
62568bbdbb
|
Fixed exception when updating a layout from back-office which contained an editable area
|
2011-01-14 15:27:58 +08:00 |
|
dinedine
|
3686496bb2
|
still got errors with dates display + admin default root points to signin
|
2011-01-11 12:42:12 +01:00 |
|
dinedine
|
ff01539bb5
|
date in content types compatible with ruby 1.9.2
|
2011-01-11 00:50:42 +01:00 |
|
dinedine
|
933c26dbb2
|
bump version
|
2011-01-10 15:15:53 +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 |
|
dinedine
|
c94087ccb5
|
Merge branch 'mariovisic-page_redirect'
|
2011-01-08 00:14:19 +01:00 |
|
dinedine
|
1291b68aba
|
in special sitation inherited templates were not correctly updated
|
2011-01-08 00:10:44 +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
|
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
|
c828301f37
|
fonts did not work when stored in amazon s3
|
2011-01-03 21:53:33 +01:00 |
|
dinedine
|
56a7a09903
|
minor stuff
|
2011-01-03 14:44:38 +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
|
c0ac0046c1
|
polishing + bump version (beta yeaaah)
|
2010-12-31 19:31:22 +01:00 |
|
dinedine
|
83bce13020
|
fonts were not served in the locomotive engine
|
2010-12-30 18:15: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
|
62564021b6
|
the theme import module can work without delayedjob + fix bugs
|
2010-12-17 00:42:38 +01:00 |
|
dinedine
|
727a824745
|
prepare locomotive as a gem
|
2010-12-16 13:39:05 +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
|
9c77180a63
|
fix minor issues
|
2010-10-29 16:19:41 +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
|
680a42b8f5
|
first attempt of an installation wizzard
|
2010-10-27 02:11:44 +02:00 |
|
dinedine
|
c2766f0273
|
Merge branch 'origin/nodefault'
|
2010-10-26 15:09:58 +02:00 |
|
dinedine
|
7cb26a74d4
|
fix bug with pagination + add _permalink property for content instances
|
2010-10-26 15:06:57 +02:00 |
|
dinedine
|
b4d3aae46f
|
order assets when used in liquid templates
|
2010-10-19 16:56:50 +02:00 |
|
dinedine
|
c1b21fac8b
|
use BSON::ObjectId to find elements (asset collection, content type) + make the import module work with S3
|
2010-10-19 12:20:09 +02:00 |
|
dinedine
|
5db5d70b0b
|
should fix the issue with Heroku
|
2010-10-18 15:19:33 +02:00 |
|
dinedine
|
dffec0731e
|
remove namespace for delayed_job tasks (needed by heroku)
|
2010-10-17 03:26:32 +02:00 |
|
dinedine
|
344a737b9a
|
clean code + fix gem requirements for the engine version of this app
|
2010-10-17 03:18:41 +02:00 |
|
dinedine
|
a03dd77a65
|
update gem dependencies + gemspec + liquid tags (stylesheet_tag, ...etc) work with amazon S3
|
2010-10-16 11:27:26 +02:00 |
|
dinedine
|
acaf997b6e
|
build locomotive engine as a gem
|
2010-10-15 02:05:21 +02:00 |
|
dinedine
|
163077be43
|
index in first, 404 page in last when importing theme
|
2010-10-14 23:56:51 +02:00 |
|
dinedine
|
282fbb7244
|
merging
|
2010-10-14 14:37:14 +02:00 |
|
dinedine
|
1c86db05f8
|
polish the import module + some code refactoring / cleaning
|
2010-10-12 02:12:18 +02:00 |
|
dinedine
|
54063d6b46
|
create a middleware for serving fonts (solve cross domain issue) + add cache for consume liquid tag + fix image picker
|
2010-10-11 16:26:46 +02:00 |
|
dinedine
|
86ac74e290
|
bugs when accessign assets from asset collections in templates + uploader for custom fields was buggy
|
2010-10-11 01:16:43 +02:00 |
|
dinedine
|
2f4128bf8f
|
refactoring theme assets in progress
|
2010-10-10 16:37:34 +02:00 |
|
dinedine
|
ecfa466074
|
add missing asset collections import module + add google analytics import + work on simplifying the theme asset logic
|
2010-10-07 02:45:41 +02:00 |
|
dinedine
|
eabe4903f3
|
refactor locomotive liquid drops + implement the theme or site import page (95% done)
|
2010-09-29 00:08:11 +02:00 |
|
Jacques Crocker
|
350aee82a8
|
Vendoring mongo_session_store so we have one less dependency
|
2010-09-28 02:19:55 -07:00 |
|
dinedine
|
a5ea70229c
|
allows to disable import sub tasks + new images tag logic (in progress) + handle errors when importing
|
2010-09-28 10:09:49 +02:00 |
|
Jacques Crocker
|
faccdef5a5
|
adding mimetype_fu require
|
2010-09-28 00:46:12 -07:00 |
|
Jacques Crocker
|
d512e33d03
|
bundler needs help. removing gemspec helepr for now
|
2010-09-28 00:18:10 -07:00 |
|
Jacques Crocker
|
ea4c09c7ce
|
Updating dependencies, removing jeweler, and cleaning up gemspec
|
2010-09-27 23:04:40 -07:00 |
|
Didier Lafforgue
|
e31012f861
|
fix a lot of tiny bugs (not yet) + testing import tool
|
2010-09-27 00:31:50 +02:00 |
|
dinedine
|
9a722c4268
|
working on importing pages
|
2010-09-24 01:00:13 +02:00 |
|
dinedine
|
39886427e0
|
first and unfinished draft of the import tool
|
2010-09-23 00:59:30 +02:00 |
|
dinedine
|
28ade83ab9
|
add comments
|
2010-09-22 10:47:21 +02:00 |
|
Jacques Crocker
|
9097200339
|
Adding specific admin templates for the "no site" and "no page" errors.
Goal should be to use these to allow someone to create a new site right here
|
2010-09-21 04:45:34 -07:00 |
|
Jacques Crocker
|
48c917982c
|
Reorganizing Admin layouts, and deleting home controller and views
|
2010-09-21 04:16:39 -07:00 |
|
dinedine
|
d5223e5c91
|
skinning tinymce to match locomotive style
|
2010-09-06 23:47:03 +02:00 |
|
dinedine
|
eb81a5041f
|
clean the inline editor js code (namespace toolbar functions, ...etc)
|
2010-09-06 14:22:13 +02:00 |
|
dinedine
|
dad944d625
|
tiny patch for aloah-editor (span behaves like b tags) + enhance inline editor js (locale, spinner when saving, better ui, ...etc)
|
2010-09-06 00:50:05 +02:00 |
|
dinedine
|
fc7fef8ba3
|
saving editable text elements works
|
2010-09-05 01:50:11 +02:00 |
|
dinedine
|
1e8376d18f
|
page toolbar for live editing
|
2010-09-04 01:47:28 +02:00 |
|
dinedine
|
9967e9d3d3
|
first attempt to build the inline editor module
|
2010-09-03 01:03:20 +02:00 |
|
dinedine
|
f7cfcf450e
|
now working with Rails 3.0 and the last Mongoid gem
|
2010-09-01 16:26:00 +02:00 |
|
dinedine
|
35b4e5358c
|
editable_file tag is implemented + remove not used editable elements all in once for better performance + default content inherits from the content of the parent element
|
2010-08-31 23:53:30 +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
|
d7aba616f6
|
editable long text implemented + refactoring + ui
|
2010-08-30 01:41:44 +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
|
0d72a9f932
|
first working attempt for editable_short_text liquid tag + update of the admin ui to reflect the new way of managing editable elements
|
2010-08-27 17:40:03 +02:00 |
|
dinedine
|
eea6d4f8ce
|
add some tests for the editable_elements feature + fix bugs
|
2010-08-26 13:06:44 +02:00 |
|
dinedine
|
be36c85e90
|
implementation of editable_short_text in progress (tests failed)
|
2010-08-25 00:59:22 +02:00 |
|
dinedine
|
e580021eda
|
also update page templates if a snippet was modified
|
2010-08-24 15:04:53 +02:00 |
|
dinedine
|
75783ec881
|
when a template is modified, all pages inheriting from it are updated too (functional tests are coming)
|
2010-08-23 01:48:11 +02:00 |
|
dinedine
|
4805d8813e
|
template errors in pages are handled correctly now (bug) + {% extends parent %} is implemented
|
2010-08-22 01:56:44 +02:00 |
|
dinedine
|
8196c0a6de
|
handle more liquid errors during page editing
|
2010-08-22 00:58:26 +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
|
53500bda9e
|
first draft of the new template inheritance mechanism based on our fork of Liquid
|
2010-08-20 02:31:01 +02:00 |
|
dinedine
|
08f0fdfb5b
|
clean code + tiny optimization
|
2010-08-09 16:39:38 +02:00 |
|
dinedine
|
d879b80b7a
|
working on optimization
|
2010-08-09 15:51:27 +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
|
2b14c9c992
|
Woohoo! Got a content page to render in the Cucumber tests
|
2010-08-01 05:00:34 -07:00 |
|
Jacques Crocker
|
071196e97b
|
Upgrading to Rails3 rc
|
2010-07-29 16:21:48 -07:00 |
|
dinedine
|
e74fa1de56
|
custom error pages (404 for the backend section + 500 for the whole application) + clean up
|
2010-07-29 12:46:13 +02:00 |
|
dinedine
|
54116d9ebb
|
multi site selector with cross domain authentication
|
2010-07-28 02:42:33 +02: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 |
|
dinedine
|
2608430cae
|
allow users to use shortcut for theme images when editing snippets / layouts / stylesheets + fix minor ui bugs
|
2010-07-23 00:10:40 +02:00 |
|
dinedine
|
a03b631a71
|
create a liquid drop for site (include a method to get the home page)
|
2010-07-22 02:18:14 +02:00 |
|
dinedine
|
35e0120cab
|
fix js bug when changing layout in page editing + improve nav tag
|
2010-07-22 01:35:30 +02:00 |
|
dinedine
|
c4f4979203
|
remove dirty logger
|
2010-07-20 12:21:18 +02:00 |
|
dinedine
|
b2c39b4137
|
updating Rails to beta 4 + mongoid to beta 9 + fix all broken parts caused by the upgrade
|
2010-07-20 12:15:53 +02:00 |
|