]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoany preview requiring the which command will not be used on Windows
Thomas Müller [Mon, 14 Oct 2013 22:15:45 +0000 (00:15 +0200)]
any preview requiring the which command will not be used on Windows

11 years agoMerge branch 'master' into coverage-on-windows-master
Thomas Müller [Mon, 14 Oct 2013 22:09:00 +0000 (00:09 +0200)]
Merge branch 'master' into coverage-on-windows-master

11 years agoMerge pull request #5340 from owncloud/fixing-5251-master
icewind1991 [Mon, 14 Oct 2013 21:29:36 +0000 (14:29 -0700)]
Merge pull request #5340 from owncloud/fixing-5251-master

streamCopy() should return proper structure.

11 years agostreamCopy() should return proper structure.
Thomas Müller [Mon, 14 Oct 2013 19:33:23 +0000 (21:33 +0200)]
streamCopy() should return proper structure.

Callers of streamCopy() expect an array to be returned containing count and result.

11 years agoMerge pull request #5330 from owncloud/files-removedfileactionsbkg
Vincent Petry [Mon, 14 Oct 2013 16:23:06 +0000 (09:23 -0700)]
Merge pull request #5330 from owncloud/files-removedfileactionsbkg

Removed extra bkg color on file actions when row is selected/hovered on

11 years agoRemoved extra bkg color on file actions when row is selected/hovered on
Vincent Petry [Mon, 14 Oct 2013 15:05:24 +0000 (17:05 +0200)]
Removed extra bkg color on file actions when row is selected/hovered on

11 years agoMerge pull request #4867 from owncloud/fixing-4546-master
Thomas Müller [Mon, 14 Oct 2013 13:39:32 +0000 (06:39 -0700)]
Merge pull request #4867 from owncloud/fixing-4546-master

Adding detection of aborted uploads for chunked uploads

11 years agoMerge pull request #5323 from owncloud/files-external-missinggridstyle
Frank Karlitschek [Mon, 14 Oct 2013 13:31:35 +0000 (06:31 -0700)]
Merge pull request #5323 from owncloud/files-external-missinggridstyle

Added missing "grid" class on external storage's table

11 years agoAdded missing "grid" class on external storage's table
Vincent Petry [Mon, 14 Oct 2013 10:12:26 +0000 (12:12 +0200)]
Added missing "grid" class on external storage's table

11 years agoMerge pull request #5297 from owncloud/quota-style
Jan-Christoph Borchardt [Mon, 14 Oct 2013 10:59:51 +0000 (03:59 -0700)]
Merge pull request #5297 from owncloud/quota-style

Fixes Default Quota Style in User Management.

11 years agoMerge pull request #5320 from owncloud/fix_app_sorting
Vincent Petry [Mon, 14 Oct 2013 09:29:27 +0000 (02:29 -0700)]
Merge pull request #5320 from owncloud/fix_app_sorting

Fix app sorting

11 years agocase insensitive sort
Frank Karlitschek [Mon, 14 Oct 2013 09:15:04 +0000 (11:15 +0200)]
case insensitive sort

11 years agofix style
Frank Karlitschek [Mon, 14 Oct 2013 08:57:00 +0000 (10:57 +0200)]
fix style

11 years agoMerge branch 'master' into fixing-4546-master
Thomas Müller [Mon, 14 Oct 2013 08:56:50 +0000 (10:56 +0200)]
Merge branch 'master' into fixing-4546-master

Conflicts:
lib/private/connector/sabre/file.php

11 years agofinally fix the app sorting
Frank Karlitschek [Mon, 14 Oct 2013 08:54:38 +0000 (10:54 +0200)]
finally fix the app sorting

11 years agoFixes Default Quota Style in User Management.
raghunayyar [Fri, 11 Oct 2013 13:41:01 +0000 (19:11 +0530)]
Fixes Default Quota Style in User Management.

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 14 Oct 2013 00:33:30 +0000 (20:33 -0400)]
[tx-robot] updated from transifex

11 years agoMerge pull request #5318 from owncloud/show_channel
Raghu Nayyar [Sun, 13 Oct 2013 20:16:24 +0000 (13:16 -0700)]
Merge pull request #5318 from owncloud/show_channel

show the channel. Also mark git as git channel so that someone can see

11 years agoMerge pull request #5253 from owncloud/externalstorage-adminstatusindicator
Morris Jobke [Sun, 13 Oct 2013 20:03:02 +0000 (13:03 -0700)]
Merge pull request #5253 from owncloud/externalstorage-adminstatusindicator

Fixed external storage status indicator in admin page

11 years agoshow the channel. Also mark git as git channel so that someone can see where this...
Frank Karlitschek [Sun, 13 Oct 2013 19:51:47 +0000 (21:51 +0200)]
show the channel. Also mark git as git channel so that someone can see where this build comes from

11 years agoMerge pull request #5299 from owncloud/settings-ie8-tablegridstyles
Thomas Müller [Sat, 12 Oct 2013 10:51:01 +0000 (03:51 -0700)]
Merge pull request #5299 from owncloud/settings-ie8-tablegridstyles

Fixed table grid styles for IE8

11 years agoMerge pull request #5303 from owncloud/fix-unlogged-session-error
Thomas Müller [Sat, 12 Oct 2013 10:35:33 +0000 (03:35 -0700)]
Merge pull request #5303 from owncloud/fix-unlogged-session-error

Log an error when session initialization fails before ownCloud is intalled

11 years agoMerge pull request #5290 from owncloud/fixing-5191-master
Morris Jobke [Sat, 12 Oct 2013 10:28:44 +0000 (03:28 -0700)]
Merge pull request #5290 from owncloud/fixing-5191-master

Installation. Show advanced section on error. Fixes #5191

11 years agoMerge pull request #5272 from mrflix/master
Thomas Müller [Sat, 12 Oct 2013 08:41:30 +0000 (01:41 -0700)]
Merge pull request #5272 from mrflix/master

fix label to checkbox binding in admin -> force-https

11 years agoMerge pull request #5287 from owncloud/core-layoutviewportdirective
Thomas Müller [Sat, 12 Oct 2013 08:36:20 +0000 (01:36 -0700)]
Merge pull request #5287 from owncloud/core-layoutviewportdirective

Fixed viewport layout using commas instead of semicolons

11 years agoMerge pull request #5301 from owncloud/versioning_preview_shared
Thomas Müller [Sat, 12 Oct 2013 08:32:25 +0000 (01:32 -0700)]
Merge pull request #5301 from owncloud/versioning_preview_shared

versioning preview also for shared files

11 years agoMerge branch 'master' of github.com:owncloud/core into fix-unlogged-session-error
Tom Needham [Sat, 12 Oct 2013 08:15:59 +0000 (09:15 +0100)]
Merge branch 'master' of github.com:owncloud/core into fix-unlogged-session-error

11 years agoInclude exception message in log entry when session fails to start
Tom Needham [Sat, 12 Oct 2013 08:15:08 +0000 (09:15 +0100)]
Include exception message in log entry when session fails to start

11 years agoMerge pull request #5304 from owncloud/files-deleteiconpositionfix
Morris Jobke [Fri, 11 Oct 2013 19:39:33 +0000 (12:39 -0700)]
Merge pull request #5304 from owncloud/files-deleteiconpositionfix

Fixed position of "delete" icon in files app

11 years agoMerge pull request #5296 from owncloud/remove-chosen-hack
Morris Jobke [Fri, 11 Oct 2013 19:30:59 +0000 (12:30 -0700)]
Merge pull request #5296 from owncloud/remove-chosen-hack

Removes the Bogus Label

11 years agoMerge pull request #5207 from owncloud/fixing-4011-part2-master
Thomas Müller [Fri, 11 Oct 2013 17:35:17 +0000 (10:35 -0700)]
Merge pull request #5207 from owncloud/fixing-4011-part2-master

[OC6] file upload exception handling

11 years agoHandle ownCloud logging when data dir not created
Tom Needham [Fri, 11 Oct 2013 16:16:37 +0000 (17:16 +0100)]
Handle ownCloud logging when data dir not created

11 years agoFixed position of "delete" icon in files app
Vincent Petry [Fri, 11 Oct 2013 16:01:15 +0000 (18:01 +0200)]
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

11 years agoLog the session exception when ownCloud is not installed
Tom Needham [Fri, 11 Oct 2013 15:45:58 +0000 (16:45 +0100)]
Log the session exception when ownCloud is not installed

11 years agoMerge pull request #5302 from owncloud/files-missingfileactionsafteradd
Vincent Petry [Fri, 11 Oct 2013 15:45:42 +0000 (08:45 -0700)]
Merge pull request #5302 from owncloud/files-missingfileactionsafteradd

File actions are now updated after create/upload file

11 years agoMerge pull request #5274 from owncloud/files-ie8-deletecheckbox
Vincent Petry [Fri, 11 Oct 2013 15:24:57 +0000 (08:24 -0700)]
Merge pull request #5274 from owncloud/files-ie8-deletecheckbox

Fixed delete icon alignment in IE8

11 years agoFile actions are now updated after create/upload file
Vincent Petry [Fri, 11 Oct 2013 15:06:01 +0000 (17:06 +0200)]
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

11 years agoremove debug output
Bjoern Schiessle [Fri, 11 Oct 2013 15:06:43 +0000 (17:06 +0200)]
remove debug output

11 years agoMerge branch 'master' into versioning_preview_shared
Bjoern Schiessle [Fri, 11 Oct 2013 15:00:21 +0000 (17:00 +0200)]
Merge branch 'master' into versioning_preview_shared

11 years agoMerge pull request #5261 from owncloud/versioning_no_glob
Björn Schießle [Fri, 11 Oct 2013 14:57:14 +0000 (07:57 -0700)]
Merge pull request #5261 from owncloud/versioning_no_glob

versioning: don't use glob() and getLocalFile()

11 years agoMerge pull request #5298 from owncloud/enc_fix_setting_dialog_headlines
Björn Schießle [Fri, 11 Oct 2013 14:15:58 +0000 (07:15 -0700)]
Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlines

fix setting dialog headlines for the encryption app

11 years agoFixed table grid styles for IE8
Vincent Petry [Fri, 11 Oct 2013 13:58:15 +0000 (15:58 +0200)]
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

11 years agofix setting dialog headlines for the encryption app
Bjoern Schiessle [Fri, 11 Oct 2013 13:56:08 +0000 (15:56 +0200)]
fix setting dialog headlines for the encryption app

11 years agoMerge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missing
Björn Schießle [Fri, 11 Oct 2013 13:37:53 +0000 (06:37 -0700)]
Merge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missing

encryption: block file access if share keys are missing

11 years agoImprove expand/collapse logic
Victor Dubiniuk [Fri, 11 Oct 2013 13:35:59 +0000 (16:35 +0300)]
Improve expand/collapse logic

11 years agofix another typo
Bjoern Schiessle [Fri, 11 Oct 2013 13:26:30 +0000 (15:26 +0200)]
fix another typo

11 years agochange error code to 403
Bjoern Schiessle [Fri, 11 Oct 2013 13:24:49 +0000 (15:24 +0200)]
change error code to 403

11 years agofix typo in error message and change error code to 403
Bjoern Schiessle [Fri, 11 Oct 2013 13:23:12 +0000 (15:23 +0200)]
fix typo in error message and change error code to 403

11 years agoIncludes <optgroup> tag
raghunayyar [Fri, 11 Oct 2013 13:22:27 +0000 (18:52 +0530)]
Includes <optgroup> tag

11 years agoPuts the language divider in place. thanks @Kondou-ger ;)
raghunayyar [Fri, 11 Oct 2013 13:16:59 +0000 (18:46 +0530)]
Puts the language divider in place. thanks @Kondou-ger ;)

11 years agoRemoves the Bogus Label
raghunayyar [Fri, 11 Oct 2013 13:12:02 +0000 (18:42 +0530)]
Removes the Bogus Label

11 years agoMerge pull request #5294 from owncloud/personal-multiselect
Raghu Nayyar [Fri, 11 Oct 2013 13:07:43 +0000 (06:07 -0700)]
Merge pull request #5294 from owncloud/personal-multiselect

Uniform Styles and Indentation Fixes for Personal Settings

11 years agoMerge pull request #5293 from owncloud/files-ie8-datemisaligned
Morris Jobke [Fri, 11 Oct 2013 12:38:08 +0000 (05:38 -0700)]
Merge pull request #5293 from owncloud/files-ie8-datemisaligned

Fixed IE8 misaligned date

11 years agoUniform Styles and Indentation Fixes for Personal Block
raghunayyar [Fri, 11 Oct 2013 12:33:53 +0000 (18:03 +0530)]
Uniform Styles and Indentation Fixes for Personal Block

11 years agoFixed IE8 misaligned date
Vincent Petry [Fri, 11 Oct 2013 12:23:37 +0000 (14:23 +0200)]
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

11 years agoblock file access if share keys are missing
Bjoern Schiessle [Fri, 11 Oct 2013 12:20:46 +0000 (14:20 +0200)]
block file access if share keys are missing

11 years agoMoved IE8 inline styles in files.css
Vincent Petry [Fri, 11 Oct 2013 12:10:00 +0000 (14:10 +0200)]
Moved IE8 inline styles in files.css

11 years agoShow advanced section on error. Fixes #5191
Victor Dubiniuk [Fri, 11 Oct 2013 11:47:28 +0000 (14:47 +0300)]
Show advanced section on error. Fixes #5191

11 years agoMerge pull request #5281 from owncloud/settings-ie8-changedisplaynamefix
Morris Jobke [Fri, 11 Oct 2013 11:46:26 +0000 (04:46 -0700)]
Merge pull request #5281 from owncloud/settings-ie8-changedisplaynamefix

Fixed display name change for IE8

11 years agoMerge pull request #5133 from owncloud/js_vcategories_to_tags
Thomas Tanghus [Fri, 11 Oct 2013 11:17:59 +0000 (04:17 -0700)]
Merge pull request #5133 from owncloud/js_vcategories_to_tags

Js vcategories to tags

11 years agoFixed viewport layout using commas instead of semicolons
Vincent Petry [Fri, 11 Oct 2013 10:51:40 +0000 (12:51 +0200)]
Fixed viewport layout using commas instead of semicolons

Fixes #5285

11 years agoNow using smaller spinner image for status indicator
Vincent Petry [Fri, 11 Oct 2013 10:36:30 +0000 (12:36 +0200)]
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.

11 years agoFixed display name change for IE8
Vincent Petry [Fri, 11 Oct 2013 08:48:30 +0000 (10:48 +0200)]
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.

11 years agoMerge pull request #5233 from owncloud/enc_filter_users
Björn Schießle [Fri, 11 Oct 2013 08:48:02 +0000 (01:48 -0700)]
Merge pull request #5233 from owncloud/enc_filter_users

only encrypt file to users with encryption keys

11 years agosome small fixes
Bjoern Schiessle [Fri, 11 Oct 2013 08:34:34 +0000 (10:34 +0200)]
some small fixes

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 11 Oct 2013 02:30:58 +0000 (22:30 -0400)]
[tx-robot] updated from transifex

11 years agoFixed delete icon alignment in IE8
Vincent Petry [Thu, 10 Oct 2013 22:15:32 +0000 (00:15 +0200)]
Fixed delete icon alignment in IE8

Removed old inline CSS that forced every td to have position:static in
the files app. (#5056)

11 years agofix checkbox <-> label binding
Felix Niklas [Thu, 10 Oct 2013 21:10:06 +0000 (23:10 +0200)]
fix checkbox <-> label binding

clicking the label will trigger the checkbox

11 years agomake files versions root a class constant
Bjoern Schiessle [Thu, 10 Oct 2013 18:09:38 +0000 (20:09 +0200)]
make files versions root a class constant

11 years agosome small changes/fixes
Bjoern Schiessle [Thu, 10 Oct 2013 18:06:42 +0000 (20:06 +0200)]
some small changes/fixes

11 years agoMerge pull request #5263 from owncloud/fixing-5255-master
VicDeo [Thu, 10 Oct 2013 16:27:45 +0000 (09:27 -0700)]
Merge pull request #5263 from owncloud/fixing-5255-master

Proper behavior of resolvePath()

11 years agomake previews work for shared files in the versions drop-down
Bjoern Schiessle [Thu, 10 Oct 2013 15:23:27 +0000 (17:23 +0200)]
make previews work for shared files in the versions drop-down

11 years agofix getVersions() for sub directories
Bjoern Schiessle [Thu, 10 Oct 2013 14:58:11 +0000 (16:58 +0200)]
fix getVersions() for sub directories

11 years agoMerge pull request #4780 from AxelRb/master
Morris Jobke [Thu, 10 Oct 2013 14:21:36 +0000 (07:21 -0700)]
Merge pull request #4780 from AxelRb/master

On an auth failure the uid and the IP address should be logged to the st...

11 years agothe path need to be normalized before putting it into resolvePath()
Thomas Müller [Thu, 10 Oct 2013 14:06:26 +0000 (16:06 +0200)]
the path need to be normalized before putting it into resolvePath()
otherwise the returned internalPath will not match followup calls to e.g. Cache::getID()

11 years agoMerge pull request #5247 from owncloud/hooks-view-same-start
icewind1991 [Thu, 10 Oct 2013 13:27:07 +0000 (06:27 -0700)]
Merge pull request #5247 from owncloud/hooks-view-same-start

ensure the view's root is a subfolder of the the default root, not only ...

11 years agodon't cache if the encryption is enabled, this can lead to problems during unit testing
Bjoern Schiessle [Thu, 10 Oct 2013 13:02:52 +0000 (15:02 +0200)]
don't cache if the encryption is enabled, this can lead to problems during unit testing

11 years agoadd missing preview link
Bjoern Schiessle [Thu, 10 Oct 2013 12:57:25 +0000 (14:57 +0200)]
add missing preview link

11 years agodon't use glob() and getLocalFile(), this can lead to problems on windows servers
Bjoern Schiessle [Thu, 10 Oct 2013 12:43:40 +0000 (14:43 +0200)]
don't use glob() and getLocalFile(), this can lead to problems on windows servers

11 years agochanged the argument to false for getValue , reformated else statement
Axel Roenn [Thu, 10 Oct 2013 12:15:13 +0000 (14:15 +0200)]
changed the argument to false for getValue , reformated else statement

11 years agoMerge pull request #5257 from owncloud/files-ie8-regularfileactionsbroken
Morris Jobke [Thu, 10 Oct 2013 12:14:09 +0000 (05:14 -0700)]
Merge pull request #5257 from owncloud/files-ie8-regularfileactionsbroken

Fixed files view regular file actions in IE8

11 years agoMerge pull request #5182 from owncloud/fix-sharring-with-password-screen
Morris Jobke [Thu, 10 Oct 2013 11:49:47 +0000 (04:49 -0700)]
Merge pull request #5182 from owncloud/fix-sharring-with-password-screen

Fix password screen for public shares

11 years agoMerge pull request #5244 from owncloud/more-css-fixes
Morris Jobke [Thu, 10 Oct 2013 11:48:11 +0000 (04:48 -0700)]
Merge pull request #5244 from owncloud/more-css-fixes

More css fixes

11 years agoMerge pull request #5114 from owncloud/ldap_uuid_attr_groups
blizzz [Thu, 10 Oct 2013 10:27:28 +0000 (03:27 -0700)]
Merge pull request #5114 from owncloud/ldap_uuid_attr_groups

LDAP: allow different UUID attributes for groups and users

11 years agoFixed files view regular file actions in IE8
Vincent Petry [Thu, 10 Oct 2013 10:21:02 +0000 (12:21 +0200)]
Fixed files view regular file actions in IE8

Fixes #5256

A missing closing span broken the container in IE8 which prevented the
file actions to be appended properly.

11 years agomerge master into hooks-view-same-start
Robin Appelman [Thu, 10 Oct 2013 09:34:30 +0000 (11:34 +0200)]
merge master into hooks-view-same-start

11 years agoFixed external storage status indicator in admin page
Vincent Petry [Thu, 10 Oct 2013 09:10:32 +0000 (11:10 +0200)]
Fixed external storage status indicator in admin page

- Fixes #5241
- Fixed indicator to appear, its selector was wrong
- Added spinner while saving an entry's settings
- Removed ajax "async: false" that blocked the browser while saving

11 years agoMerge pull request #5221 from owncloud/fixing-5217-master
VicDeo [Thu, 10 Oct 2013 08:55:18 +0000 (01:55 -0700)]
Merge pull request #5221 from owncloud/fixing-5217-master

fixing php 5.3 compatibility

11 years agoMerge pull request #5210 from owncloud/sharing_search_users_fix
Björn Schießle [Thu, 10 Oct 2013 08:50:51 +0000 (01:50 -0700)]
Merge pull request #5210 from owncloud/sharing_search_users_fix

find users which are in the same group

11 years agoMerge pull request #5232 from owncloud/fixing-webdav-touch-master
Frank Karlitschek [Thu, 10 Oct 2013 08:49:59 +0000 (01:49 -0700)]
Merge pull request #5232 from owncloud/fixing-webdav-touch-master

due to internal implementations touch will always be successful - $mtime...

11 years agomake sure that we are logged in ad user1 while performing the tests
Bjoern Schiessle [Thu, 10 Oct 2013 08:47:35 +0000 (10:47 +0200)]
make sure that we are logged in ad user1 while performing the tests

11 years agoMerge pull request #5245 from owncloud/file_put_contents-no-create
Frank Karlitschek [Thu, 10 Oct 2013 08:20:07 +0000 (01:20 -0700)]
Merge pull request #5245 from owncloud/file_put_contents-no-create

don't trigger the create hooks when if the file already exists for file_put_contents

11 years agoensure the view's root is a subfolder of the the default root, not only starting...
Robin Appelman [Wed, 9 Oct 2013 18:46:43 +0000 (20:46 +0200)]
ensure the view's root is a subfolder of the the default root, not only starting the same

11 years agodon't trigger the create hooks when if the file already exists for file_put_contents
Robin Appelman [Wed, 9 Oct 2013 18:34:18 +0000 (20:34 +0200)]
don't trigger the create hooks when if the file already exists for file_put_contents

11 years agoMerge pull request #5134 from owncloud/trashbin-homeiconbroken
Vincent Petry [Wed, 9 Oct 2013 16:01:43 +0000 (09:01 -0700)]
Merge pull request #5134 from owncloud/trashbin-homeiconbroken

Do not call changeDirectory() when no dir set on breadcrumb

11 years agodisable echo off
Thomas Müller [Wed, 9 Oct 2013 15:48:46 +0000 (17:48 +0200)]
disable echo off

11 years agoMerge pull request #5230 from owncloud/trashbin_fixes
Björn Schießle [Wed, 9 Oct 2013 15:27:54 +0000 (08:27 -0700)]
Merge pull request #5230 from owncloud/trashbin_fixes

Trashbin fixes

11 years agomake sure that we only find file/folder shares
Bjoern Schiessle [Wed, 9 Oct 2013 15:25:58 +0000 (17:25 +0200)]
make sure that we only find file/folder shares

11 years agoAdded the config option to log ip addresses , default false
Axel Roenn [Wed, 9 Oct 2013 15:21:35 +0000 (17:21 +0200)]
Added the config option to log ip addresses , default false

11 years agoadding missing call to make it work properly
Thomas Müller [Wed, 9 Oct 2013 15:10:40 +0000 (17:10 +0200)]
adding missing call to make it work properly