]>
source.dussan.org Git - nextcloud-server.git/log
Morris Jobke [Sat, 1 Feb 2014 14:02:36 +0000 (15:02 +0100)]
Use === instead of ==, add missing whitespace and CSS class
Bart Visscher [Fri, 31 Jan 2014 16:33:15 +0000 (17:33 +0100)]
Remove unused functions from OC_Helper
init_var and init_radio where only used in the installation template
Bart Visscher [Fri, 31 Jan 2014 16:31:19 +0000 (17:31 +0100)]
DRY for database type radiolist
Bart Visscher [Fri, 31 Jan 2014 15:57:49 +0000 (16:57 +0100)]
Do setup default value handling in the controller not the template
Bart Visscher [Fri, 31 Jan 2014 15:43:12 +0000 (16:43 +0100)]
Merge branch 'master' into setup
Conflicts:
core/setup.php
Jan-Christoph Borchardt [Wed, 29 Jan 2014 17:17:02 +0000 (09:17 -0800)]
Merge pull request #6777 from owncloud/mobile-style
Mobile style for public links: files, folders, picture sets
Jan-Christoph Borchardt [Wed, 29 Jan 2014 16:20:55 +0000 (17:20 +0100)]
make header scroll up for single shares, more view of content on small screens
Thomas Müller [Wed, 29 Jan 2014 15:52:30 +0000 (16:52 +0100)]
- adding class to header div: share-folder or share-file
- for supported previews are shown with a size of 500px; icons with a size of 128px
Morris Jobke [Wed, 29 Jan 2014 15:48:50 +0000 (07:48 -0800)]
Merge pull request #6900 from owncloud/files-errormessagewhentargetfoldermissing
Added error message for when target folder was removed
Jan-Christoph Borchardt [Wed, 29 Jan 2014 15:31:25 +0000 (07:31 -0800)]
Merge pull request #6903 from owncloud/fix-ms-office-icons
Add/fix Microsoft Office file icons.
Morris Jobke [Wed, 29 Jan 2014 14:32:34 +0000 (06:32 -0800)]
Merge pull request #6995 from jbtbnl/master
Add white color variant of checkmark icon
Jan-Christoph Borchardt [Wed, 29 Jan 2014 14:28:57 +0000 (15:28 +0100)]
adjust file type icon placement for when no preview can be generated
jbtbnl [Wed, 29 Jan 2014 12:47:37 +0000 (13:47 +0100)]
Add white color variant of checkmark icon
Vincent Petry [Wed, 22 Jan 2014 16:17:58 +0000 (17:17 +0100)]
Added error message for when target folder was removed
Whent trying to upload/rename/create files in a folder that was removed
or rename, the correct error message is now shown.
In the case of upload of multiple files, the upload is cancelled.
This situation can happen if the target folder was renamed or removed
from another browser window or client.
Björn Schießle [Wed, 29 Jan 2014 10:50:25 +0000 (02:50 -0800)]
Merge pull request #6987 from owncloud/share_api_and_encryption
[ocs share api] public upload is also possible with encryption enabled, since OC6
Jan-Christoph Borchardt [Wed, 29 Jan 2014 10:43:34 +0000 (11:43 +0100)]
permanently show download action on mobile, only icon
Vincent Petry [Wed, 29 Jan 2014 10:21:30 +0000 (02:21 -0800)]
Merge pull request #6990 from owncloud/files-fixrenamewarnings
Fix warnings in logs when renaming over the web UI
Jan-Christoph Borchardt [Wed, 29 Jan 2014 10:06:19 +0000 (11:06 +0100)]
fix horizontal scrollbar appearing when footer is too long, footer wraps now
Jan-Christoph Borchardt [Wed, 29 Jan 2014 09:55:44 +0000 (10:55 +0100)]
merge master into mobile-style
Vincent Petry [Wed, 29 Jan 2014 09:43:13 +0000 (10:43 +0100)]
Fix warnings in logs when renaming over the web UI
The determineIcon() method was expecting attributes to be set which
caused warnings about undefined indices in the error log.
This fix pre-initializes the array with 'directory' and
'isPreviewAvailable' to make them disappear.
Morris Jobke [Wed, 29 Jan 2014 08:39:14 +0000 (00:39 -0800)]
Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink
Sharing fixfiledownloadlink
Bjoern Schiessle [Tue, 28 Jan 2014 16:28:20 +0000 (17:28 +0100)]
public upload is also possible with encryption enabled, since OC6
Thomas Müller [Tue, 28 Jan 2014 15:28:07 +0000 (07:28 -0800)]
Merge pull request #6979 from owncloud/share_api_error_codes
[ocs share api] use error code 403 if sharing is not permitted
Bjoern Schiessle [Tue, 28 Jan 2014 10:25:12 +0000 (11:25 +0100)]
use more accurate error codes
VicDeo [Mon, 27 Jan 2014 18:27:51 +0000 (10:27 -0800)]
Merge pull request #6965 from owncloud/unused-free-space
Remove unused $freeSpace
Robin Appelman [Mon, 27 Jan 2014 15:51:32 +0000 (16:51 +0100)]
Remove unused $freeSpace
Thomas Müller [Mon, 27 Jan 2014 15:48:40 +0000 (07:48 -0800)]
Merge pull request #6907 from owncloud/webdav-logexceptions
Added exception logger plugin for sabre connector
Morris Jobke [Mon, 27 Jan 2014 12:54:30 +0000 (04:54 -0800)]
Merge pull request #6958 from owncloud/localised_date
use localised date in notification mails
Morris Jobke [Mon, 27 Jan 2014 12:30:06 +0000 (04:30 -0800)]
Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decrypt
remove the form, it isn't needed here
Morris Jobke [Mon, 27 Jan 2014 12:27:35 +0000 (04:27 -0800)]
Merge pull request #6930 from jcfischer/master
Add 'mail_from_address' configuration
Morris Jobke [Mon, 27 Jan 2014 12:25:31 +0000 (04:25 -0800)]
Merge pull request #6933 from seberm/master
Add check for apc.enabled option
Morris Jobke [Mon, 27 Jan 2014 12:11:15 +0000 (04:11 -0800)]
Merge pull request #6912 from owncloud/replace-webroot-in-css
Remove %webroot% from CSS
Bjoern Schiessle [Mon, 27 Jan 2014 11:47:54 +0000 (12:47 +0100)]
use localised date in notification mails
Vincent Petry [Thu, 23 Jan 2014 11:11:53 +0000 (12:11 +0100)]
Added exception logger plugin for sabre connector
Whenever an exception occurs in the sabre connector code or code called
by it, it will be logged.
This plugin approach is needed because Sabre already catches exceptions
to return them to the client in the XML response, so they don't appear
logged in the web server log.
This will make it much easier to debug syncing issues.
Jan-Christoph Borchardt [Mon, 27 Jan 2014 10:29:47 +0000 (02:29 -0800)]
Merge pull request #5153 from owncloud/core-em-to-px
Cleans up Core apps for relative(em) to absolute(px) styles.
Jan-Christoph Borchardt [Mon, 27 Jan 2014 10:28:01 +0000 (02:28 -0800)]
Merge pull request #5152 from owncloud/files-em-to-px
Converts em to px values for styles in Files.
Björn Schießle [Mon, 27 Jan 2014 09:37:52 +0000 (01:37 -0800)]
Merge pull request #6916 from owncloud/encryption_update_filecache
[encryption] update file cache after the file was written
raghunayyar [Sat, 25 Jan 2014 21:32:52 +0000 (03:02 +0530)]
Fixes settings.css and converts more styles.
raghunayyar [Sat, 25 Jan 2014 21:29:28 +0000 (02:59 +0530)]
Fixes width of the dropdown menus as per computed styles.
Jan-Christoph Borchardt [Sat, 25 Jan 2014 15:54:55 +0000 (07:54 -0800)]
Merge pull request #6939 from owncloud/disable-password-autocomplete
prevent autofill for password change settings, prevent leak of existing password
Jan-Christoph Borchardt [Fri, 24 Jan 2014 17:58:56 +0000 (18:58 +0100)]
prevent autofill for password change settings, prevent leak of existing password, fix #6552
Jan-Christoph Borchardt [Fri, 24 Jan 2014 17:20:52 +0000 (18:20 +0100)]
fix multiselect bar being too short on big displays
Vincent Petry [Fri, 24 Jan 2014 15:44:33 +0000 (07:44 -0800)]
Merge pull request #6905 from owncloud/add_expiredate_to_linkshare
add expire date to link share if possible
Jens-Christian Fischer [Fri, 24 Jan 2014 15:24:52 +0000 (16:24 +0100)]
updated config.sample.php with mail_from_address parameter
Morris Jobke [Fri, 24 Jan 2014 15:05:50 +0000 (07:05 -0800)]
Merge pull request #6923 from owncloud/files-maxuploadfieldstylefix
Fixed max upload size input field style
Björn Schießle [Fri, 24 Jan 2014 15:05:18 +0000 (07:05 -0800)]
Merge pull request #6921 from owncloud/trash_mimetype_size
increase size of mimetype column
Bjoern Schiessle [Thu, 23 Jan 2014 14:45:34 +0000 (15:45 +0100)]
only update file cache with the unenecrypted size when the file was written
Morris Jobke [Fri, 24 Jan 2014 14:53:53 +0000 (06:53 -0800)]
Merge pull request #6184 from owncloud/6051-ux-files-Move-File-Spinner
#6051 [ux][files] Move File Spinner
Otto Sabart [Fri, 24 Jan 2014 14:52:28 +0000 (15:52 +0100)]
Add check for apc.enabled option
Sometimes it's not possible to disable APC entirely and some of
apc_functions are disabled. Only thing which is possible is
to disable apc.enable option.
Vincent Petry [Fri, 24 Jan 2014 14:20:23 +0000 (06:20 -0800)]
Merge pull request #5954 from owncloud/extstorage-stream-sftp
[Ext storage] Now using SFTP stream wrapper from phpseclib
Jens-Christian Fischer [Fri, 24 Jan 2014 13:22:42 +0000 (14:22 +0100)]
added function documentation
Jens-Christian Fischer [Fri, 24 Jan 2014 13:04:37 +0000 (14:04 +0100)]
Add 'mail_from_address' configuration
In environments where there are rules for the email addresses, the "from
address" that owncloud uses has to be configurable.
This patch adds a new configuration variable 'mail_from_address'.
If it is configured, owncloud will use this as the sender of *all*
emails. (OwnCloud uses 'sharing-noreply' and 'password-noreply' by
default). By using the 'mail_from_address' configuration, only this
email address will be used.
Vincent Petry [Fri, 24 Jan 2014 12:32:31 +0000 (13:32 +0100)]
Fixed download URL in public page
- Refactored download URL building to make it overridable
- Added download URL override in public page
- Added JS unit tests for download URL
- Added OC.redirect() method to facilitate unit testing
Vincent Petry [Fri, 24 Jan 2014 12:19:44 +0000 (13:19 +0100)]
Fixed filelist unit tests hidden params
Also added dummy table
Vincent Petry [Fri, 24 Jan 2014 11:44:31 +0000 (12:44 +0100)]
Added OC.buidQueryString() utility function
Makes it possible to create query strings by passing a JavaScript hash
map and automatically encodes the keys and values.
Bjoern Schiessle [Fri, 24 Jan 2014 11:05:14 +0000 (12:05 +0100)]
disable button and input field during decryption
Bjoern Schiessle [Fri, 24 Jan 2014 10:35:52 +0000 (11:35 +0100)]
remove the form, it isn't needed here
Bjoern Schiessle [Thu, 23 Jan 2014 10:18:23 +0000 (11:18 +0100)]
add expire date to link share if possible
Thomas Müller [Thu, 23 Jan 2014 20:43:05 +0000 (12:43 -0800)]
Merge pull request #6736 from owncloud/tests-jsunittests
Added Javascript unit tests
Thomas Müller [Thu, 23 Jan 2014 20:28:19 +0000 (21:28 +0100)]
remove css files from rewrite rule - there is no need to rewrite css any more
Vincent Petry [Thu, 23 Jan 2014 19:50:09 +0000 (20:50 +0100)]
Fixed max upload size input field style
Added "type=text" makes it look like nice like all other fields
Thomas Müller [Thu, 23 Jan 2014 19:15:10 +0000 (20:15 +0100)]
Instead of 'No preview available for ...' we simple display the mieme-type icon
Bjoern Schiessle [Thu, 23 Jan 2014 17:28:59 +0000 (18:28 +0100)]
increase size of mimetype column
Jan-Christoph Borchardt [Thu, 23 Jan 2014 16:03:22 +0000 (08:03 -0800)]
Merge pull request #6234 from owncloud/change-email-by-enter
change mail address by pressing enter - fixes #6179
Jan-Christoph Borchardt [Thu, 23 Jan 2014 14:35:30 +0000 (15:35 +0100)]
remove background and width from multiselect bar, fix Download button not showing on mobile
Vincent Petry [Thu, 23 Jan 2014 14:05:05 +0000 (15:05 +0100)]
Removed unused writeBack method
Jan-Christoph Borchardt [Thu, 23 Jan 2014 13:04:13 +0000 (14:04 +0100)]
remove %webroot from files_sharing app
Morris Jobke [Thu, 23 Jan 2014 12:51:51 +0000 (13:51 +0100)]
fix conflicts and add missing closing tag
Jan-Christoph Borchardt [Thu, 23 Jan 2014 12:11:08 +0000 (13:11 +0100)]
remove %webroot% from files app
Jan-Christoph Borchardt [Tue, 21 Jan 2014 16:39:38 +0000 (17:39 +0100)]
add icons.css file, first step to get rid of %webroot%
Vincent Petry [Tue, 19 Nov 2013 22:16:20 +0000 (23:16 +0100)]
Now using SFTP stream wrapper from phpseclib
- Upgraded phpseclib to master version (post 0.3.5)
- Now using fopen() on sftp URL for both read and write
- Fixes #4063
Björn Schießle [Thu, 23 Jan 2014 09:09:34 +0000 (01:09 -0800)]
Merge pull request #6898 from owncloud/encryption_infinite_loop
[encryption] infinite loop on sharing
Andreas Fischer [Thu, 23 Jan 2014 02:06:14 +0000 (03:06 +0100)]
Add icons for mdb and accdb files.
Andreas Fischer [Thu, 23 Jan 2014 01:46:05 +0000 (02:46 +0100)]
Fix icons for xml,ppt,dot,dotx files.
Andreas Fischer [Thu, 23 Jan 2014 01:22:46 +0000 (02:22 +0100)]
Remove duplicate mimetypes while keeping previous behaviour.
Andreas Fischer [Thu, 23 Jan 2014 01:15:42 +0000 (02:15 +0100)]
Bring mimetype list into alphabetical order.
Thomas Müller [Thu, 23 Jan 2014 00:08:42 +0000 (01:08 +0100)]
focus link text only on click in the input field - closes #6817
Thomas Müller [Wed, 22 Jan 2014 23:39:11 +0000 (00:39 +0100)]
Merge branch 'master' into mobile-style
Conflicts:
apps/files/js/files.js
apps/files_sharing/css/public.css
apps/files_sharing/js/public.js
apps/files_sharing/templates/public.php
Bjoern Schiessle [Wed, 22 Jan 2014 15:55:04 +0000 (16:55 +0100)]
fix infinite loop if folder and subfolder has the same name
Bjoern Schiessle [Wed, 22 Jan 2014 15:54:17 +0000 (16:54 +0100)]
add path relative to the files folder of the currently logged in user to the output of getFolderContent()
Björn Schießle [Wed, 22 Jan 2014 10:52:30 +0000 (02:52 -0800)]
Merge pull request #6890 from owncloud/version_fix_array_order
[files_versions] fix array order
Morris Jobke [Wed, 22 Jan 2014 10:28:28 +0000 (02:28 -0800)]
Merge pull request #6719 from tripflex/fix_pubup_progbar
Fix public upload progress bar
Bjoern Schiessle [Wed, 22 Jan 2014 10:13:15 +0000 (11:13 +0100)]
fix array order
Bjoern Schiessle [Wed, 22 Jan 2014 10:10:32 +0000 (11:10 +0100)]
code clean-up
Bjoern Schiessle [Wed, 22 Jan 2014 10:10:23 +0000 (11:10 +0100)]
fix size calculation of getAllVersions()
Vincent Petry [Tue, 21 Jan 2014 19:08:58 +0000 (11:08 -0800)]
Merge pull request #6856 from owncloud/fixing-gallery-password-protected-access-master
adding password protection check to getShareByToken()
Thomas Müller [Tue, 21 Jan 2014 18:36:20 +0000 (19:36 +0100)]
Merge branch 'master' into fixing-gallery-password-protected-access-master
Thomas Müller [Tue, 21 Jan 2014 16:39:50 +0000 (08:39 -0800)]
Merge pull request #6863 from owncloud/versioning_expire_function_tests
Versioning expire function tests
Vincent Petry [Tue, 21 Jan 2014 16:35:41 +0000 (08:35 -0800)]
Merge pull request #6868 from owncloud/enc-fixrandomfailunittest
Replaced time() with uniqid() to make sure the file name is unique
Jörn Friedrich Dreyer [Tue, 21 Jan 2014 16:31:22 +0000 (08:31 -0800)]
Merge pull request #6844 from owncloud/fix-css-loading-master
Revert "use getAppWebPath() in here as well"
Thomas Müller [Tue, 21 Jan 2014 15:36:30 +0000 (07:36 -0800)]
Merge pull request #6858 from owncloud/fix-setupfs-only-for-existing-users-master
OC_Util::setupFS($user) will create a data dir for the given string - no...
Vincent Petry [Tue, 21 Jan 2014 15:19:26 +0000 (16:19 +0100)]
Replaced time() with uniqid() to make sure the file name is unique
The cache isn't cleared properly because unlink() doesn't remove the
cache entry which caused side-effects when reusing the same file name
(which randomly happens when time() returns the same value)
This fix first makes sure the unit tests don't fail any more.
The unlink() case with the cache will be investigated separately.
Bjoern Schiessle [Tue, 21 Jan 2014 11:10:24 +0000 (12:10 +0100)]
add first unit test for the versioning app
Bjoern Schiessle [Mon, 20 Jan 2014 15:03:26 +0000 (16:03 +0100)]
isolate getExpireList function to make it testable
Thomas Müller [Tue, 21 Jan 2014 15:01:24 +0000 (16:01 +0100)]
Merge branch 'master' into fixing-gallery-password-protected-access-master
Thomas Müller [Tue, 21 Jan 2014 14:35:32 +0000 (15:35 +0100)]
Merge branch 'master' into fix-setupfs-only-for-existing-users-master
Thomas Müller [Tue, 21 Jan 2014 14:16:22 +0000 (06:16 -0800)]
Merge pull request #6864 from owncloud/protect-versions-preview-master
don't use the user id within the versions preview call as it could be us...
Thomas Müller [Tue, 21 Jan 2014 12:50:56 +0000 (13:50 +0100)]
don't use the user id within the versions preview call as it could be used to access previews of another user
Thomas Müller [Tue, 21 Jan 2014 12:19:26 +0000 (04:19 -0800)]
Merge pull request #6861 from owncloud/neutral_download_zip_default_name
use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'
Thomas Müller [Tue, 21 Jan 2014 12:14:28 +0000 (04:14 -0800)]
Merge pull request #6857 from owncloud/fix_user_ldap_sql_on_oracle
user workaround to compare CLOB column with CHAR value