9fbccc83e3
merge master into single-user-mode
2013-11-25 21:25:04 +01:00
844b4785f1
Merge pull request #6034 from owncloud/fix-api-documentation
...
Fix api documentation
2013-11-25 11:17:16 -08:00
4626fae882
Merge pull request #6038 from owncloud/occ-app-enable
...
add occ commands for enabling and disabling apps
2013-11-25 10:12:49 -08:00
c3e34676ba
Improved unit test for "overwrite on move"
...
Now using a different content to make sure the file was overwritten.
2013-11-25 18:54:58 +01:00
af7118aa5d
Added unit test for "overwrite file on rename/move"
...
Also fixed "rename" unit test that was ready the result out of the wrong
file.
2013-11-25 18:52:14 +01:00
944d4156bf
Fixed FTP storage unit tests to use the correct class
2013-11-25 18:44:34 +01:00
abe63bd329
Add occ command to list all apps
2013-11-25 17:34:16 +01:00
fc1d897ea5
rename app_id to app-id
2013-11-25 17:28:01 +01:00
4b67d4258d
Merge pull request #6035 from owncloud/fixing-rawpath-reverseproxy-oc6
...
Fixing rawpath reverseproxy oc6
2013-11-25 08:21:33 -08:00
a42d152ac3
Merge pull request #6037 from owncloud/fix-6007-oc6
...
adding chunked upload handling
2013-11-25 08:16:45 -08:00
1fdd2ac7ee
adding documentation for registerRoutes()
2013-11-25 17:15:08 +01:00
a5bfa6b1c3
Merge pull request #6040 from owncloud/fix-navbar-css
...
Fix navbar issue
2013-11-25 08:10:57 -08:00
4dc35909b5
Fix navbar issue
...
fixes #6024
2013-11-25 17:04:19 +01:00
f8fcd567a7
move files to owners trash
2013-11-25 16:51:31 +01:00
b3e7e54c8d
fix some capital letters
2013-11-25 16:42:28 +01:00
4e0fa85307
page level doc blocks and class descriptions
2013-11-25 16:39:01 +01:00
bc8cc9142e
AppFramework(Controller|HTTP|HTTP-Responses|Middleware), IContainer API fixes
2013-11-25 16:28:24 +01:00
019f3299b0
Merge pull request #6030 from owncloud/cli-errors
...
provide more cli friendly error messages when in cli mode
2013-11-25 07:06:48 -08:00
a609a53647
add documentation for single user config option to config.sample.php
2013-11-25 16:01:42 +01:00
1bcb04f94e
Add template for single user mode message
2013-11-25 15:59:37 +01:00
27cc333dfe
adding chunked upload handling
2013-11-25 15:35:26 +01:00
a324c09e6c
Add occ command to enable and disable single user mode
2013-11-25 15:27:05 +01:00
71c1327691
Add "single user mode" which restricts access to users in the admin group
...
This can be enabled by setting 'singleuser' to true in config.php
2013-11-25 15:08:24 +01:00
b9fed935b4
in case uri and script name don't match we better throw an exception
2013-11-25 14:42:34 +01:00
248eed16a6
fix defaults.php doc
2013-11-25 14:26:26 +01:00
31d0ba0344
Merge pull request #5641 from owncloud/filestrash-emptytrash
...
Deleting all files in trash now only sends a single flag
2013-11-25 05:24:11 -08:00
a0a665ea45
handle duplicate slashes in case of reverse proxy configuration
2013-11-25 14:21:51 +01:00
7f47cc062c
fix defaults.php doc
2013-11-25 14:13:58 +01:00
2d2af90fce
Merge pull request #6028 from owncloud/extstorage-touchoperationreturnvalue
...
Fixed ext storage touch function to return true on success
2013-11-25 05:08:24 -08:00
b7ddc78626
fix db.php doc
2013-11-25 14:06:25 +01:00
d3bfb433d1
add occ commands for enabling and disabling apps
2013-11-25 13:20:16 +01:00
317d421874
provide more cli friendly error messages
2013-11-25 13:04:23 +01:00
d88025bf6b
Fixed ext storage touch function to return true on success
...
Some ext storage impl didn't return true on success.
Fixes #5943 (Dropbox)
Fixes #6010 (WebDAV)
2013-11-25 12:44:27 +01:00
993fea2f05
fix appframework routing
2013-11-25 11:36:33 +01:00
1b0c5e57e5
Fixed SMB rename function to overwrite target file
...
When uploading files through WebDAV, a part file is created and a rename
operation is performed with the expectation that the part file
overwrites an existing file, if any.
This fix makes the SMB external storage delete the target file before
renaming, as smbclient doesn't support overwrite on move/rename.
Fixes #5348
2013-11-25 11:17:38 +01:00
de2b444030
Merge pull request #5960 from owncloud/enc_small_visual_improvements
...
[encryption] some small visual improvements
2013-11-25 02:12:31 -08:00
15f7315231
Merge pull request #6025 from owncloud/typo
...
fix typo
2013-11-25 02:12:09 -08:00
f1f172e16e
fix typo
2013-11-25 11:09:31 +01:00
49038545f8
Merge branch 'encryption_work_with_public_gallery' of github.com:owncloud/core into encryption_work_with_public_gallery
2013-11-25 10:29:53 +01:00
9c4b8ae54c
fix typo in comment
2013-11-25 10:29:05 +01:00
b82146eeee
Merge pull request #5991 from owncloud/extstorage-mountpointvalidation
...
Prevent using root as mount point for external storage
2013-11-25 00:30:06 -08:00
60e2ee631a
Merge pull request #5998 from owncloud/navigation-fix
...
Doesn't Cut the top arrow from navigation
2013-11-24 15:02:56 -08:00
1a69079139
Merge pull request #6021 from owncloud/show_build
...
Show build number
2013-11-24 15:01:11 -08:00
2a465fb20f
Merge branch 'master' into encryption_work_with_public_gallery
2013-11-24 23:20:46 +01:00
a2d4cd87d0
Merge pull request #5874 from owncloud/fix-5845
...
Fix file uploads on Windows with SQL Server
2013-11-24 14:15:17 -08:00
45db67d174
Merge pull request #6018 from owncloud/fix_overwritehost
...
fix overwrite host support and make the code a bit more readable
2013-11-24 14:02:51 -08:00
f6df4b349f
remove logic from template and fix syntax error
2013-11-24 21:27:32 +01:00
228f1788fa
add new function to generate the human readable version string based on version, channel and build number
2013-11-24 21:26:34 +01:00
229630f14c
adding simple unit test to test scriptName() under overwrite condition
2013-11-24 21:19:06 +01:00
6229f457d0
update PHPDoc
2013-11-24 21:18:14 +01:00
Robin Appelman
Owen Winkler
icewind1991
Vincent Petry
Jörn Friedrich Dreyer
Thomas Müller
Raghu Nayyar
Morris Jobke
Bjoern Schiessle
Björn Schießle