did
|
16090a0f75
|
fix the mess with git and Aloha
|
2011-02-12 18:21:10 +01:00 |
|
did
|
af5ec86c57
|
merging
|
2011-02-12 18:13:06 +01:00 |
|
did
|
ff14f6f64f
|
new version of Aloha-Editor
|
2011-02-12 16:25:52 +01:00 |
|
did
|
138be23492
|
weird git behaviour
|
2011-02-12 16:22:47 +01:00 |
|
did
|
2827834e19
|
new Aloha version
|
2011-02-12 16:19:56 +01:00 |
|
did
|
97ff5f07c1
|
cleaning
|
2011-02-12 16:19:22 +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
|
f281934832
|
fix in portuguese translations
|
2011-02-12 01:50:47 -02:00 |
|
Raphael Costa
|
eaab196d06
|
Brazilian Portuguese Translations
|
2011-02-11 23:44:35 -02:00 |
|
Raphael Costa
|
d97c8b8525
|
Brazillian Portuguese Translation (5)
|
2011-02-10 01:23:28 -02:00 |
|
Raphael Costa
|
7998e3a841
|
Brazillian Portuguese Translation
|
2011-02-09 23:29:20 -02:00 |
Dirk Kelly
|
47e6691e3c
|
hide the listed option on a template
|
2011-02-01 16:08:06 +08:00 |
|
Dirk Kelly
|
3160f10ec5
|
javascript for the unlisted options show/hide
|
2011-02-01 15:08:26 +08: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
|
890d5d7e18
|
the import module takes care of redirection pages (+ tests)
|
2011-01-10 14:57:44 +01:00 |
|
dinedine
|
2adb950ac3
|
css stuff
|
2011-01-10 11:04:53 +01:00 |
|
dinedine
|
fd10f7e356
|
Merge branch 'page_redirect' of https://github.com/mariovisic/engine into mariovisic-page_redirect
|
2011-01-07 15:04:50 +01:00 |
|
dinedine
|
3ee566eae6
|
add missing stylesheet for the asset collections section in the back-office
|
2011-01-07 14:50:53 +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
|
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
|
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
|
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
|
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 |
|
dinedine
|
9533df3e43
|
clean up stuff in js + do not display the internal asset collection in the assets section + fix ui bug with custom fields in the assets section
|
2010-09-15 17:48:10 +02:00 |
|
dinedine
|
f458716c8a
|
clean new tinymce image plugin
|
2010-09-15 02:21:46 +02: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
|
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
|
ba1009340e
|
turn any html textarea into a WYSIWYG when saving a page in ajax
|
2010-09-01 00:12:37 +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
|
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 |