Arthur Schiwon
ce1318c9f1
LDAP Wizard: clear the cache on save so changes have immediate effect
2013-11-20 15:56:25 +01:00
Arthur Schiwon
ff9ecc8a51
LDAP Wizard: proper behaviour for raw filter input. remember the editing mode and compose filter only when desired.
2013-11-19 23:58:08 +01:00
Arthur Schiwon
98c9334175
LDAP Wizard: move raw login filter field from advanced tab to login filter tab for consistency
2013-11-14 18:29:18 +01:00
Thomas Müller
447e468d1a
Merge pull request #5850 from owncloud/oc_api_tests
...
Add unit tests for OC_API::mergeResponses and fix error with api returning incorrect status codes.
2013-11-14 07:58:51 -08:00
Frank Karlitschek
29e9f2833d
Merge pull request #5214 from owncloud/no_extra_slashes
...
Don't double-slash filenames at the root.
2013-11-14 07:53:51 -08:00
Thomas Müller
7e63722534
make use of data providers
2013-11-14 15:37:30 +01:00
Thomas Müller
19e03ef77f
Merge pull request #5827 from owncloud/avoid_preview_errors
...
Use dedicated OC_Image loader methods in previews
2013-11-14 05:52:51 -08:00
tomneedham
1449437c9e
Merge multiple failed third party responses when returning the result
2013-11-14 01:21:54 +00:00
tomneedham
bb182bbfb2
Merge multiple shipped failures before responding.
2013-11-14 01:19:46 +00:00
tomneedham
ca5c39a3a1
Return failed shipped responses over succedded shipped responses
2013-11-14 01:14:37 +00:00
tomneedham
5a2d700866
Fix type in unit test
2013-11-14 01:11:22 +00:00
tomneedham
a39f3fdbf9
Return result object when only one successful response is returned
2013-11-14 01:10:56 +00:00
tomneedham
790055571d
Update lib/private/api.php after merge conflict
2013-11-14 01:00:14 +00:00
tomneedham
b06682b7fb
Merge branch 'ocs_api_fix_success_code' into oc_api_tests
2013-11-14 00:41:04 +00:00
tomneedham
00944a376a
Merge branch 'master' into oc_api_tests
2013-11-14 00:40:57 +00:00
tomneedham
959513fdc8
Add tests for OC_API::mergeResponses()
2013-11-14 00:40:09 +00:00
tomneedham
f19caeed33
Remove OC_App dependancy from OC_API::mergeResponses()
2013-11-13 22:46:24 +00:00
Frank Karlitschek
8d0d0836ba
Merge branch 'master' of https://github.com/owncloud/core
2013-11-13 19:43:18 +01:00
Frank Karlitschek
cd4a816c11
beta 4
2013-11-13 19:42:52 +01:00
Frank Karlitschek
58ff8a8673
Merge pull request #5805 from owncloud/shared-storage-copy-folder
...
Use View::copy and View::rename when copying or renaming files in the shared storage
2013-11-13 10:17:37 -08:00
Frank Karlitschek
15c4e4ed09
Merge pull request #5806 from owncloud/styles-fix-external_storage
...
Fix spacing issue for checkboxes, vertically center checkboxes on person...
2013-11-13 07:43:59 -08:00
Morris Jobke
5aae550b11
Merge pull request #5809 from owncloud/fix5753
...
LDAP Wizard: proper behaviour with anonymous bind, fixes #5753
2013-11-13 06:52:07 -08:00
Morris Jobke
408ce91b25
Merge pull request #5768 from owncloud/quota-workaroundwhenmissingrootsize-home-only
...
Do not use -1 as the size for the root folder of the home storage
2013-11-13 05:57:16 -08:00
Morris Jobke
ac0e87b1cc
Merge pull request #5831 from owncloud/files-charatissue
...
Fixed total dirs/files message hiding condition
2013-11-13 05:22:48 -08:00
Vincent Petry
3fa651f2b1
Merge pull request #5447 from owncloud/fixing-5117-master
...
No data corruption duriing parallel upload
2013-11-13 02:59:34 -08:00
Vincent Petry
5bdfccfc47
Fixed total dirs/files message hiding condition
...
Fixes #5829
2013-11-13 10:53:16 +01:00
Tom Needham
17e45e2002
Pick any none 100 status code before defaulting to 100
2013-11-13 00:45:49 +00:00
Thomas Tanghus
ec51825d31
Use dedicated OC_Image loader methods
...
This prevents excessive logging and disk access
2013-11-13 00:36:42 +01:00
Vincent Petry
34c92f6656
Now using HomeStorage for legacy home storage ids
...
Legacy home storage ids with the format "local://path/to/datadir/user1"
are now also wrapped by the HomeStorage.
2013-11-12 18:01:02 +01:00
Bjoern Schiessle
77429c28fd
rename fixPartialFilePath() to stripPartialFileExtension(), this name describes better what the method actually does
2013-11-12 16:48:24 +01:00
Vincent Petry
1a65e3a725
Now calling parent method when path is not root
2013-11-12 16:15:44 +01:00
Robin Appelman
32a703ab36
Do not use -1 as the size for the root folder of the home storage
2013-11-12 16:15:43 +01:00
Morris Jobke
dc30056025
Merge pull request #5822 from owncloud/delete_hooks_trash_and_versions
...
Implement delete hooks for trashbin and filesversions apps.
2013-11-12 07:03:37 -08:00
Georg Ehrke
49cd5dad24
add trash bin and file versions delete hooks in OC::registerPreviewHooks
2013-11-12 14:08:55 +01:00
Georg Ehrke
238e4bc3eb
implement delete hooks in file versions lib
2013-11-12 14:06:32 +01:00
Georg Ehrke
90fac1f371
replace $path with '/files_trashbin/files/' . $file
2013-11-12 14:03:50 +01:00
Georg Ehrke
feee4b865b
add delete hook for trash bin app
2013-11-12 14:00:36 +01:00
Morris Jobke
a745901d50
Merge pull request #5810 from owncloud/disbaledtextareas
...
Disabled textareas should look like they are disabled
2013-11-12 02:34:51 -08:00
Morris Jobke
c9517c4fc8
new line for css rule
2013-11-12 11:31:58 +01:00
Bjoern Schiessle
fcbb5d6cb3
missed some replacements... now tests should work
2013-11-12 11:17:34 +01:00
Thomas Müller
735752f232
Merge pull request #5816 from Wikinaut/patch-1
...
Update config.sample.php
2013-11-12 02:12:06 -08:00
Bjoern Schiessle
9f10f15fd4
fixing tests for the new part file handling
2013-11-12 10:24:10 +01:00
Wikinaut
63952aaeab
Update config.sample.php
...
/* Enable maintenance mode to disable ownCloud
If you want to prevent users to login to ownCloud before you start doing some maintenance work,
you need to set the value of the maintenance parameter to true.
Please keep in mind that users who are already logged-in are kicked out of ownCloud instantly.
*/
2013-11-12 00:59:35 +01:00
Arthur Schiwon
5c31440dcd
Disabled textareas should look like they are disabled
2013-11-11 19:41:51 +01:00
Arthur Schiwon
550f2d0089
LDAP Wizard: make UI behaviour more consistent and more pleasant when determining Base DN
2013-11-11 19:27:38 +01:00
Arthur Schiwon
082357a670
LDAP Wizard: remove ugly whitespace where it should not be
2013-11-11 19:25:20 +01:00
Morris Jobke
913cde816f
Fix spacing issue for checkboxes, vertically center checkboxes on personal page
2013-11-11 18:03:57 +01:00
Robin Appelman
a2015ee065
Use View::copy and View::rename when copying or renaming files in the shared storage
2013-11-11 17:58:20 +01:00
Bjoern Schiessle
802213f7ec
let encryption app detect transfer id in path and handle it correctly
2013-11-11 17:47:59 +01:00
Bjoern Schiessle
68f3f2e691
make it possible to detect transferID part
2013-11-11 17:47:46 +01:00
