Commit Graph

14545 Commits

Author SHA1 Message Date
Tom Needham 14617682c8 Merge branch 'master' of github.com:owncloud/core into fix-unlogged-session-error 2013-10-12 09:15:59 +01:00
Tom Needham 6f8dd54788 Include exception message in log entry when session fails to start 2013-10-12 09:15:08 +01:00
Thomas Müller 60541358ac Merge pull request #5280 from owncloud/shorten_controller_namespace
OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller
2013-10-11 12:51:07 -07:00
Morris Jobke 22bb9762fd Merge pull request #5304 from owncloud/files-deleteiconpositionfix
Fixed position of "delete" icon in files app
2013-10-11 12:39:33 -07:00
Morris Jobke 6c85fc41aa Merge pull request #5296 from owncloud/remove-chosen-hack
Removes the Bogus Label
2013-10-11 12:30:59 -07:00
Thomas Müller dc58195c7f Merge pull request #5207 from owncloud/fixing-4011-part2-master
[OC6] file upload exception handling
2013-10-11 10:35:17 -07:00
Tom Needham cf7ea4bec5 Handle ownCloud logging when data dir not created 2013-10-11 17:16:37 +01:00
Vincent Petry a4a52733f9 Fixed position of "delete" icon in files app
There was an issue where only Chrome allows setting position: relative
on a td element.

This fix now works in IE8, Firefox and Chrome.

Fixes #5056
2013-10-11 18:01:15 +02:00
Tom Needham cb110c0679 Log the session exception when ownCloud is not installed 2013-10-11 16:45:58 +01:00
Vincent Petry 067475a907 Merge pull request #5302 from owncloud/files-missingfileactionsafteradd
File actions are now updated after create/upload file
2013-10-11 08:45:42 -07:00
Vincent Petry b2986e1994 Merge pull request #5274 from owncloud/files-ie8-deletecheckbox
Fixed delete icon alignment in IE8
2013-10-11 08:24:57 -07:00
Vincent Petry e98ea06890 File actions are now updated after create/upload file
The file actions must explicitly be updated by calling
FileActions.display() on the file element after creating or uploading a
file.

Fixes #4971 and #4993
2013-10-11 17:07:48 +02:00
Bjoern Schiessle 9baedb4102 remove debug output 2013-10-11 17:06:43 +02:00
Bjoern Schiessle c32c5979d8 Merge branch 'master' into versioning_preview_shared 2013-10-11 17:00:21 +02:00
Björn Schießle 5c664704a3 Merge pull request #5261 from owncloud/versioning_no_glob
versioning: don't use glob() and getLocalFile()
2013-10-11 07:57:14 -07:00
Björn Schießle 9a15aa8ee9 Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlines
fix setting dialog headlines for the encryption app
2013-10-11 07:15:58 -07:00
Vincent Petry 1a05ed2f38 Fixed table grid styles for IE8
The selector :not() isn't supported in IE8, replaced it with the "grid"
class.

- Fixes the log table style in IE8 (#5057)
- Fixes the users table layout bug in IE8
2013-10-11 15:58:15 +02:00
Bjoern Schiessle 57beef1e36 fix setting dialog headlines for the encryption app 2013-10-11 15:56:08 +02:00
Björn Schießle 034968c612 Merge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missing
encryption: block file access if share keys are missing
2013-10-11 06:37:53 -07:00
Victor Dubiniuk 8ce3ae50f0 Improve expand/collapse logic 2013-10-11 16:35:59 +03:00
Bjoern Schiessle 3ee7711284 fix another typo 2013-10-11 15:26:30 +02:00
Bjoern Schiessle 2d79a79202 change error code to 403 2013-10-11 15:24:49 +02:00
Bjoern Schiessle 83c78bc7a8 fix typo in error message and change error code to 403 2013-10-11 15:23:12 +02:00
raghunayyar 02c7f95687 Includes <optgroup> tag 2013-10-11 18:52:27 +05:30
raghunayyar 7c2f1fd580 Puts the language divider in place. thanks @Kondou-ger ;) 2013-10-11 18:46:59 +05:30
raghunayyar 4b2bb11716 Removes the Bogus Label 2013-10-11 18:42:02 +05:30
Raghu Nayyar eb36ec7544 Merge pull request #5294 from owncloud/personal-multiselect
Uniform Styles and Indentation Fixes for Personal Settings
2013-10-11 06:07:43 -07:00
Morris Jobke b846661a93 Merge pull request #5293 from owncloud/files-ie8-datemisaligned
Fixed IE8 misaligned date
2013-10-11 05:38:08 -07:00
raghunayyar e27bb660bd Uniform Styles and Indentation Fixes for Personal Block 2013-10-11 18:03:53 +05:30
Vincent Petry 2b2a548610 Fixed IE8 misaligned date
Removed display: block to let the element be displayed inline and let
itself aligned by vertical-align: middle of the parent

This works in IE8 and other browsers.

Fixes #5288
2013-10-11 14:23:37 +02:00
Bjoern Schiessle 39d710e737 block file access if share keys are missing 2013-10-11 14:20:46 +02:00
Vincent Petry 39b150921d Moved IE8 inline styles in files.css 2013-10-11 14:10:00 +02:00
Victor Dubiniuk a2445888e8 Show advanced section on error. Fixes #5191 2013-10-11 14:48:31 +03:00
Morris Jobke b9bfe31981 Merge pull request #5281 from owncloud/settings-ie8-changedisplaynamefix
Fixed display name change for IE8
2013-10-11 04:46:26 -07:00
Thomas Tanghus 31714f8871 Merge pull request #5133 from owncloud/js_vcategories_to_tags
Js vcategories to tags
2013-10-11 04:17:59 -07:00
Vincent Petry f8c865993f Fixed viewport layout using commas instead of semicolons
Fixes #5285
2013-10-11 12:52:34 +02:00
Vincent Petry bced346c3b Now using smaller spinner image for status indicator
To make the status indicator appear smaller, even in IE8 that doesn't
support background-size, there is no a smaller animated gif
"loading-small" for that purpose.
2013-10-11 12:36:30 +02:00
Georg Ehrke e28f7f8a33 remove php and js previews 2013-10-11 11:43:26 +02:00
Vincent Petry 6970774776 Fixed display name change for IE8
After saving the display name, the oldDisplayName field's value was
wrongly set with text(), which would append the text inside the input
element which is considered as an invalid operation in IE8.

This fix for #5054 correctly puts the old value into the field with a val() call.
2013-10-11 10:48:30 +02:00
Björn Schießle 4336d42ab0 Merge pull request #5233 from owncloud/enc_filter_users
only encrypt file to users with encryption keys
2013-10-11 01:48:02 -07:00
Bjoern Schiessle a0de5dd325 some small fixes 2013-10-11 10:34:34 +02:00
Bjoern Schiessle 7a1705d28e fix api tests 2013-10-11 10:28:01 +02:00
Thomas Tanghus d75d80ba13 OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller 2013-10-11 10:07:57 +02:00
Jenkins for ownCloud 44a5b0bad0 [tx-robot] updated from transifex 2013-10-10 22:30:58 -04:00
Thomas Müller 51e6565aab only text/plain is now used to generate text previews
blacklist implementation remove because no longer needed
2013-10-11 00:25:34 +02:00
Vincent Petry 75629a1f00 Fixed delete icon alignment in IE8
Removed old inline CSS that forced every td to have position:static in
the files app. (#5056)
2013-10-11 00:16:41 +02:00
Thomas Müller 19ea4f79da resize svg without loosing quality 2013-10-11 00:12:37 +02:00
Felix Niklas 01d3536a76 fix checkbox <-> label binding
clicking the label will trigger the checkbox
2013-10-10 23:10:06 +02:00
Bjoern Schiessle f4e86045de make files versions root a class constant 2013-10-10 20:09:38 +02:00
Bjoern Schiessle 87cccb2e32 some small changes/fixes 2013-10-10 20:06:42 +02:00