Commit Graph

23289 Commits

Author SHA1 Message Date
Morris Jobke 0c058490f4 Merge pull request #14566 from owncloud/fix-avatars-in-master
Fix avatars in master
2015-02-27 15:41:40 +01:00
Joas Schilling c5a9bad919 Merge pull request #14567 from owncloud/node-check-fileinfo-interface
Add "throws" lines to calling methods and interface aswell
2015-02-27 15:15:09 +01:00
Lukas Reschke 5c2fafa05f Read from IRequest instead of reading twice
Potentially fixes https://github.com/owncloud/core/issues/14541 and https://github.com/owncloud/core/issues/14506
2015-02-27 14:22:35 +01:00
Thomas Müller 8abb80c642 Merge pull request #14565 from owncloud/more-https
Add more HTTPS endpoints
2015-02-27 03:31:08 -08:00
Joas Schilling 3a6a0501c4 Add "throws" lines to calling methods and interface aswell 2015-02-27 12:16:53 +01:00
Lukas Reschke 8818165e07 Fix avatars in master 2015-02-27 12:03:58 +01:00
Thomas Müller 7fe07e93fe Merge pull request #14437 from owncloud/node-check-fileinfo
Check if we have a proper fileinfo
2015-02-27 02:56:13 -08:00
Lukas Reschke b048e7129a Add more HTTPS endpoints
The doc server can now finally speak SSL...
2015-02-27 11:37:30 +01:00
Thomas Müller 1c6857d92c Merge pull request #14529 from owncloud/intuitive-version-check
Make version check work on the lowest common version denominator
2015-02-27 02:16:23 -08:00
Morris Jobke 06141ed95a Merge pull request #14563 from owncloud/LukasReschke-patch-1
Add notice about Travis Checks
2015-02-27 10:40:02 +01:00
Lukas Reschke b58455241b Add notice about Travis Checks
Maybe it helps in the future so we won't forget it again 🙈
2015-02-27 10:23:20 +01:00
Thomas Müller f72f9e0159 Merge pull request #14530 from owncloud/revert-14403
Revert "Updating license headers"
2015-02-27 00:39:29 -08:00
Thomas Müller 64138b0af5 Merge pull request #14561 from owncloud/fix-sftp
apply suggestions from @atmoz to fix SFTP setup
2015-02-27 00:02:39 -08:00
Jenkins for ownCloud d20061e5b1 [tx-robot] updated from transifex 2015-02-27 01:55:28 -05:00
Morris Jobke 63f5d7d3d6 apply suggestions from @atmoz to fix SFTP setup 2015-02-26 23:49:18 +01:00
Thomas Müller de47a1e329 Merge pull request #14550 from owncloud/gc-warning
Fix warning in filecache gc
2015-02-26 12:02:11 -08:00
Vincent Petry 1777609d47 Merge pull request #14532 from owncloud/defaultvalueforremoteid
Add default value for remote_id
2015-02-26 16:46:12 +01:00
Robin Appelman 5bb1a131e4 fix warning in gc 2015-02-26 16:42:41 +01:00
Lukas Reschke 9baf758150 Merge pull request #14503 from owncloud/quota-preventdatalossforfailedmove
Fix file move/copy when storage space is not enough
2015-02-26 16:35:13 +01:00
Morris Jobke 2d9886d1c3 Merge pull request #14527 from owncloud/clarify-link
clarify link on apps management to the dev documentation
2015-02-26 16:10:58 +01:00
Morris Jobke 18d43f7469 Merge pull request #14474 from owncloud/move-utf-8-check-to-setup
Move UTF-8 check to setup
2015-02-26 16:00:31 +01:00
Morris Jobke 522469614b Merge pull request #14505 from owncloud/dav-copy-fix
Fixes WebDAV copy
2015-02-26 15:42:53 +01:00
Morris Jobke 55b3f6b986 Merge pull request #13969 from raimund-schluessler/master
Append search results to custom container
2015-02-26 15:16:23 +01:00
Vincent Petry 232de3bdc0 Delete target file for unsuccessful copy/rename 2015-02-26 15:11:37 +01:00
Morris Jobke e21df9b99a update 3rdparty to current master 2015-02-26 15:11:03 +01:00
Morris Jobke 0c1e6fad6c Merge pull request #14300 from owncloud/commandbus
Add async command system to handle asynchronous operations
2015-02-26 15:10:13 +01:00
Morris Jobke 27fde80ee6 fix exception message 2015-02-26 15:08:30 +01:00
Vincent Petry 80e5ad3131 Bump up files_sharing version for schema update 2015-02-26 15:04:15 +01:00
Morris Jobke e887f7b9b7 clarify link on apps management to the dev documentation 2015-02-26 15:02:39 +01:00
Morris Jobke a183b5d7e2 Merge pull request #14208 from owncloud/oc-msg-remove-object-dependency
Remove dependency from arbitrary data object structure for easier usage
2015-02-26 14:57:21 +01:00
Morris Jobke 7b2b74d731 Merge pull request #14473 from owncloud/remove-uneeded-assignment
Remove uneeded assignment
2015-02-26 14:01:21 +01:00
Morris Jobke 62d54e4c2a fix files external test run and add common-tests option 2015-02-26 13:32:44 +01:00
Robin Appelman 541c8c092d Add unit test 2015-02-26 12:20:20 +01:00
Vincent Petry ba71ee6059 Add default value for remote_id
Fixes SQLite migration with non-null column.
2015-02-26 12:09:21 +01:00
Bernhard Posselt 876e8bcb55 add phpdoc 2015-02-26 11:49:51 +01:00
Bernhard Posselt 2987d4aec8 make version check work on the lowest common version denominator 2015-02-26 11:42:08 +01:00
Morris Jobke 06aef4e8b1 Revert "Updating license headers"
This reverts commit 6a1a4880f0.
2015-02-26 11:37:37 +01:00
Vincent Petry ae2f37ac06 Removed unused $node variable 2015-02-26 11:16:42 +01:00
Thomas Müller adc986f3e4 Merge pull request #14502 from owncloud/failing-mysql-master-tests
Failing mysql master tests
2015-02-26 01:48:37 -08:00
Joas Schilling fe8df31fa5 Sort the array to be sure 2015-02-26 09:13:09 +01:00
Jenkins for ownCloud 8a4fddeb4a [tx-robot] updated from transifex 2015-02-26 01:55:50 -05:00
Thomas Müller 7ba391cd5a Merge pull request #14468 from owncloud/af-db-cleanup
Clean up AppFramework database layer
2015-02-25 14:18:45 -08:00
Bernhard Posselt 59bbf27253 remove IDb interface from core class usage 2015-02-25 22:21:24 +01:00
Thomas Müller c62eb9d652 owncloud -> ownCloud 2015-02-25 22:21:24 +01:00
Bernhard Posselt 4e29a4d867 deprecate getters for deprecated class 2015-02-25 22:21:24 +01:00
Bernhard Posselt f993ed823e fix tabs and spaces 2015-02-25 22:21:24 +01:00
Bernhard Posselt aaf753bc9a fix mappertestutility 2015-02-25 22:21:24 +01:00
Bernhard Posselt 7b2fdbfb0b use IDBConnection and close cursors after insert/update/delete 2015-02-25 22:21:24 +01:00
Bernhard Posselt fb84e7d282 migrate to IDBConnection 2015-02-25 22:21:24 +01:00
Lukas Reschke 0720cf0ad1 Merge pull request #14494 from owncloud/fix-oracle-master
using Doctrine\DBAL\Connection::executeUpdate()
2015-02-25 21:43:51 +01:00