did
|
c5692aeb2a
|
fix errors when deploying a new brand new engine instance
|
2012-01-27 02:27:26 +01:00 |
|
Mario Visic
|
840609cbce
|
Merge remote-tracking branch 'origin/master' into rails_3_1
Conflicts:
Gemfile
Gemfile.lock
app/cells/locomotive/menu_cell.rb
app/helpers/admin/content_types_helper.rb
app/models/content_instance.rb
app/models/page.rb
app/views/admin/shared/menu/_contents.html.haml
config/initializers/locomotive.rb
config/locales/admin_ui.de.yml
config/locales/admin_ui.en.yml
config/locales/admin_ui.es.yml
config/locales/admin_ui.fr.yml
config/locales/admin_ui.it.yml
config/locales/admin_ui.nl.yml
config/locales/admin_ui.no.yml
config/locales/admin_ui.pt-BR.yml
config/locales/admin_ui.ru.yml
lib/generators/locomotive/install/templates/locomotive.rb
lib/locomotive/configuration.rb
locomotive_cms.gemspec
spec/models/locomotive/account_spec.rb
|
2012-01-25 22:16:43 +11:00 |
|
Corey Woodcox
|
81db1da423
|
fix spelling error in locales
|
2012-01-25 18:52:54 +11:00 |
|
did
|
7af9ea34a6
|
trying to make it work with the precompilation of assets (issue with Aloha and TinyMCE)
|
2012-01-20 14:46:09 +01:00 |
|
did
|
01c5de36a5
|
add the ui element to select the languages for a site
|
2012-01-09 17:24:34 -08:00 |
|
did
|
435d4067c0
|
namespace vendor assets
|
2012-01-08 16:27:13 -08:00 |
|
did
|
5dfbb2bdb7
|
upgrade to the last version of delayed_job_mongoid gem + remove reference to the previous handlebars-rails gem (just add the js file instead) + refactor the way to display the list of content types in the back-office menu
|
2012-01-08 16:17:31 -08:00 |
|
did
|
912251d49b
|
big refactoring (wip) + add/edit entries for content types
|
2012-01-02 05:54:01 -08:00 |
|
did
|
b383086242
|
wip
|
2011-11-06 12:18:34 +01:00 |
|
did
|
161878f57e
|
add information to set up carrierwave for local filesystems
|
2011-08-11 14:47:12 -07:00 |
|
did
|
6d66275def
|
merge pull request #148
|
2011-07-28 15:03:13 +02:00 |
|
did
|
8c1372afc6
|
fixing the heroku version
|
2011-06-28 17:35:25 +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
|
87e7ced3c1
|
integrate dragonfly + clean code + fix a js bug when editing a custom field
|
2011-06-20 12:05:12 -07:00 |
|
did
|
820d55a83c
|
use delayed_job by default on bushi.do
|
2011-04-28 17:17:15 +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
|
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
|
60df5c19f9
|
the locomotive config template is now up-to-date
|
2011-04-04 02:03:23 +02: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 |
|
did
|
af5ec86c57
|
merging
|
2011-02-12 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
|
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
|
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 |
|
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
|
f4e2d09bdf
|
fix a bug with IR only when Locomotive is used an engine + fix minor stuff
|
2010-07-14 01:37:02 +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
|
29c22c05c1
|
heroku support + fix minor bugs
|
2010-06-14 15:04:01 +02:00 |
|
dinedine
|
339d791e7d
|
make Locomotive compliant with Heroku + better names for generator + comment console.log in some js preventing js actions
|
2010-06-12 03:13:58 +02:00 |
|