Commit graph

14311 commits

Author SHA1 Message Date
Thomas Müller
5318df3b3c there shall be tabs 2013-10-14 14:51:25 +02:00
Thomas Müller
fb3829e8b8 file system is now initialized with apache authentication as well 2013-10-14 14:46:43 +02:00
Jan-Christoph Borchardt
e9ce704f17 Merge pull request #5297 from owncloud/quota-style
Fixes Default Quota Style in User Management.
2013-10-14 03:59:51 -07:00
Vincent Petry
de920736c5 Merge pull request #5320 from owncloud/fix_app_sorting
Fix app sorting
2013-10-14 02:29:27 -07:00
Frank Karlitschek
258ccdfabe case insensitive sort 2013-10-14 11:15:04 +02:00
Frank Karlitschek
a201a66878 fix style 2013-10-14 10:57:00 +02:00
Frank Karlitschek
f06df170cb finally fix the app sorting 2013-10-14 10:54:38 +02:00
raghunayyar
e0d3046590 Fixes Default Quota Style in User Management. 2013-10-14 10:35:24 +02:00
Jenkins for ownCloud
f3336f8877 [tx-robot] updated from transifex 2013-10-13 20:33:30 -04:00
Raghu Nayyar
e8bede5e0d Merge pull request #5318 from owncloud/show_channel
show the channel. Also mark git as git channel so that someone can see
2013-10-13 13:16:24 -07:00
Morris Jobke
a021a12b3b Merge pull request #5253 from owncloud/externalstorage-adminstatusindicator
Fixed external storage status indicator in admin page
2013-10-13 13:03:02 -07:00
Frank Karlitschek
7cf81f2d12 show the channel. Also mark git as git channel so that someone can see where this build comes from 2013-10-13 21:51:47 +02:00
Thomas Müller
3f54e3c783 Merge pull request #5299 from owncloud/settings-ie8-tablegridstyles
Fixed table grid styles for IE8
2013-10-12 03:51:01 -07:00
Thomas Müller
8be9773c73 Merge pull request #5303 from owncloud/fix-unlogged-session-error
Log an error when session initialization fails before ownCloud is intalled
2013-10-12 03:35:33 -07:00
Morris Jobke
e6d034a60b Merge pull request #5290 from owncloud/fixing-5191-master
Installation. Show advanced section on error. Fixes #5191
2013-10-12 03:28:44 -07:00
Thomas Müller
fce198874f Merge pull request #5272 from mrflix/master
fix label to checkbox binding in admin -> force-https
2013-10-12 01:41:30 -07:00
Thomas Müller
46dd273b9c Merge pull request #5287 from owncloud/core-layoutviewportdirective
Fixed viewport layout using commas instead of semicolons
2013-10-12 01:36:20 -07:00
Thomas Müller
bff6ca212a Merge pull request #5301 from owncloud/versioning_preview_shared
versioning preview also for shared files
2013-10-12 01:32:25 -07:00
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
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