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

27905 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
172bcf2d51 Merge pull request #20026 from owncloud/LukasReschke-patch-1 
Add HackerOne page to CONTRIBUTING.md
 2015-10-25 21:55:17 +01:00
Lukas Reschke
bdae8ee9c4 Add HackerOne page to CONTRIBUTING.md 2015-10-25 20:57:49 +01:00
Lukas Reschke
4891e36432 Merge pull request #20024 from owncloud/optimized-autoloader 
Use optimized autoloader for 3rdparty
 2015-10-25 20:51:25 +01:00
Lukas Reschke
1fdecc4479 Use optimized autoloader for 3rdparty 2015-10-25 20:18:04 +01:00
Lukas Reschke
add164ef2d Merge pull request #16957 from owncloud/throw-exception-if-file-does-not-exist 
Throw exception on `getPath` if file does not exist
 2015-10-25 18:35:57 +01:00
Lukas Reschke
13e817e901 Throw exception on getPath if file does not exist 
Currently the `getPath` methods returned `NULL` in case when a file with the specified ID does not exist. This however mandates that developers are checking for the `NULL` case and if they do not the door for bugs with all kind of impact is widely opened.

This is especially harmful if used in context with Views where the final result is limited based on the result of `getPath`, if `getPath` returns `NULL` PHP type juggles this to an empty string resulting in all possible kind of bugs.

While one could argue that this is a misusage of the API the fact is that it is very often misused and an exception will trigger an immediate stop of execution as well as log this behaviour and show a pretty error page.

I also adjusted some usages where I believe that we need to catch these errors, in most cases this is though simply an error that should hard-fail.
 2015-10-25 17:58:21 +01:00
Jenkins for ownCloud
eb10e3abc2 [tx-robot] updated from transifex 2015-10-25 01:55:04 -04:00
Jenkins for ownCloud
ba010a5aa4 [tx-robot] updated from transifex 2015-10-24 01:55:42 -04:00
Thomas Müller
9444954f48 Merge pull request #20013 from owncloud/guzzlehttp-guzzle-5.3.0 
Bump 3rdparty for guzzlehttp/http to 5.3.0
 2015-10-23 22:35:06 +02:00
Roeland Jago Douma
99c83e3e28 Bump 3rdparty for guzzlehttp/http to 5.3.0 
Includes bump of react/promise to 2.2.1
 2015-10-23 22:02:53 +02:00
Thomas Müller
0aaef4c299 Merge pull request #20004 from owncloud/dont-lock-user-files 
Dont lock /$user/files
 2015-10-23 17:27:07 +02:00
Thomas Müller
190acd28e5 Merge pull request #19987 from owncloud/full_sabre_2.1.7 
Bump 3rdparty to have full sabre/dav-2.1.7
 2015-10-23 17:26:45 +02:00
Roeland Jago Douma
1f187d1ffd Bump 3rdparty to have full sabre/dav-2.1.7 2015-10-23 16:38:07 +02:00
Thomas Müller
7afbf0f8c1 Merge pull request #19977 from owncloud/provisioning_api_integration_tests_apps_new_getusers 
Provisioning api integration tests added app tests and getusers by a subadmin
 2015-10-23 15:11:27 +02:00
Robin Appelman
9d7138aa50 Dont lock /$user/files 2015-10-23 14:59:16 +02:00
Thomas Müller
3d08964b64 Merge pull request #19957 from owncloud/volter-master 
Expose syslog tag in the configuration
 2015-10-23 14:35:28 +02:00
Steffen Lindner
7bbf586b9b Add syslog_tag docu to sample config 2015-10-23 13:43:41 +02:00
Thomas Müller
e8b12a3c2c Merge pull request #19970 from owncloud/encryption-getuidonboolean 
Fix "Call to a member function getUID() on boolean" in Crypt
 2015-10-23 12:56:14 +02:00
Thomas Müller
db48a937cf Merge pull request #19990 from owncloud/stay-logged-in-wording 
change wording from 'remember' to more understandable 'Stay logged in'
 2015-10-23 10:49:51 +02:00
Jenkins for ownCloud
a341e786dd [tx-robot] updated from transifex 2015-10-23 01:55:06 -04:00
Jan-Christoph Borchardt
aed9b2a626 change wording from 'remember' to more understandable 'Stay logged in' 2015-10-23 10:44:41 +13:00
Thomas Müller
7b5db9085d Merge pull request #19980 from owncloud/fix-deleted-ldap-user-sharing 
handle NoUserException in sharing code
 2015-10-22 17:53:15 +02:00
Volker Fröhlich
711e1235ea Expose syslog tag in the configuration 2015-10-22 17:42:55 +02:00
Thomas Müller
844c607a9a Merge pull request #19973 from owncloud/pear_archive_tar-1.4.1 
Bump 3rdparty for pear/archive_tar-1.4.1
 2015-10-22 17:42:02 +02:00
Morris Jobke
db25f41da8 handle NoUserException in sharing code 
* setup LDAP users
* share from an LDAP user
* delete that LDAP user
* log in as share recipient
* before: unhandled NoUserException
* after: NoUserEception is logged and share is not shown anymore
 2015-10-22 17:04:36 +02:00
Sergio Bertolin
64ea35af05 added tests for apps 2015-10-22 13:28:48 +00:00
Sergio Bertolin
5e9dc381b4 added test for getting users of a group being subadmin 2015-10-22 12:15:51 +00:00
Roeland Jago Douma
ac41d3d74d Bump 3rdparty for pear/archive_tar-1.4.1 2015-10-22 12:54:07 +02:00
Thomas Müller
dc32bf4594 Merge pull request #19967 from owncloud/assetic_1.3.1 
3rdparty bump for assetic-1.3.1
 2015-10-22 12:21:36 +02:00
Joas Schilling
e0a56317fa Fix "Call to a member function getUID() on boolean" in Crypt 2015-10-22 11:46:37 +02:00
Thomas Müller
e471600834 Merge pull request #19890 from owncloud/db-keep-shared-locks 
Keep shared locks until the end of the request so we can reuse them
 2015-10-22 10:43:00 +02:00
Thomas Müller
bbea8c3545 Merge pull request #19937 from owncloud/detailsview-donotopenonrename 
Do not display details bar after rename
 2015-10-22 10:42:15 +02:00
Thomas Müller
56fdb0ac93 Merge pull request #19935 from owncloud/issue-19916-settings-menu-hide-on-file-action 
Use the normal OC.menu JS for handling the Settings menu
 2015-10-22 10:42:02 +02:00
Thomas Müller
8ed0214818 Merge pull request #19931 from owncloud/fix-webui-upload-and-conflicts 
Fix file upload, conflict dialog, also in public link
 2015-10-22 10:41:48 +02:00
Roeland Jago Douma
5436ceff0c 3rdparty bump for assetic-1.3.1 2015-10-22 10:33:25 +02:00
Thomas Müller
ad4ef8d91c Merge pull request #19791 from owncloud/provisioning_api_adding_integration_tests 
Added more tests and fixed a problem with asort which was returning f…
 2015-10-22 10:16:10 +02:00
Thomas Müller
15ef39d5b9 Merge pull request #19952 from owncloud/share-dialogue-tests 
Add JS tests for share dialog
 2015-10-22 09:23:05 +02:00
Thomas Müller
06fdd94060 Merge pull request #19960 from owncloud/bump_pimple_3.0.2 
3rdparty bump for pimple-3.0.2
 2015-10-22 09:11:44 +02:00
Jenkins for ownCloud
c50bbb8cde [tx-robot] updated from transifex 2015-10-22 01:55:47 -04:00
Roeland Jago Douma
77f3c4e08a 3rdparty bump for pimple-3.0.2 2015-10-22 00:05:51 +02:00
Thomas Müller
e1e1f4fd99 Merge pull request #19930 from owncloud/sort_usernames 
[provisioning api] fix failing testcase
 2015-10-21 22:44:00 +02:00
Thomas Müller
b1b1f5debf Merge pull request #19920 from owncloud/pear-core-minimal-1.0.1 
3rdparty bump of pear-core-minimal
 2015-10-21 21:08:44 +02:00
Thomas Müller
e0516c215c Merge pull request #19954 from owncloud/remote-unrequired-dependencies 
Use IRequest's `getScriptName` functionality instead of $_SERVER
 2015-10-21 20:51:22 +02:00
Thomas Müller
0245cfb9d2 Merge pull request #19953 from owncloud/DeepDiver1975-patch-1 
Delete indie.json
 2015-10-21 20:26:13 +02:00
Roeland Jago Douma
9b64fa7b92 [provisioning api] losen test 
Since we have no control of how backends sort their list of users and we
also don't want to sort yet another time the test now just checks if the
correct number of elements is returned and if they are from the list of
group members.
 2015-10-21 20:05:14 +02:00
Lukas Reschke
23e22c52b0 Use IRequest's getScriptName functionality instead of $_SERVER['SCRIPT_NAME'] 2015-10-21 17:33:49 +02:00
Lukas Reschke
8133d46620 Remove dependency on ICrypto + use XOR 2015-10-21 17:33:41 +02:00
Thomas Müller
06c037f096 Delete indie.json 2015-10-21 17:31:22 +02:00
Tom Needham
e3ae453ee5 Fix line lengths in share dialog unit tests 2015-10-21 13:30:42 +00:00
Thomas Müller
f7f2a160dd Merge pull request #19918 from owncloud/send-begin-message 
Update: state which step we are going to start and warn if it might b…
 2015-10-21 14:52:19 +02:00