github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,316 Commits 13 Branches 7 Tags 15 MiB
4bf16b00f9
Commit Graph

350 Commits

Author SHA1 Message Date
PitOn
a46019da40 admin_ui.ru.yml finished 2011-08-29 23:48:33 +04:00
PitOn
ef75d4acef devise transaltions 2011-08-27 06:33:33 +04:00
PitOn
d9dafd2222 default.yml translations 2011-08-27 06:27:14 +04:00
PitOn
e8bea2844b more translations 2011-08-27 00:45:25 +04:00
did
bb48552b51 Ruby MRI 1.9.3 Compatability Fixes 2011-08-25 23:28:56 +02:00
GarPit
75e6f2cd08 more translations 2011-08-17 18:28:49 +04:00
did
b3a8916565 upgrade to will_paginate 3.0 (issue #166) 2011-08-15 15:32:21 -07:00
did
4543e597ed complete issue #162 2011-08-14 12:51:11 -07:00
Enrique García Cota
cab52f8f7b added/corrected entries in admin_ui.es.yml 2011-08-12 14:13:44 +02:00
GarPit
09689a0cc9 initial ru translation 2011-08-12 15:32:37 +04:00
did
161878f57e add information to set up carrierwave for local filesystems 2011-08-11 14:47:12 -07:00
Didier Lafforgue
7a4253a7e4 Merge pull request #152 from frisoft/master 
Bugfix: import and italian localization update.
 2011-08-11 14:00:48 -07:00
did
67d7b13f4f Add the reverse has_many field feature (mainly based on pull request #142) 2011-08-11 13:45:46 -07:00
Andrea Frigido
3966c7bdae Italian localization update. 2011-08-01 16:21:15 +02:00
did
6d66275def merge pull request #148 2011-07-28 15:03:13 +02:00
did
abbc151ed2 new factory_girl gem + fix the require pb with the devise_bushido_authenticatable gem 2011-07-26 23:11:43 +02:00
did
d5111d2a4f fix a minor bug about the contents menu + new devise_bushido_authenticatable gem 2011-07-26 21:38:27 +02:00
did
e05586d387 write tests for the last cells menu + write tests for the bushi.do events + refactor the locomotive logger + add the cas_extra_attributes hook 2011-07-26 21:20:03 +02:00
did
0a8321ad3d writing cells specs + restore the bushido.json file 2011-07-26 02:00:35 +02:00
did
ffb780238b minor modifications 2011-07-25 23:40:24 +02:00
did
cb349b3ac0 enable debug mode for bushido + fix minor issues 2011-07-25 23:16:43 +02:00
did
4f7312a659 CAS feature + Cells 2011-07-25 23:07:32 +02:00
did
e2b68ba861 restore production settings + fix broken tests + apply the coding convention on the recently modified haml file 2011-07-23 01:26:16 +02:00
Kev Zettler
13e247691f Merge pull request #137 from Bushido/master 
Guiders and new gem version
 2011-07-22 15:28:03 -07:00
Sean Grove
694ca19324 Le sigh... 2011-07-21 18:38:58 -07:00
Kev Zettler
c1a1e720d3 added guider info to starter page 2011-07-20 22:19:21 -07:00
Kev Zettler
55f95499ce commented out the compression disable dev stuff 2011-07-20 12:24:04 -07:00
Kev Zettler
e22e7a5e46 changed the 'update' buttons to save save 2011-07-18 20:55:55 -07:00
Andrea Frigido
0fde9917d5 Italian localization update. 2011-07-11 09:04:12 +02:00
Kev Zettler
ca2fad461d omg awesome guides 2011-07-08 01:20:29 -07:00
did
37d10aa25b fix bug #104 2011-07-06 11:48:04 -07:00
did
6acec074e2 spanish translation (ticket #103) 2011-07-06 00:33:34 +02:00
did
0737919c2c Dutch translation (ticket #92) 2011-07-05 23:55:26 +02:00
did
1a62d8f5ad Adding the ability to set a robots.txt for each site (ticket #87) 2011-07-05 22:34:15 +02:00
Didier Lafforgue
59a6e03da2 Merge pull request #81 from bewculture/master 
Fixed JS bugs
 2011-07-05 11:37:48 -07:00
did
01b0cde69b revert to the default site configuration (multi_sites disabled) 2011-07-05 18:41:14 +02:00
did
bd28f4c1ec new sites picker 2011-07-05 18:30:12 +02:00
did
1e465e231e remove whilelist for theme assets (no useful since we have got roles now) + a little bit of refactoring 2011-07-04 19:40:14 +02:00
did
02186d7368 add the export link + fix the bugs for the export module + a little bit of refactoring 2011-07-04 15:25:02 +02:00
did
812965ad50 tweak the form UI (errors, input separator) + add more tests 2011-07-01 02:15:45 +02:00
did
c7ea5ab532 add more features for the model section 2011-06-29 14:00:26 +02:00
did
c8f0ad0bbe upgrade rake (0.9.2), cucumber-rails (1.0.2), capybara 2011-06-29 03:05:07 +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
be6629d986 done with the roles (tests are coming) + better help messages for theme_assets and snippets 2011-06-26 16:02:48 -07:00
did
09171555a7 fix CSRF issues with tinymce and some ajax actions + begin to work on the roles feature powered by cancan (in progress, not stable) 2011-06-25 09:25:31 -07:00
did
33a29210ba forget to add a field to update the global seo title for a site + fix a tiny bug when destroying session + enhance hints on some form fields 2011-06-24 00:49:12 -07:00
did
2cc07b3957 fix a little typo in the locales 2011-06-23 07:44:14 -07:00
did
fa7e4c24d8 implement feature #57 2011-06-23 05:57:52 -07:00
did
40530de8bb remove trailing slash and redirect (SEO) 2011-06-22 08:53:29 -07:00
did
4d29500483 new version of custom_fields + allow users to change the permalink of the custom model instances 2011-06-21 14:53:21 -07:00
did
3c31c8dbcf remove all the references to asset_collections 2011-06-21 06:12:20 -07:00
did
a0293b161b add a new plugin in tinymce to upload any kind of files (Bernd) 2011-06-21 05:47:11 -07: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
21ccbb635b removing asset collections 2011-06-17 14:32:54 -07:00
did
0878a39858 saving with the inline editor toolbar did not work (fixed) 2011-06-16 05:07:28 -07:00
did
cd428e467c back to the sha1 encryptor to be compliant with old accounts 2011-06-11 00:24:10 +02:00
did
a5bf4664f2 [bushido] pass the metrics token to bushido.js 2011-06-01 23:47:06 +02:00
did
91119bf54e allow administrators to change the text displayed for each content in the back-office (documentation is coming) 2011-06-01 23:43:12 +02:00
did
4618b35318 cache-busting asset id for bushido.js + new bushido config var (app_name) 2011-06-01 21:09:09 +02:00
did
90ab471e43 modify start page to go directly to the pages section 2011-05-29 15:19:36 -07:00
did
36e5d6d55d Launch user into backoffice on first deploy 2011-05-29 13:32:31 -07:00
did
eb56779370 replace theme by template (better wording) 2011-05-28 20:00:10 -07:00
did
61886ec1b1 installation procedure allows to install the default site template if provided 2011-05-28 19:45:29 -07:00
did
c6b272f9f9 disable authentication if the app has not been claimed yet 2011-05-28 10:52:36 -07:00
did
c68817c8c7 comment references to the bushido stub gem 2011-05-27 15:16:59 -07:00
did
2ce1fadf52 simplify the installation procedure for bushido users 2011-05-27 08:19:20 -07:00
Andrea Frigido
35d5e7d44e Merge remote-tracking branch 'upstream/master' 2011-05-23 09:07:35 +02:00
Andrea Frigido
149d102c82 enhance italian translation. 2011-05-23 09:05:01 +02:00
did
d2f6cc0c53 has_many ui has been implemented 2011-05-19 17:44:04 +02:00
Benjamin Athlan
8716ba5f43 Fixed assets link for menu toggler 2011-05-18 18:35:36 +02:00
Benjamin Athlan
a224aff063 Fixed open/close folder arrows by plugin 2011-05-18 18:27:24 +02:00
did
94528ca94f enhance French translation 2011-05-17 00:03:16 +02:00
Didier Lafforgue
028312bc9e Merge pull request #71 from onelaw/seo_metadata 
Adds support for page- and content instance-specific metadata.
 2011-05-16 14:28:20 -07:00
did
7dafc66359 typo for the french translation of the italian locale + right italy flag 2011-05-07 13:48:49 +02:00
Andrea Frigido
67dd6304e0 Tiny_mce and inline_edit italian localization. 2011-05-04 18:57:01 +02:00
Andrea Frigido
bee4f01e56 Italian localization. 2011-05-04 13:05:16 +02:00
AJ Schuster
f65cd0b2fc Allows for page- and content instance-specific metadata. 
Falls back to site metadata when not specified.
 2011-04-29 16:10:13 -04:00
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