Lukas Reschke
52ba14ed05
Update .mailmap
2015-10-26 14:01:11 +01:00
Lukas Reschke
f2a7888c5c
Generate AUTHORS file from commits
2015-10-26 13:51:22 +01:00
Thomas Müller
9a7a45bc37
Merge pull request #20010 from owncloud/add-tests-auth-plugin
...
Add tests for Sabre Auth plugin + make getCurrentUser compatible
2015-10-26 12:59:24 +01:00
Thomas Müller
cb31a7cfc5
Merge pull request #20037 from owncloud/phpseclib-dev-to-2.0.0
...
Bump 3rdparty for phpseclib-2.0.0
2015-10-26 12:34:42 +01:00
Thomas Müller
7e3b4754f6
Merge pull request #20031 from owncloud/remove-dead-code
...
Remove dead code from autoloader
2015-10-26 11:07:56 +01:00
Thomas Müller
d4d954b2d9
Merge pull request #19982 from owncloud/fix-link-sharing-regression-master
...
Ensure the password is only hashed in case it's changed on the client…
2015-10-26 10:57:31 +01:00
Roeland Jago Douma
ff680f50b2
Bump 3rdparty for phpseclib-2.0.0
2015-10-26 10:42:54 +01:00
Thomas Müller
1f32a3e485
Merge pull request #20030 from owncloud/autoload-files-external-optimize
...
Use optimized autoloader for files_external
2015-10-26 08:42:28 +01:00
Jenkins for ownCloud
e6d64783a0
[tx-robot] updated from transifex
2015-10-26 01:55:04 -04:00
Lukas Reschke
ff1271c7f3
Remove dead code
...
Those variables are never written to. Thus this is dead code which should be removed.
2015-10-25 23:47:53 +01:00
Lukas Reschke
b678eadc43
Use optimized autoloader for files_external
2015-10-25 23:34:30 +01:00
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
Lukas Reschke
cddc9abc06
Add tests for Sabre Auth plugin + make getCurrentUser compatible
2015-10-23 17:30:47 +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
Roeland Jago Douma
9071e756a1
Fix for broken ajax/share.php endpoint
...
Even more code mess :(
All tests pass again. But I'm really not happy with this endpoint.
2015-10-23 09:24:03 +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
Thomas Müller
4f5ff9c105
Ensure the password is only hashed in case it's changed on the client - fixes #19950
2015-10-22 17:32:40 +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