]>
source.dussan.org Git - nextcloud-server.git/log
Robin Appelman [Tue, 15 Apr 2014 13:48:02 +0000 (15:48 +0200)]
Sort parameters and cast to int
Robin Appelman [Mon, 7 Apr 2014 11:27:18 +0000 (13:27 +0200)]
add delimiter between host and baseurl
Robin Appelman [Mon, 7 Apr 2014 11:24:51 +0000 (13:24 +0200)]
Merge branch 'master' into routing-cache-webroot
blizzz [Mon, 7 Apr 2014 11:00:32 +0000 (13:00 +0200)]
Merge pull request #6221 from leo-b/ldap_get_all_groups
fix updateGroups background job for ldap servers with > 1000 groups
blizzz [Mon, 7 Apr 2014 08:19:18 +0000 (10:19 +0200)]
Merge pull request #8017 from Raydiation/master
Remove dependency on container, removing service locator antipattern
Jenkins for ownCloud [Mon, 7 Apr 2014 05:56:11 +0000 (01:56 -0400)]
[tx-robot] updated from transifex
Lukas Reschke [Sun, 6 Apr 2014 20:24:30 +0000 (22:24 +0200)]
Merge pull request #8064 from owncloud/remove-not-existing-functions
Removed two unused functions
Volkan Gezer [Sun, 6 Apr 2014 12:01:02 +0000 (14:01 +0200)]
Update README.md
Update to the correct link (version 6.0)
Volkan Gezer [Sun, 6 Apr 2014 11:58:44 +0000 (13:58 +0200)]
Update README.md
Volkan Gezer [Sun, 6 Apr 2014 11:58:06 +0000 (13:58 +0200)]
Update README.md
Change version.
Jenkins for ownCloud [Sun, 6 Apr 2014 05:56:11 +0000 (01:56 -0400)]
[tx-robot] updated from transifex
jbtbnl [Sat, 5 Apr 2014 23:17:43 +0000 (01:17 +0200)]
Merge pull request #8072 from owncloud/slideshow-buttons
Fix slideshow buttons being invisible
Robin Appelman [Sat, 5 Apr 2014 22:16:14 +0000 (00:16 +0200)]
Fix slideshow buttons being invisible
Jenkins for ownCloud [Sat, 5 Apr 2014 05:56:08 +0000 (01:56 -0400)]
[tx-robot] updated from transifex
Tom Needham [Fri, 4 Apr 2014 23:13:33 +0000 (00:13 +0100)]
Merge pull request #8061 from owncloud/remove-uneeded-file
Remove uneeded file
Jörn Friedrich Dreyer [Fri, 4 Apr 2014 21:17:13 +0000 (23:17 +0200)]
Merge pull request #8062 from owncloud/remove-echo
Replace echo with `p` or `print_unescaped`
Lukas Reschke [Fri, 4 Apr 2014 20:38:26 +0000 (22:38 +0200)]
Delete auth.css
Lukas Reschke [Fri, 4 Apr 2014 20:38:16 +0000 (22:38 +0200)]
Delete oauth.css
Lukas Reschke [Fri, 4 Apr 2014 20:27:05 +0000 (22:27 +0200)]
Removed two unused functions
These two functions were actually not usable and only a todo since ages. I think it's better to remove it than having dead and unmaintained code.
Lukas Reschke [Fri, 4 Apr 2014 20:23:23 +0000 (22:23 +0200)]
Replace echo with `p` or `print_unescaped`
Using echo instead of `p` or `print_unescaped` is a bad style, to prevent people from copying it I've adjusted it.
Lukas Reschke [Fri, 4 Apr 2014 20:14:51 +0000 (22:14 +0200)]
Remove uneeded file
This file seems not to be actually used anywhere.
Vincent Petry [Fri, 4 Apr 2014 16:45:49 +0000 (18:45 +0200)]
Merge pull request #8058 from owncloud/preview-highdpi
Show higher resolution previews for high dpi screens
icewind1991 [Fri, 4 Apr 2014 16:07:29 +0000 (18:07 +0200)]
Merge pull request #8055 from owncloud/getfileinfo-exists
dont scan not existing files in View->getFileInfo
Vincent Petry [Fri, 4 Apr 2014 15:18:54 +0000 (17:18 +0200)]
Merge pull request #8039 from owncloud/chunking-removeexpireinhaskey
Do not expire chunks while checking for their existence
Robin Appelman [Fri, 4 Apr 2014 15:10:46 +0000 (17:10 +0200)]
Show higher resolution previews for high dpi screens
Robin Appelman [Fri, 4 Apr 2014 13:10:07 +0000 (15:10 +0200)]
dont scan not existing files in View->getFileInfo
Vincent Petry [Fri, 4 Apr 2014 10:00:01 +0000 (12:00 +0200)]
Merge pull request #8047 from owncloud/jshint-line-length-120
extending javascript line length to 120
Thomas Müller [Fri, 4 Apr 2014 08:36:19 +0000 (10:36 +0200)]
extending javascript line length to 120
adding xit to globals
Vincent Petry [Fri, 4 Apr 2014 08:18:02 +0000 (10:18 +0200)]
Merge pull request #8015 from owncloud/storageinfo-reuse
Allow reusing FileInfo for getStorageInfo
Jenkins for ownCloud [Fri, 4 Apr 2014 05:57:01 +0000 (01:57 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 3 Apr 2014 20:02:05 +0000 (22:02 +0200)]
Merge pull request #6968 from owncloud/files-ajaxload
Ajaxify files list for files + trashbin + public page
Vincent Petry [Thu, 3 Apr 2014 19:12:35 +0000 (21:12 +0200)]
Do not expire chunks while checking for their existence
The expiration should be done by the gc() function on login, not while
isComplete() is calling hasKey() for every chunk.
Thomas Müller [Thu, 3 Apr 2014 18:05:40 +0000 (20:05 +0200)]
Exclude javascript specs from code analysis
Thomas Müller [Thu, 3 Apr 2014 18:02:27 +0000 (20:02 +0200)]
Merge pull request #7476 from owncloud/type-hinting
Type hinting
Vincent Petry [Thu, 3 Apr 2014 15:08:06 +0000 (17:08 +0200)]
Correctly set svg for crumb divider
Vincent Petry [Thu, 3 Apr 2014 15:04:13 +0000 (17:04 +0200)]
Fixed dirInfo check for non existing dir in files ajax call
Vincent Petry [Thu, 3 Apr 2014 14:55:01 +0000 (16:55 +0200)]
Fixed mime type attribute access in file overwrite dialog
Vincent Petry [Thu, 3 Apr 2014 14:50:21 +0000 (16:50 +0200)]
Removed redundant free space and upload limit in public page
Vincent Petry [Thu, 3 Apr 2014 14:31:58 +0000 (16:31 +0200)]
Merge pull request #7969 from Xenopathic/files_external_fix
Fix error log spam
Thomas Müller [Thu, 3 Apr 2014 14:09:44 +0000 (16:09 +0200)]
Merge pull request #7970 from owncloud/webdav-upload-hash
Fix uploading files containing a # in the path for webdav
Robin McCorkell [Mon, 31 Mar 2014 14:16:33 +0000 (15:16 +0100)]
Jenkins for ownCloud [Thu, 3 Apr 2014 05:56:12 +0000 (01:56 -0400)]
[tx-robot] updated from transifex
icewind1991 [Wed, 2 Apr 2014 16:40:34 +0000 (18:40 +0200)]
Merge pull request #8014 from owncloud/uploadsize-reuse
Reuse known free space in the files app
Vincent Petry [Wed, 2 Apr 2014 16:23:33 +0000 (18:23 +0200)]
Merge pull request #7978 from owncloud/enc_cleanup
there is no need to re-calculate the shares after a touch
Bernhard Posselt [Wed, 2 Apr 2014 15:54:33 +0000 (17:54 +0200)]
Remove dependency on container, removing service locator antipattern
Robin Appelman [Wed, 2 Apr 2014 15:10:57 +0000 (17:10 +0200)]
Allow reusing FileInfo for getStorageInfo
Robin Appelman [Wed, 2 Apr 2014 14:53:45 +0000 (16:53 +0200)]
Reuse known free space in the files app
Vincent Petry [Mon, 28 Oct 2013 19:22:06 +0000 (20:22 +0100)]
Files, trashbin, public apps use ajax/JSON for the file list
Files app:
- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only
Breadcrumbs are now JS only:
- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class
Public page now uses ajax to load the file list:
- Added Helper class in sharing app to make it easier to authenticate
and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list
Core:
- Fixed file picker dialog to use the same list format as files app
Morris Jobke [Wed, 2 Apr 2014 12:45:58 +0000 (14:45 +0200)]
Merge pull request #7995 from owncloud/fix-h3-styles
fix h3 style, move out from settings to apps CSS
Vincent Petry [Wed, 2 Apr 2014 12:10:09 +0000 (14:10 +0200)]
Merge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclib
Upgraded phpseclib to version 0.3.6 (SFTP ext storage)
Morris Jobke [Wed, 2 Apr 2014 11:21:53 +0000 (13:21 +0200)]
Merge pull request #8006 from wakeup/master
Fix admin-dir_permissions redirection when cannot write warning is shown.
Morris Jobke [Wed, 2 Apr 2014 11:20:51 +0000 (13:20 +0200)]
Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled
always encrypt files to owner
Vincent Petry [Wed, 2 Apr 2014 10:56:36 +0000 (12:56 +0200)]
Merge pull request #7968 from owncloud/core-overwritewebrootwithroot
Allow using "/" in "overwritewebroot"
Volkan Gezer [Wed, 2 Apr 2014 10:41:46 +0000 (12:41 +0200)]
Fix admin-dir_permissions redirection when cannot write warning
is shown.
Vincent Petry [Wed, 2 Apr 2014 10:31:59 +0000 (12:31 +0200)]
Upgraded phpseclib to version 0.3.6
Vincent Petry [Wed, 2 Apr 2014 08:55:50 +0000 (10:55 +0200)]
Merge pull request #7979 from owncloud/core-fixfilegetcontentsloop
Correctly read the full stream in file_get_contents
Jan-Christoph Borchardt [Tue, 1 Apr 2014 16:50:47 +0000 (18:50 +0200)]
fix h3 style, move out from settings to apps CSS
Jenkins for ownCloud [Wed, 2 Apr 2014 05:56:39 +0000 (01:56 -0400)]
[tx-robot] updated from transifex
Vincent Petry [Tue, 28 Jan 2014 15:16:09 +0000 (16:16 +0100)]
Fixed parseQueryString to handle empty values and plus signs
- now correctly parse query strings with '+' signs
- empty values are now parsed either as null or empty string
- added unit test for parseQueryString()
Thomas Müller [Tue, 1 Apr 2014 20:54:05 +0000 (22:54 +0200)]
Merge pull request #7989 from owncloud/files-deletefileregressionfix
Fixed broken delete file action
Thomas Müller [Tue, 1 Apr 2014 20:51:23 +0000 (22:51 +0200)]
Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available
idn_to_ascii is only used if available
Vincent Petry [Tue, 1 Apr 2014 19:59:09 +0000 (21:59 +0200)]
Merge pull request #7935 from owncloud/getpath-shared
Make getPath work for shared files
Morris Jobke [Tue, 1 Apr 2014 19:38:43 +0000 (21:38 +0200)]
Merge pull request #7817 from owncloud/app-navigation-for-apps
Makes #app-navigation a part of app management.
Bart Visscher [Tue, 1 Apr 2014 19:23:53 +0000 (21:23 +0200)]
Merge pull request #7997 from owncloud/correct-remember-trashbin-state
Correct the remembering of the trashbin app state in encryption test
Bart Visscher [Wed, 18 Sep 2013 20:06:45 +0000 (22:06 +0200)]
Remember before change works better
Vincent Petry [Tue, 1 Apr 2014 14:51:30 +0000 (16:51 +0200)]
Merge pull request #7986 from owncloud/files-fixredirectwhendirnotexists
Fix dirInfo check when dir does not exist
Morris Jobke [Tue, 1 Apr 2014 14:44:31 +0000 (16:44 +0200)]
Merge pull request #7984 from owncloud/wording-applicable2
External Storage: change confusing 'applicable' to 'available for', default to »All Users«
Vincent Petry [Tue, 1 Apr 2014 14:09:48 +0000 (16:09 +0200)]
Fixed broken delete file action
Vincent Petry [Tue, 1 Apr 2014 14:09:19 +0000 (16:09 +0200)]
Merge pull request #7696 from owncloud/chunk-remainingspacefix
Fixed chunking and insufficient storage check
Robin Appelman [Tue, 1 Apr 2014 13:43:27 +0000 (15:43 +0200)]
Keep cached urls with different hostnames or baseurls seperate
Vincent Petry [Tue, 1 Apr 2014 13:15:03 +0000 (15:15 +0200)]
Fix dirInfo check when dir does not exist
Vincent Petry [Tue, 1 Apr 2014 12:56:37 +0000 (14:56 +0200)]
Merge pull request #7293 from owncloud/update-shares-postgres
fix update to remove shares where file doesn't exist on postgres
Jan-Christoph Borchardt [Tue, 1 Apr 2014 12:28:33 +0000 (14:28 +0200)]
external storage: set storages to be available for All Users by default
Jan-Christoph Borchardt [Tue, 1 Apr 2014 12:26:06 +0000 (14:26 +0200)]
external storage: change confusing 'applicable' to 'available for'
blizzz [Tue, 1 Apr 2014 12:17:05 +0000 (14:17 +0200)]
Merge pull request #7940 from owncloud/settings-userlistajaxcallfix
Fixed user list offset call
Björn Schießle [Tue, 1 Apr 2014 11:56:46 +0000 (13:56 +0200)]
Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook
move check if a file should be encrypted to the pre hook
Vincent Petry [Tue, 1 Apr 2014 10:57:16 +0000 (12:57 +0200)]
Merge pull request #7943 from hjort/master
Correction: failure on sharing when user ID was prefixed by zero
Vincent Petry [Tue, 1 Apr 2014 10:38:47 +0000 (12:38 +0200)]
Merge pull request #7975 from owncloud/fix-7973-master-2
remove pl_PL - fixes #7973
Vincent Petry [Tue, 1 Apr 2014 09:20:16 +0000 (11:20 +0200)]
Merge pull request #7915 from owncloud/replace-personalblock
Replace personalblock with .section
Morris Jobke [Tue, 1 Apr 2014 08:59:53 +0000 (10:59 +0200)]
Merge pull request #7966 from owncloud/url_generation_hack
Check if web root has already been appended
Morris Jobke [Tue, 1 Apr 2014 08:48:55 +0000 (10:48 +0200)]
apply proposed change
Vincent Petry [Mon, 31 Mar 2014 16:37:52 +0000 (18:37 +0200)]
Added missing fclose in file_get_contents and file_put_contents
Vincent Petry [Mon, 31 Mar 2014 16:36:52 +0000 (18:36 +0200)]
Correctly read the full stream in file_get_contents
When using user-defined stream wrappers, PHP will
return a maximum of 8192 bytes even if more was
requested.
This fix uses stream_get_contents to make sure the full stream is read
and not only the first 8 KB.
Added unit test with a bigger test file to cover this case.
Jenkins for ownCloud [Tue, 1 Apr 2014 05:56:15 +0000 (01:56 -0400)]
[tx-robot] updated from transifex
Bart Visscher [Mon, 31 Mar 2014 19:38:54 +0000 (21:38 +0200)]
Merge branch 'master' into type-hinting
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
Björn Schießle [Mon, 31 Mar 2014 19:34:42 +0000 (21:34 +0200)]
Merge pull request #7967 from owncloud/sharing_fix_select_statement
select statement always need to contain file_source respectively item_source
Bjoern Schiessle [Mon, 31 Mar 2014 16:24:53 +0000 (18:24 +0200)]
there is no need to re-calculate the shares after a touch
Bjoern Schiessle [Mon, 31 Mar 2014 16:09:46 +0000 (18:09 +0200)]
always encrypt files to owner
Thomas Müller [Mon, 31 Mar 2014 16:03:42 +0000 (18:03 +0200)]
remove pl_PL - fixes #7973
Robin Appelman [Mon, 31 Mar 2014 15:00:32 +0000 (17:00 +0200)]
Fix uploading files containing a # in the path for webdav
Morris Jobke [Mon, 31 Mar 2014 13:56:19 +0000 (15:56 +0200)]
Merge pull request #7916 from owncloud/fix-input-sizes
Fix input sizes
Vincent Petry [Mon, 31 Mar 2014 13:30:44 +0000 (15:30 +0200)]
Allow using "/" in "overwritewebroot"
Whenever the reverse proxy is using "/" as the webroot, it is now
possible to set that value in "overwritewebroot"
Bjoern Schiessle [Mon, 31 Mar 2014 10:43:38 +0000 (12:43 +0200)]
don't call getFileInfo() to avoid to open the same file twice
Bjoern Schiessle [Thu, 27 Mar 2014 12:49:48 +0000 (13:49 +0100)]
move check if a file should be encrypted to the pre hook
Bjoern Schiessle [Mon, 31 Mar 2014 13:02:02 +0000 (15:02 +0200)]
select statement always need to contain file_source respectively item_source
Robin Appelman [Mon, 31 Mar 2014 12:29:55 +0000 (14:29 +0200)]
Improve phpdoc
Thomas Tanghus [Mon, 31 Mar 2014 12:24:38 +0000 (14:24 +0200)]
Check if web root has already been appended
Morris Jobke [Mon, 31 Mar 2014 11:51:53 +0000 (13:51 +0200)]
merge CSS rules
Jan-Christoph Borchardt [Mon, 31 Mar 2014 11:12:04 +0000 (13:12 +0200)]
external storage: fix merge conflict, indentation
Jan-Christoph Borchardt [Mon, 31 Mar 2014 11:00:46 +0000 (13:00 +0200)]
replace last personalblock fieldset within files_external