did
|
820d55a83c
|
use delayed_job by default on bushi.do
|
2011-04-28 17:17:15 +02:00 |
|
did
|
721e008121
|
multi-sites off by default
|
2011-04-27 18:44:49 +02:00 |
|
did
|
2942ce58c8
|
merged manually pull request #62: extended german language
|
2011-04-27 16:58:58 +02:00 |
|
did
|
1e70560b7b
|
bump version + fix typo for the heroku credentials
|
2011-04-27 01:12:32 +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 |
|
did
|
09bd73c7ac
|
enhance carrierwave settings to support bushi.do
|
2011-04-07 11:53:07 +02:00 |
|
did
|
e03d7b5dcc
|
smoother integration with bushi.do
|
2011-04-07 01:34:36 +02:00 |
|
did
|
2cba14afec
|
do not run the locomotive core initializer if engine
|
2011-04-06 01:29:11 +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
|
60df5c19f9
|
the locomotive config template is now up-to-date
|
2011-04-04 02:03:23 +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 |
Sean Grove
|
87f5177c07
|
Merge branch 'master' of github.com:sgrove/engine
|
2011-03-23 01:31:14 -07:00 |
|
Sean Grove
|
d2e7c7ef9e
|
Pickup on HOSTING_PLATFORM to auto-enable Bushido
|
2011-03-21 21:54:10 -07:00 |
Sean Grove
|
f921dbe6d1
|
Cheat and enable bushido's mongodb by default for now.
|
2011-03-21 03:55:43 -07:00 |
|
Sean Grove
|
0476ef8235
|
Add a bushido switch inside locomotive.rb initializer
|
2011-03-21 03:45:38 -07:00 |
|
Sean Grove
|
953ed52b87
|
Mark a note about how to handle file uploads for persistence
|
2011-03-21 03:42:36 -07:00 |
|
Sean Grove
|
3dcafac917
|
Each app should have a unique secret token
|
2011-03-21 03:37:44 -07:00 |
|
Sean Grove
|
4c7562be32
|
Bushido mongoid support
|
2011-03-21 03:35:54 -07:00 |
|
Sean Grove
|
6da7d98163
|
Pickup TLD from ENV for default domain, or fallback to manually-specified value.
|
2011-03-21 01:56:57 -07:00 |
|
did
|
a66e745746
|
fix bug #52
|
2011-03-17 17:41:25 +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 |
Dirk Kelly
|
44f84c266b
|
merge
|
2011-03-07 19:59:02 +08:00 |
|
did
|
35eeac8306
|
provide English translations for the asset collections section
|
2011-03-05 23:30:42 +01: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
|
537c1a6f67
|
clean translations (password, new_password) + provide a right tab background longer for the menu
|
2011-03-05 01:10:52 +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
|
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 |
|
did
|
70493180f6
|
improve the French translation
|
2011-02-27 17:29:32 +01: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
|
2cb498bc50
|
added the German translation for the footer (thanks Estelle ;-))
|
2011-02-27 12:32:57 +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 |
Bernd Hauser
|
fcb056828a
|
fixed default.de.yml
|
2011-02-23 15:21:39 +01:00 |
|
Bernd Hauser
|
32701d7894
|
german language added
|
2011-02-23 12:40:56 +01: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
|
bd992cc882
|
fix issue #37 plus other ones related to theme assets and assets
|
2011-02-19 00:51:57 +01:00 |
|
did
|
1aee2f4ce5
|
it prevented the use of rspec when locomotive was using as an engine
|
2011-02-13 01:12:27 +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
|
eaab196d06
|
Brazilian Portuguese Translations
|
2011-02-11 23:44:35 -02:00 |
|
Raphael Costa
|
c5e9f05ee9
|
Brazillian Portuguese Translation (5)
|
2011-02-10 01:12:50 -02:00 |
|
Raphael Costa
|
858ada2f28
|
Brazillian Portuguese Translation (5)
|
2011-02-10 01:10:10 -02:00 |
|
Raphael Costa
|
caeac4791b
|
Brazillian Portuguese Translation (4)
|
2011-02-10 01:07:58 -02:00 |
|
Raphael Costa
|
5f58a6e1cb
|
Brazillian Portuguese Translation (3)
|
2011-02-10 01:00:50 -02:00 |
|
Raphael Costa
|
742305cdfb
|
Brazillian Portuguese Translation (2)
|
2011-02-09 23:36:55 -02:00 |
|
Raphael Costa
|
ab97b9e6bc
|
Brazillian Portuguese Translation
|
2011-02-09 18:56:31 -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
|
974923b929
|
listed translation
|
2011-02-01 16:07:41 +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 |
|
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
|
2fc99bf90a
|
rename translation files (convention) + email notification when adding contents (api)
|
2011-01-18 15:24:42 +01:00 |
|
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 |