Commit Graph

264 Commits

Author SHA1 Message Date
dinedine
0fcd8d5a3c new version of codemirror + enable liquid colorization + minify codemirror + cmd+S works on Safari, Firox and Chrome 2011-01-12 16:54:09 +01:00
dinedine
b397a34c47 Merge branch 'dollar-cmd-s' of https://github.com/dirkkelly/locomotive into dirkkelly-dollar-cmd-s 2011-01-12 09:42:35 +01:00
Dirk Kelly
135f6e54ad added a $.cmd("key", {}) method, is now used by shortcut.js 2011-01-11 21:42:47 +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
3ee566eae6 add missing stylesheet for the asset collections section in the back-office 2011-01-07 14:50:53 +01:00
dinedine
2f478a86fd cleaning 2011-01-03 23:53:25 +01:00
dinedine
56a7a09903 minor stuff 2011-01-03 14:44:38 +01:00
dinedine
c0ac0046c1 polishing + bump version (beta yeaaah) 2010-12-31 19:31:22 +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
727a824745 prepare locomotive as a gem 2010-12-16 13:39:05 +01:00
dinedine
88b1686053 forgot to add the jammit config file 2010-12-14 18:00:39 +01:00
dinedine
e6226abece use jammit to compress stylesheet/javascript files 2010-12-14 18:00:12 +01:00
dinedine
a1d9a5d548 reflect changes from the last imported theme (enhancements + bugs fixed) 2010-10-31 00:30:30 +02:00
dinedine
aa764ee185 add French translations for the installation + installation allowed if both no sites and no accounts 2010-10-29 17:28:38 +02:00
dinedine
9b175c3cda add options when importing new site + fix page toolbar style + fix minor stuff 2010-10-29 17:12:57 +02:00
dinedine
9c77180a63 fix minor issues 2010-10-29 16:19:41 +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
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
344a737b9a clean code + fix gem requirements for the engine version of this app 2010-10-17 03:18:41 +02:00
dinedine
163077be43 index in first, 404 page in last when importing theme 2010-10-14 23:56:51 +02:00
dinedine
3863272ced finish to merge + tweak minor stuff 2010-10-14 16:01:18 +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
32f8351889 button to see all theme assets (including hidden ones) 2010-10-10 23:59:56 +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
dinedine
1e1c3bd97b haml always in ugly mode + refactor theme files section in admin 2010-09-22 14:50:01 +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
dinedine
2e4a15a511 new image plugin for tinymce 2010-09-15 02:19:34 +02:00
dinedine
d5223e5c91 skinning tinymce to match locomotive style 2010-09-06 23:47:03 +02:00
dinedine
9967e9d3d3 first attempt to build the inline editor module 2010-09-03 01:03:20 +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
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
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
dbc542c4d7 fix bugs with acts_as_tree + fix cucumber tests 2010-08-20 18:24:59 +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
fbda6a17f9 update benchmark with results on my imac + tweak ui in order to reflect changes about with liquid inheritance 2010-08-08 15:16:32 +02:00
dinedine
c76cd6527c merge 2010-08-02 16:16:08 +02:00
dinedine
d973868a06 merge + fix tiny bugs 2010-08-02 13:45:50 +02:00
Jacques Crocker
150654ec84 Death to RJS and its kin! 2010-08-01 23:32:52 -07:00
Jacques Crocker
cc8ae8e18c Oops, didnt quite understand the "consider requests local" flag.
Reverting it to its previous settings
2010-07-30 23:50:44 -07:00
Jacques Crocker
7e53560255 Fixing cucumber configuration so it can handle features in subfolders correctly 2010-07-30 23:46:55 -07:00
Jacques Crocker
8cddd6cb80 Some more dependency updates (devise and rspec-rails) 2010-07-30 14:34:35 -07:00
Jacques Crocker
2d19e8d557 Remove Rails rc1 deprecation warnings from routes
Was a tough one to track down. But hurray... now I know what .arity means!
2010-07-30 14:27:41 -07:00
Jacques Crocker
071196e97b Upgrading to Rails3 rc 2010-07-29 16:21:48 -07:00
Jacques Crocker
84c9831db6 simplify cucumber runtime settings 2010-07-29 13:26:45 -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
4eea9855aa Fixing up Cucumber env (database_cleaner and envjs) 2010-07-26 01:19:42 -07:00
Jacques Crocker
1e79f5bcfd Updating devise to be compatible with latest mongoid 2010-07-26 00:59:02 -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
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
35e0120cab fix js bug when changing layout in page editing + improve nav tag 2010-07-22 01:35:30 +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
dinedine
81dc8ea623 build a generic theme image picker 2010-07-18 00:01:00 +02:00
dinedine
fb148a31a4 templatized page + fix bug with nav widget 2010-07-16 22:36:07 +02:00
dinedine
533a4ee4aa flash messages in French + new icon for assets + ajax update for almost all forms 2010-07-13 22:01:40 +02:00
dinedine
0671a55ef8 sitemap + use inherited_sources gem to refactor controllers + fix bugs + clean stuff + save some forms with CMD + S (in progress) 2010-07-13 02:46:17 +02:00
dinedine
cc03e0b774 new cache strategy + remember_me set to true by default + fix bugs (one with mongo_tree) 2010-07-09 12:38:50 +02:00
dinedine
96e4753ed6 specify MIT license + textile filter + fix bug with new tree plugin + fix tests 2010-07-06 17:00:02 +02:00
dinedine
172fe4c752 French translation is done 2010-07-06 11:14:37 +02:00
dinedine
821210795d localize devise mailer + fix js bug in safari when uploading theme assets 2010-06-30 17:42:00 +02:00
dinedine
9797d6d137 localize devise mailer + fix js bug in safari when uploading theme assets 2010-06-30 17:41:54 +02:00
dinedine
a6bde2b8e5 new custom field type: File + fix minor issue with Date 2010-06-30 15:18:17 +02:00
dinedine
dda2f7ef19 new custom field type: Date 2010-06-30 02:03:34 +02:00
dinedine
c5b5c6ded4 move patches for mongoid / carrierwave + add patch for mongoid + clean stuff 2010-06-30 00:09:47 +02:00
dinedine
6d45155b2f rich text editor for the Text custom field + refactor the custom field types + add new custom field type: Boolean + fix asset collections 2010-06-22 15:04:40 +02:00
dinedine
b7e1cd0926 categories in content types have been improved a lot + cross-site session + meta keys / description for site + clean code + fix bugs 2010-06-16 16:43:29 +02:00
dinedine
29c22c05c1 heroku support + fix minor bugs 2010-06-14 15:04:01 +02:00
dinedine
28211edad6 fix assets upload with S3 in production + enhance a couple of things 2010-06-12 23:47:14 +02:00
dinedine
1d5786638b add logging option in Locomotive settings 2010-06-11 11:29:51 +02:00
dinedine
fe96fbdaa2 Change version of the mongo_session_store gem + clean code 2010-06-11 11:23:20 +02:00
dinedine
f567b7754f change devise config in routes.rb + clean code + fix broken tests 2010-06-11 00:07:59 +02:00
dinedine
6b0dafc223 refactor + fix bugs + complete translations in English + api security option in content types 2010-06-10 16:50:50 +02:00
dinedine
7ccc3d4548 very simple api for contents (just create for now) + fix a lot of bugs in the custom fields plugin and some enhancements as well + add an ui for manage categories + fix bugs 2010-06-10 15:30:22 +02:00
dinedine
fc690d8a0b rename CustomFields::CustomField into CustomFields::Field + create a dynamic class when we have an object with custom fields (optimization) + create a new type of custom field: categories + fix minor bugs + add ui to rename the alias of a custom field 2010-06-08 02:45:49 +02:00
dinedine
9b87be4637 patch for http://github.com/plataformatec/devise/issues/issue/206 2010-06-04 01:53:59 +02:00
dinedine
3d22ef4d1c modify the way locomotive setups a mongo connection 2010-06-04 00:55:04 +02:00
dinedine
9f20f56b1d fix some bugs about engine startup + add a generator to install assets into the parent app 2010-06-03 22:20:53 +02:00
dinedine
9e7d1d3a08 make an engine of the cms 2010-06-03 17:32:40 +02:00
dinedine
eaaa2b0d35 theme asset picker in progress 2010-06-02 02:39:05 +02:00
dinedine
9447386f0e rendering engine + liquid tags/drops/filters + rspec tests + fix small bugs 2010-05-31 01:57:33 +02:00
dinedine
1a2467acf4 sort contents within a conten type + make content type validation more robust + find a bug when dealing with 2 content types 2010-05-26 02:41:10 +02:00
dinedine
4534a11ce4 adding contents works + add spec + enhance content types 2010-05-25 02:32:12 +02:00
dinedine
61958d9452 fix bug about page parts when creating or modifying layout + begin to work on the custom content types feature (50% done) 2010-05-24 02:18:23 +02:00
dinedine
1ed613ede8 custom field validation is more robust + editing new fields for assets works now 2010-05-22 16:46:32 +02:00
dinedine
9d134599b2 first bricks of the CustomFields plugin 2010-05-20 01:42:19 +02:00
dinedine
05a93cb5c1 custom fields proof of concept in progress 2010-05-19 18:17:45 +02:00
dinedine
277b531449 first draft of custom fields 2010-05-18 00:51:53 +02:00
dinedine
c15c635efe custom fields (in progress) 2010-05-17 22:46:41 +02:00
dinedine
13cd09e3af asset collections almost done 2010-05-12 02:16:39 +02:00
dinedine
e5c10cfa3e theme assets 2010-05-11 23:38:52 +02:00
dinedine
9901f53e12 now can add new sites / accounts + basic membership mechanism iimplemented + fix a lot of minor bugs + add more rspec tests 2010-05-11 00:39:52 +02:00
dinedine
a0216dc75f first cucumber features + crud for pages (95% done) 2010-05-09 14:44:53 +02:00
dinedine
3b847b2732 new page tree ui + snippets crud + layout crud (in progress) + page parts (in progress) 2010-05-03 01:33:17 +02:00
dinedine
e81b4a353a creating page in progress 2010-04-25 02:33:38 +02:00
dinedine
4ca9037d1b style the admin layout 2010-04-24 02:32:36 +02:00
dinedine
0d606852ef beautiful login page is up 2010-04-23 01:52:11 +02:00
dinedine
710e2bba29 customizing devise 2010-04-13 16:26:40 +02:00
dinedine
30789cbbc3 adding devise + create account model and bind it to site 2010-04-13 15:24:12 +02:00
dinedine
0db6b9625f add cucumber to the projet (waiting for the first scenari) 2010-04-13 01:33:25 +02:00
dinedine
8d1f6a24e1 Site dispatcher in its core version works + tests are coming 2010-04-12 01:59:18 +02:00
dinedine
3b8a6c67df add validations to site 2010-04-10 17:25:07 +02:00
dinedine
cd67a29b88 working stack ? 2010-04-09 11:23:41 +02:00
dinedine
a9fb66f9c1 first init 2010-03-30 00:01:47 +02:00