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

26629 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
e2cc778947 Merge pull request #18783 from owncloud/revert-18773-fix-useless-deletes 
Revert "Soft fail when deleting and no entry found"
 2015-09-02 19:53:18 +02:00
Joas Schilling
8f2110e5da Revert "Soft fail when deleting and no entry found" 2015-09-02 19:52:45 +02:00
Robin McCorkell
f97359706a Merge pull request #18773 from owncloud/fix-useless-deletes 
Soft fail when deleting and no entry found
 2015-09-02 15:12:07 +01:00
Robin McCorkell
c9c246a3f5 Soft fail when deleting and no entry found 2015-09-02 14:50:07 +01:00
Jenkins for ownCloud
772d39f006 [tx-robot] updated from transifex 2015-09-02 07:08:44 -04:00
Jan-Christoph Borchardt
4539377113 Merge pull request #18632 from owncloud/sidebad-image-preview 
larger preview for images in the sidebar
 2015-09-02 10:53:59 +02:00
Morris Jobke
0884211c0f Merge pull request #18752 from owncloud/proper-setup-check 
use config.php value instead of version string for appstore detection
 2015-09-02 10:36:19 +02:00
Robin Appelman
e85620ab69 larger preview for images in the sidebar 2015-09-02 10:32:43 +02:00
Robin Appelman
c6060f53cd allow handling thumbnail errors 2015-09-02 10:32:43 +02:00
Robin Appelman
0f6df2e0b6 Allow creating previewss that cover the specified dimensions 2015-09-02 10:32:39 +02:00
Morris Jobke
c86cac6a2b use config.php value instead of version string 2015-09-02 08:16:27 +02:00
Morris Jobke
73b43db4f9 Merge pull request #18744 from owncloud/fix-ocs-router 
Delay adding OCS prefix to route collection until all is loaded
 2015-09-02 08:05:15 +02:00
Jenkins for ownCloud
310084cc25 [tx-robot] updated from transifex 2015-09-01 14:03:19 -04:00
Robin McCorkell
e50b3bd87f Merge pull request #18707 from owncloud/autotest-xdebug 
Allow easy XDEBUG debugging with autotest
 2015-09-01 16:29:33 +01:00
Robin Appelman
9858a6f705 Merge pull request #18743 from owncloud/autoloader-check-log-path 
Show the path as part of the exception for not allowed autoloading paths
 2015-09-01 17:20:21 +02:00
Björn Schießle
39bd4ea8f2 Merge pull request #18234 from owncloud/ocs_api_for_sharees_list 
Add OCS API for sharees list
 2015-09-01 17:09:57 +02:00
Robin McCorkell
5b2529b448 Delay adding OCS prefix to route collection until all is loaded 
->addPrefix() iterates over all registered routes, so must be run after
all apps have had a chance to load their OCS routes.
 2015-09-01 15:42:41 +01:00
Robin Appelman
01dcf7f32c Show the path as part of the exception for not allowed autoloading paths 2015-09-01 16:06:52 +02:00
Vincent Petry
87b3e28f06 Merge pull request #18730 from owncloud/appframework_proper_304 
Properly return 304 in AppFramework
 2015-09-01 15:39:59 +02:00
Lukas Reschke
01152676cd Merge pull request #18396 from owncloud/autoloader-check-path 
verify the path in the autoloader
 2015-09-01 15:07:32 +02:00
Robin Appelman
e9b91b1798 verify the path in the autoloader 2015-09-01 15:03:28 +02:00
Vincent Petry
601c61fddf Merge pull request #12088 from AdamWill/google-opendir-root 
[WIP] google: drop duplicate path trim from opendir()
 2015-09-01 13:36:27 +02:00
Vincent Petry
0d4562c938 Merge pull request #18631 from owncloud/more_ocs_share_data 
Return permissions and expiration on create share responses
 2015-09-01 12:29:02 +02:00
Roeland Jago Douma
f12caf930e Properly return 304 
The ETag set in the IF_NONE_MODIFIED header is wraped in quotes (").
However the ETag that is set in response is not (yet). Also we need to
cast the ETag to a string.

* Added unit test
 2015-09-01 11:04:41 +02:00
Vincent Petry
85b62c7d82 Merge pull request #18635 from owncloud/stickify-files-and-sharing-notification-types 
Sticky the notification types of files and sharing
 2015-08-31 17:56:48 +02:00
Morris Jobke
e367f1bfc1 Merge pull request #18715 from owncloud/language-code-english 
add english language code translation
 2015-08-31 17:45:39 +02:00
Morris Jobke
eef707043c add english language code translation 2015-08-31 17:41:20 +02:00
Vincent Petry
f8d8de5da6 Merge pull request #17899 from owncloud/enc_make_key_storage_root_configurable 
Make root of key storage configurable
 2015-08-31 15:58:30 +02:00
Robin Appelman
3e9533ae11 Merge pull request #18702 from owncloud/ext-emptymount 
Allow an empty mount point
 2015-08-31 15:28:41 +02:00
Robin McCorkell
f6b1d3506f Allow easy XDEBUG debugging with autotest 
Debugging scripts needs the environment variable XDEBUG_CONFIG to be
set, which initiates a connection to a listening debugger. But if that
env is set and one of the PHP setup steps occurs (e.g. occ install), the
debugging session is 'completed' and the debugger no longer listens
during the actual tests. This saves the XDEBUG_CONFIG env so it only
applies during the PHPUnit execution, so only the real tests trigger the
debugging.
 2015-08-31 14:22:02 +01:00
Robin McCorkell
d64bdc0fef Unit test storages with an empty mount point 2015-08-31 14:01:05 +01:00
Morris Jobke
c34fbea197 Merge pull request #18691 from owncloud/request-no-read 
Decode request content only on getContent
 2015-08-31 14:58:48 +02:00
Robin McCorkell
1e2e5abe26 Allow an empty mount point 2015-08-31 13:23:23 +01:00
Jenkins for ownCloud
65784227d6 [tx-robot] updated from transifex 2015-08-31 01:54:45 -04:00
Robin McCorkell
e60c4bada1 Decode request content only on getContent 2015-08-31 01:05:25 +01:00
Morris Jobke
89b603a4b3 Merge pull request #18671 from owncloud/cleanup-sidebar-semantics 
Removes unecessary divs and adds max width to longer names.
 2015-08-31 00:38:18 +02:00
Raghu Nayyar
c6053daf43 Fixes failing tests 2015-08-31 00:14:07 +02:00
Raghu Nayyar
0167225686 Merge pull request #18689 from owncloud/app-navigation-line 
Introduce small line for navigation sidebar
 2015-08-30 23:24:35 +02:00
Morris Jobke
5d1fb8cb11 Introduce small line for navigation sidebar 2015-08-30 20:47:22 +02:00
Morris Jobke
b50ac6ff2f Merge pull request #10149 from owncloud/storage-wrapper-check 
Check result of storage wrappers
 2015-08-30 19:48:37 +02:00
Bjoern Schiessle
37513f9411 don't read certificates if ownCloud is not installed 2015-08-30 19:00:03 +02:00
Bjoern Schiessle
289e9130f3 make system root of key storage configurable 2015-08-30 19:00:03 +02:00
Raghu Nayyar
3eee9a2e48 Merge pull request #18681 from owncloud/apps-unit-test 
Add apps JS unit test
 2015-08-30 17:48:19 +02:00
Vincent Petry
a808837ec9 Add apps unit test 2015-08-30 17:14:57 +02:00
Björn Schießle
4d7c352077 Merge pull request #18556 from owncloud/fix_password_reset 
[encryption] fix password reset for ldap users
 2015-08-30 15:57:24 +02:00
Roeland Jago Douma
d54b497ade Return permissions and expiration on create share responses 
Updated and added unit tests
 2015-08-30 15:42:19 +02:00
Bjoern Schiessle
166e57cf61 return false if private key is not valid 2015-08-30 15:31:19 +02:00
Bjoern Schiessle
f893de4136 use login name for password reset 2015-08-30 15:31:19 +02:00
Raghu Nayyar
468bde67ff Removes unecessary divs and adds max width to longer names. 2015-08-30 14:17:18 +02:00
Vincent Petry
045f8cc971 Merge pull request #18651 from owncloud/ocs_share_create_with_expire 
Allow to directly set the expireDate on a new (link)share
 2015-08-30 10:50:12 +02:00