Commit Graph

199 Commits

Author SHA1 Message Date
Mario Visic 8ac8289394 Merge remote-tracking branch 'origin/master' into rails_3_1
Conflicts:
	app/models/content_instance.rb
	config/locales/admin_ui.de.yml
	public/javascripts/admin/inline_editor_toolbar.js
	spec/models/content_instance_spec.rb
2012-01-15 00:02:46 +10:30
Anton Katunin 3fad905314 Added russian translation for tiny_mce image uploader 2012-01-14 21:05:41 +10:30
Mario Visic 0476771ee4 Merge pull request #271 from twinslash/russian_locale
Added russian localisation to tiny_mcs
2012-01-14 02:21:05 -08:00
Mac Shifford 3e7babc9dd Added ru locale to inline_editor 2012-01-13 11:55:28 +03:00
Mac Shifford 131331633f Added russian localisation to tiny_mcs 2012-01-12 17:19:42 +03:00
did ed6020be3e upgrade to new gems + remove hosting modules + change settings for Rails 3.1 + move assets to app/assets 2011-10-30 13:17:05 +01:00
did 99386f8866 new version of plupload (fixing bug #232) 2011-10-21 11:11:17 +02:00
Sharagoz f864980685 norwegian JS translations 2011-10-08 21:09:08 +02:00
Sharagoz c6ab499664 added norwegian locale 2011-09-19 15:48:43 +02:00
Didier Lafforgue f81d3a698f Merge pull request #190 from corgibytes/media_dialog_fixes
Adjusted the interaction with the media dialog.
2011-08-31 14:53:16 -07:00
did 6a2f0f17dd complete the Russian version of the engine (#188): add the Russian flag + translate the Russian word in all the other locales 2011-08-31 23:43:52 +02:00
Alex Sanford 988323b1d0 Extracted DOM option creation into function to apply IE workaround 2011-08-28 22:37:16 -03:00
M. Scott Ford d49453dfc8 Adjusted the interaction with the media dialog. 2011-08-27 01:15:07 -04:00
did 52e78d9b9a fix issue #169 2011-08-18 12:32:45 +02:00
Enrique García Cota e0f11c8a5c added es locale files for tiny_mce + plugins 2011-08-12 13:25:34 +02:00
Enrique García Cota d398b8fba5 added es locale for jquery ui datepicker 2011-08-12 13:24:48 +02:00
Enrique García Cota 85f29c00fe added es locale for aloha editor 2011-08-12 13:24:26 +02:00
did 67d7b13f4f Add the reverse has_many field feature (mainly based on pull request #142) 2011-08-11 13:45:46 -07:00
John Polling 7c8b973889 Slugs for pages were using underscores and not hyphens
I think this has been resolved before, but it seems to have reverted.
Hyphens are more of a standard in CMS'
2011-07-28 10:38:00 +01:00
did 747ba0d6fa disable console.log statements 2011-07-26 22:44:51 +02:00
did b042a02ed4 Merge branch 'master' into cas 2011-07-26 22:41:44 +02:00
did 7f1c9282c7 disable console.log statements 2011-07-26 22:41:20 +02:00
did 616195fe8c Merge branch 'master' into cas 2011-07-26 22:30:19 +02:00
Kev Zettler 18ab1e09e6 added guard for missing subdomain tutorial 2011-07-26 13:27:21 -07:00
did a1f0ffad98 Merge branch 'master' into cas 2011-07-26 22:10:13 +02:00
Kev Zettler 0473fdd7ea added guard for missing models error
'
2011-07-26 12:59:07 -07:00
did ffb780238b minor modifications 2011-07-25 23:40:24 +02:00
Kev Zettler b780bbd42a upgraded the help menu and added handler for bushi_bar guide 2011-07-22 17:55:01 -07: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
Kev Zettler 466cd99101 updated flow and body copy for bushi_banner guider 2011-07-20 12:19:20 -07:00
Kev Zettler b9f5943585 added init hook for tinyMCE dependent guiders 2011-07-20 12:19:06 -07:00
Kev Zettler 6fa003db5c omg more tutorials awesome 2011-07-19 17:35:48 -07:00
did 91aa975973 fix issue #126 2011-07-19 15:36:38 +02:00
Kev Zettler 6db607cb1e updated tutorial flow 2011-07-18 20:56:42 -07:00
Kev Zettler 4eabcdbaa8 added an onchange callback for tinyMCE 2011-07-18 20:56:26 -07:00
Kev Zettler 217465cfda guide updates 2011-07-18 16:42:01 -07:00
Kev Zettler 3b5df5e8a8 more awesome tutorials, more helpful on sites that have no data 2011-07-14 21:38:02 -07:00
Alex Sanford d162cf20c8 Mostly fixed issue #121
Made the text show up but now the select won't update when options are
added or deleted
2011-07-13 23:27:48 -03:00
Kev Zettler 7ca3e7fec7 adding some conditinal functions to tutorial.js to help with no datat off bushido locomotive installs 2011-07-11 15:55:16 -07:00
Kev Zettler 904bed1c10 hooked up the index menu to appropriate guides 2011-07-10 14:46:03 -07:00
Kev Zettler d997741842 everythings hooked up 2011-07-10 14:32:26 -07:00
Kev Zettler 058e97d376 settings and model edit guides 2011-07-10 11:02:06 -07:00
did dc9570dda0 fix issues #110 and #112 + polish css 2011-07-10 19:59:54 +02:00
did 72c1ac9454 solve minor bugs 2011-07-08 15:03:48 +02:00
Kev Zettler ca2fad461d omg awesome guides 2011-07-08 01:20:29 -07:00
did 390f25ce1f minor css improvements 2011-07-08 00:25:03 +02:00
did b2ddaf805c show page kind: templatized or redirect 2011-07-07 18:03:55 +02:00
Kev Zettler a342f7e6b1 added hooks and dependencies for tutorial flow 2011-07-06 22:35:15 -07:00
did 6acec074e2 spanish translation (ticket #103) 2011-07-06 00:33:34 +02:00