wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
17290 commits 157 branches 562 tags 714 MiB
Commit graph

17290 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
a6de5efbab Merge pull request #7978 from owncloud/enc_cleanup 
there is no need to re-calculate the shares after a touch
 2014-04-02 18:23:33 +02:00
Jörn Friedrich Dreyer
436a78db44 extract method isCachedBigger 2014-04-02 18:00:21 +02:00
Bernhard Posselt
5f3b8c45d7 Remove dependency on container, removing service locator antipattern 2014-04-02 17:54:33 +02:00
tomneedham
6b017201b8 Only accept success as 100 like the OCS spec does 2014-04-02 15:50:51 +00:00
Jörn Friedrich Dreyer
bca6cc6f74 remove unnecessary code 2014-04-02 17:34:48 +02:00
Jörn Friedrich Dreyer
b8248f4a0a compare floats with epsilon 2014-04-02 17:32:27 +02:00
Robin Appelman
da5541ac02 Allow reusing FileInfo for getStorageInfo 2014-04-02 17:10:57 +02:00
Robin Appelman
1e6a79e244 Reuse known free space in the files app 2014-04-02 16:53:45 +02:00
Vincent Petry
0be9de5df5 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
 2014-04-02 15:33:47 +02:00
Morris Jobke
16d10844cd Merge pull request #7995 from owncloud/fix-h3-styles 
fix h3 style, move out from settings to apps CSS
 2014-04-02 14:45:58 +02:00
Vincent Petry
b616cc1f2d Merge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclib 
Upgraded phpseclib to version 0.3.6 (SFTP ext storage)
 2014-04-02 14:10:09 +02:00
Robin Appelman
850a0e7388 Verify that a file exists before we share it 2014-04-02 13:47:11 +02:00
Morris Jobke
7bdc085022 Merge pull request #8006 from wakeup/master 
Fix admin-dir_permissions redirection when cannot write warning is shown.
 2014-04-02 13:21:53 +02:00
Morris Jobke
1782dcbb50 Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled 
always encrypt files to owner
 2014-04-02 13:20:51 +02:00
Vincent Petry
c0746f6b49 Merge pull request #7968 from owncloud/core-overwritewebrootwithroot 
Allow using "/" in "overwritewebroot"
 2014-04-02 12:56:36 +02:00
Volkan Gezer
b6ad7c3cdd Fix admin-dir_permissions redirection when cannot write warning 
is shown.
 2014-04-02 12:41:46 +02:00
Vincent Petry
3f9beb8c6b Upgraded phpseclib to version 0.3.6 2014-04-02 12:31:59 +02:00
Vincent Petry
4cc70ec39d Merge pull request #7979 from owncloud/core-fixfilegetcontentsloop 
Correctly read the full stream in file_get_contents
 2014-04-02 10:55:50 +02:00
Jan-Christoph Borchardt
5301056ab1 fix h3 style, move out from settings to apps CSS 2014-04-02 09:18:33 +02:00
Jenkins for ownCloud
73dd5ff26c [tx-robot] updated from transifex 2014-04-02 01:56:39 -04:00
Robin Appelman
1c7a71ca77 use binary safe read 2014-04-02 04:38:54 +02:00
Robin Appelman
54a15a8001 Use streams when generating hashes of remote files 2014-04-02 04:38:54 +02:00
Vincent Petry
268206cec5 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()
 2014-04-01 23:02:34 +02:00
Thomas Müller
d762e25cc5 Merge pull request #7989 from owncloud/files-deletefileregressionfix 
Fixed broken delete file action
 2014-04-01 22:54:05 +02:00
Thomas Müller
82d1ea240e Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available 
idn_to_ascii is only used if available
 2014-04-01 22:51:23 +02:00
Vincent Petry
d811026ec9 Merge pull request #7935 from owncloud/getpath-shared 
Make getPath work for shared files
 2014-04-01 21:59:09 +02:00
Morris Jobke
bd2cf6ee29 Merge pull request #7817 from owncloud/app-navigation-for-apps 
Makes #app-navigation a part of app management.
 2014-04-01 21:38:43 +02:00
Bart Visscher
630b5b648f Merge pull request #7997 from owncloud/correct-remember-trashbin-state 
Correct the remembering of the trashbin app state in encryption test
 2014-04-01 21:23:53 +02:00
Bart Visscher
f37a76c396 Remember before change works better 2014-04-01 19:46:46 +02:00
Jan-Christoph Borchardt
0c441724bc make infield labels use less space so pasting in is easier 2014-04-01 17:21:05 +02:00
Jan-Christoph Borchardt
c926e98ea9 fix log in input sizing caused by core input field switch to px 2014-04-01 17:18:03 +02:00
Vincent Petry
0e93c3fd9a Merge pull request #7986 from owncloud/files-fixredirectwhendirnotexists 
Fix dirInfo check when dir does not exist
 2014-04-01 16:51:30 +02:00
Morris Jobke
017d7953d7 Merge pull request #7984 from owncloud/wording-applicable2 
External Storage: change confusing 'applicable' to 'available for', default to »All Users«
 2014-04-01 16:44:31 +02:00
Vincent Petry
aaa8d6ec02 Fixed broken delete file action 2014-04-01 16:09:48 +02:00
Vincent Petry
6e6a131b32 Merge pull request #7696 from owncloud/chunk-remainingspacefix 
Fixed chunking and insufficient storage check
 2014-04-01 16:09:19 +02:00
Vincent Petry
0bede65947 Fix dirInfo check when dir does not exist 2014-04-01 15:15:03 +02:00
Vincent Petry
27eff1ac30 Merge pull request #7293 from owncloud/update-shares-postgres 
fix update to remove shares where file doesn't exist on postgres
 2014-04-01 14:56:37 +02:00
Jan-Christoph Borchardt
acfb3cfff5 external storage: set storages to be available for All Users by default 2014-04-01 14:31:22 +02:00
Jan-Christoph Borchardt
0a112de676 external storage: change confusing 'applicable' to 'available for' 2014-04-01 14:26:06 +02:00
blizzz
a179335775 Merge pull request #7940 from owncloud/settings-userlistajaxcallfix 
Fixed user list offset call
 2014-04-01 14:17:05 +02:00
Björn Schießle
c45793033d Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook 
move check if a file should be encrypted to the pre hook
 2014-04-01 13:56:46 +02:00
Vincent Petry
be0660f84f Merge pull request #7943 from hjort/master 
Correction: failure on sharing when user ID was prefixed by zero
 2014-04-01 12:57:16 +02:00
Vincent Petry
5807681c09 Merge pull request #7975 from owncloud/fix-7973-master-2 
remove pl_PL - fixes #7973
 2014-04-01 12:38:47 +02:00
Vincent Petry
18acfa8bb3 Merge pull request #7915 from owncloud/replace-personalblock 
Replace personalblock with .section
 2014-04-01 11:20:16 +02:00
Morris Jobke
a94ac41512 Merge pull request #7966 from owncloud/url_generation_hack 
Check if web root has already been appended
 2014-04-01 10:59:53 +02:00
Morris Jobke
0d2a81a095 apply proposed change 2014-04-01 10:48:55 +02:00
Vincent Petry
0067a4eac2 Added missing fclose in file_get_contents and file_put_contents 2014-04-01 10:08:16 +02:00
Vincent Petry
d6ce45fe61 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.
 2014-04-01 10:07:16 +02:00
Jenkins for ownCloud
7a4a836abe [tx-robot] updated from transifex 2014-04-01 01:56:15 -04:00
Bart Visscher
6b061c236d 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
 2014-03-31 21:38:54 +02:00