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

23579 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
169031d1c5 fix factory test 2015-03-11 15:07:59 +01:00
Robin Appelman
e1f2a6df94 Allow setting the watcher policy as mount option 2015-03-11 15:07:23 +01:00
Robin Appelman
7adda88786 Copy mount options to the storage 2015-03-11 15:06:48 +01:00
Robin Appelman
4f0f175f8b Allow getting all mount options as array 2015-03-11 15:06:12 +01:00
Robin Appelman
82a62fd249 Add test for storage factory 2015-03-11 15:06:12 +01:00
Robin Appelman
e5c8fd37df pass mountpoint to storage wrapper callback 2015-03-11 15:06:12 +01:00
Morris Jobke
dbade19362 Merge pull request #13839 from owncloud/issue/13678-improve-remote-domain-detection-in-sharedropdown 
Better finding the remote URL from user input in share dropdown
 2015-03-11 14:38:41 +01:00
Thomas Müller
cba3ec2c7f Setting oci as supported database 2015-03-11 14:29:22 +01:00
Joas Schilling
b1ff21ee28 Add a console command user:add to create users over the console 2015-03-11 14:22:23 +01:00
Morris Jobke
ad97ceb787 Merge pull request #13513 from owncloud/repair-legacystoragenofatalfail 
Do not abort when meeting unfixable legacy storages
 2015-03-11 13:32:33 +01:00
Lukas Reschke
8154ed4d2c Merge pull request #14791 from owncloud/fix-14516 
Adding a more meaningful message for sabre dav exception
 2015-03-11 12:52:18 +01:00
Thomas Müller
0d0f9a52d2 Merge pull request #14788 from cmeh/patch-3 
Correct "one invalid characters" to "one invalid character"
 2015-03-11 12:26:49 +01:00
Thomas Müller
b3bb65eae5 Merge pull request #14662 from owncloud/issue/14661-show-versions-in-occ-applist 
Add an option to include the installed app version in "occ app:list"
 2015-03-11 12:23:22 +01:00
Thomas Müller
0f3e36fdfd Adding a more meaningful message for sabre dav exception - fixes #14516 2015-03-11 11:53:31 +01:00
Bernhard Posselt
abb726c994 Merge pull request #14789 from owncloud/better-app-install-error-messages 
display app update error messages
 2015-03-11 11:28:28 +01:00
Joas Schilling
6a677ce8fe Do not make setupMounts() public just because of testing 2015-03-11 11:10:43 +01:00
Thomas Müller
3df1d9338e Merge pull request #14778 from owncloud/use-occ-setup-in-autotest-master 
Use occ to install ownCloud in autotest.sh
 2015-03-11 11:00:49 +01:00
Thomas Müller
ffe06ac5c7 display app update error messages - fixes #14611 2015-03-11 09:59:56 +01:00
cmeh
4a0c649c8a Correct "one invalid characters" to "one invalid character" 
Corrected "one invalid characters" to "one invalid character" in line 1575.
 2015-03-11 09:59:42 +01:00
Joas Schilling
560137ca23 Always include the installed app version in "occ app:list" 2015-03-11 09:47:41 +01:00
Joas Schilling
2af8fea2be Throw a RuntimeException in the cache aswell 2015-03-11 09:33:50 +01:00
Joas Schilling
981c60f5f5 Do not overwrite the active menu entry of the navigation 2015-03-11 09:27:28 +01:00
Thomas Müller
6c1a1234f8 Properly handle available databases at runtime and respect setup checks in command line as well 2015-03-11 09:27:12 +01:00
Thomas Müller
81fa9550a0 No need to restart the web server in cli mode 2015-03-11 09:27:12 +01:00
Thomas Müller
7181840665 Use occ to install ownCloud in autotest.sh 2015-03-11 09:27:12 +01:00
Morris Jobke
cfaee93552 Merge pull request #14783 from owncloud/dont-timeout-cron-master 
cron.php on cli has no time limitation - fixes #14481
 2015-03-11 09:23:22 +01:00
Joas Schilling
d1511cdbee Fix doc blocks of insertIfNotExists() method 2015-03-11 09:05:30 +01:00
Jenkins for ownCloud
01ea056ac8 [tx-robot] updated from transifex 2015-03-11 01:55:38 -04:00
Thomas Müller
b4cf6e62bf cron.php on cli has no time limitation - fixes #14481 2015-03-11 01:09:12 +01:00
Thomas Müller
1757d01604 Merge pull request #14640 from owncloud/rescanversionsonlyonce 
Only rescan versions once in trashbin
 2015-03-11 00:54:20 +01:00
Morris Jobke
9a9633f84f update 3rdparty master 2015-03-10 16:06:01 +01:00
Morris Jobke
f5a56355fd Merge pull request #14115 from owncloud/update-symphony-components 
update symphony components to 2.6.4
 2015-03-10 16:05:12 +01:00
Robin Appelman
bb97256a79 update symphony components to 2.6.4 2015-03-10 15:34:45 +01:00
Lukas Reschke
284bd6647c Merge pull request #14759 from owncloud/clean-up-code 
Clean-up code and use proper exception types
 2015-03-10 14:18:21 +01:00
Thomas Müller
4ffca58bc4 don't rely on \OCP\User::getUser() - it is not set properly in case of async operations 2015-03-10 11:47:52 +01:00
Thomas Müller
7cb6811a7b tearDown the filesystem right before setting it up again 2015-03-10 11:47:06 +01:00
Lukas Reschke
6dc59019af Merge pull request #14346 from owncloud/storage-based-path-validation 
adding storage specific filename verification
 2015-03-10 11:02:47 +01:00
Thomas Müller
214fa44400 Merge pull request #14534 from owncloud/add-child-src 
Add support for 'child-src' directive
 2015-03-10 10:30:44 +01:00
Robin Appelman
dcd2d7aff5 Add unit tests for external share mananger 2015-03-10 10:17:53 +01:00
Lukas Reschke
48243a2949 Allow iframes from same domain in share view 
This is required because the PDF Viewer itself is embedded using an iframe from the same domain. The default policy is blocking this.

Going on further, we have to come up with a solution in the future how to handle previews by applications, one example might be that they call their own endpoint and not the generic share page to allow applications to have full control over how to display previews.

Anyways, to test this behaviour use a decent newer browser (such as Chrome 41) and share a PDF file, obviously the PDF viewer needs to be enabled as well. Without this patch publicly shared PDF files should not get previewed and an error is thrown. (if it isn't then your browser is probably not obeying our Content-Security-Policy and you might consider switching to another one ;))
 2015-03-10 10:06:15 +01:00
Joas Schilling
87431605b8 Add test for UniqueConstraintViolationException on wrong key 2015-03-10 09:26:45 +01:00
Jenkins for ownCloud
e069d9d3f9 [tx-robot] updated from transifex 2015-03-10 01:55:39 -04:00
Thomas Müller
c8ed88f4d6 Merge pull request #14689 from owncloud/better-missing-resource-handling 
Log errors and create 404 in network list when a css or js is missing
 2015-03-09 23:33:25 +01:00
Thomas Müller
2f61884956 Merge pull request #14753 from owncloud/verify-csrf-token-earlier 
Verify CSRF token already in update.php and not the EventSource code
 2015-03-09 23:06:15 +01:00
Thomas Müller
89be55a672 let insertIfNotExist() throw the native DBALException - no need to hide the real exception 2015-03-09 22:37:49 +01:00
Thomas Müller
b966a4eb17 Adding unit test which shows insertIfNotExists to fall apart in certain situations 2015-03-09 22:37:49 +01:00
Joas Schilling
2747a83a49 Get the id before using it 2015-03-09 22:37:49 +01:00
Joas Schilling
3115d66d60 Better save then sorry 2015-03-09 22:37:49 +01:00
Joas Schilling
940163e16b insertIfNotExists() for storage insertion 2015-03-09 22:37:49 +01:00
Joas Schilling
c917ea183c Only check unique keys for the comparison on filecache insert & update otherwise 2015-03-09 22:37:49 +01:00