3fa651f2b1
Merge pull request #5447 from owncloud/fixing-5117-master
...
No data corruption duriing parallel upload
2013-11-13 02:59:34 -08:00
17e45e2002
Pick any none 100 status code before defaulting to 100
2013-11-13 00:45:49 +00:00
ec51825d31
Use dedicated OC_Image loader methods
...
This prevents excessive logging and disk access
2013-11-13 00:36:42 +01:00
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
1a65e3a725
Now calling parent method when path is not root
2013-11-12 16:15:44 +01:00
32a703ab36
Do not use -1 as the size for the root folder of the home storage
2013-11-12 16:15:43 +01:00
53f17a71d1
treat numeric as an alias for decimal
2013-11-12 13:55:20 +01:00
4b01eaf6cc
changed type to decimal
2013-11-12 13:47:47 +01:00
dcca887f18
Don't set a default value when there isn't a default specified
2013-11-11 17:58:25 +01:00
68f3f2e691
make it possible to detect transferID part
2013-11-11 17:47:46 +01:00
99ee95d46c
Added missing escaping
2013-11-11 15:41:03 +01:00
55331479cd
Merge pull request #5701 from owncloud/sharing-updateownerfoldersizes
...
Fixed watcher to also update the owner's folder sizes
2013-11-11 06:16:51 -08:00
b278356eb9
DB: Set correct default value for numeric types
...
Set 0 as default value for columns with numeric data type instead of the
empty string ''. Otherwise the database complains about an invalid
default value for this column.
To reproduce put the following in your ````appinfo/database.xml````:
````
<field>
<name>modified</name>
<type>decimal</type>
<default/>
<notnull>true</notnull>
<length>15</length>
</field>
````
See owncloud/mozilla_sync#14
2013-11-10 14:15:33 +01:00
df288605d4
Fixed undefined variable error when using avconv
2013-11-10 11:46:46 +01:00
a8f6a2446c
Merge pull request #5759 from owncloud/fixing-5757-master
...
adding proper htaccess commands for Apache 2.4
2013-11-09 23:13:17 -08:00
b5e013973b
implementing solution using <ifModule mod_authz_core>
2013-11-08 17:29:14 +01:00
a6d8854d2a
Make working en_US.UTF-8 locale a hard requirement
2013-11-08 14:30:08 +01:00
4b5083e3ca
Fixed the rebellous space, replaced with a tab
2013-11-08 12:27:53 +01:00
0c6af55112
Added ffmpeg fallback when avconv is not available
...
On some distros, avconv isn't available yet.
This fix adds a fallback to ffmpeg.
When none is found, no error message is displayed in the console any
more.
Fixes #5745
Also, this now uses exec() instead of shell_exec() to be able to get the
return code.
The binary path found with "which" is now used to prevent further FS
binary lookup when running the commands.
Moved the "-ss" parameter before "-i" for ffmpeg.
2013-11-08 12:19:32 +01:00
f93dcc5d77
the filesystem has to be initialized once we know the user
2013-11-08 11:24:19 +01:00
9c8b1e1775
adding proper htaccess commands for Apache 2.4
2013-11-08 10:45:35 +01:00
4459d964d6
Merge pull request #5747 from owncloud/scanner-post-hooks
...
Add post hooks for filesystem scanner
2013-11-07 12:44:23 -08:00
013444813e
Now removing stray old cookies from 5.0.12
...
Cookies from 5.0.12 seemed to have an extra slash in the path.
Firefox doesn't allow to remove them if the trailing slash isn't
there,
thus making it impossible to logout correctly.
This fix adds extra code to delete such stray cookies.
Ported from stable5 branch 99e5c6f7eb
2013-11-07 18:49:50 +01:00
d6845babd6
Add post hooks for filesystem scanner
2013-11-07 16:22:29 +01:00
bcd776b0c0
Fix a regression (Tags→TagManager)
2013-11-07 12:51:03 +01:00
4ac05e071a
Remove duplicate getAvatarManager()
2013-11-07 12:48:41 +01:00
507325dd50
Add public API for \OC\Avatar
2013-11-07 12:48:40 +01:00
7c89309e26
Merge pull request #5691 from owncloud/switch-to-oc6-documentation
...
move to oc6 documentation
2013-11-05 08:22:26 -08:00
e3868ba118
Fixed watcher to also update the owner's folder sizes
...
Note that the root folder size is mandatory for quota calculation.
2013-11-05 13:58:14 +01:00
08c8bf5a7b
decode arguments as array
2013-11-05 10:30:18 +01:00
3488202f67
Merge pull request #5582 from owncloud/files-previewcaching
...
Append file etag to preview URLs
2013-11-05 01:21:51 -08:00
f91fe8d595
Merge pull request #5673 from owncloud/oc6-windows-server-mssql-master
...
Oc6 windows server mssql master
2013-11-05 00:41:11 -08:00
d48ba5a5bf
Merge pull request #5540 from owncloud/scanner-enhancments-master
...
Scanner enhancments master
2013-11-04 23:58:42 -08:00
01f2b7eb3a
move to oc6 documentation
2013-11-04 22:50:12 +01:00
8274d9f91c
Inherit lastInsertId() from Adapter.
2013-11-04 22:28:41 +01:00
c3898061a8
Merge pull request #5544 from owncloud/fixing-3593-2-master
...
Add FileId header and switch fileid and instance id
2013-11-04 04:30:12 -08:00
0f266d0f62
set log level to DEBUG
2013-11-04 12:58:30 +01:00
e37047b2a0
WIN: fixing Fatal error: Call to a member function logicToPhysical() on a non-object in C:\jenkins2\workspace\server-stable5-windows\database\mssql\label\WINDOWS\lib\files\storage\mappedlocal.php on line 311
2013-11-02 20:22:12 +01:00
5ecebe211b
mssql: fixing lastInsertId() implementation
2013-11-02 20:21:19 +01:00
eb3c5070c0
replace template function link_to_docs() with \OC_Helper::linkToDocs()
2013-11-02 19:11:46 +01:00
fad2149e3f
Merge pull request #5551 from owncloud/fix-5202-master
...
When updating an appstore app, execute a database update
2013-10-31 11:10:28 -07:00
ae469b67a0
Merge pull request #5637 from owncloud/fix_privatedata
...
Fix privatedata
2013-10-31 10:26:47 -07:00
b4cdac0a60
Merge pull request #5591 from owncloud/home-storage
...
Make home folders movable without requiring rescans
2013-10-31 10:20:03 -07:00
d6ddb12c20
Get rid of the SELECT query. Try UPDATE, on failure INSERT.
2013-10-31 16:04:18 +01:00
aae6e76926
fixing undefined index in delete()
2013-10-31 10:24:28 +01:00
64d0b0d184
PHPDoc comment updated - checkLoggedIn() removed
2013-10-31 10:21:17 +01:00
0cec17ba87
no need to check if the user is logged in
2013-10-31 10:14:06 +01:00
47da2ef8db
fixing php notice: Undefined index key
2013-10-31 10:02:18 +01:00
b2929de0a7
no need to check if the user is logged in - this is already done in the ocs dispatcher itself
...
adding @return
2013-10-31 09:58:18 +01:00
64bfd21ccd
Merge branch 'master' into fix_privatedata
2013-10-31 09:05:35 +01:00
3f42c890be
we should check if a user is logged in before we check for admin privilege
2013-10-30 22:59:31 +01:00
261cd87efa
Merge branch 'master' into home-storage
2013-10-30 22:11:19 +01:00
c1730d241c
Merge pull request #5615 from owncloud/fixing-5614-master
...
http header OCS-ApiRequest: true is required in case of session based OC...
2013-10-30 13:12:16 -07:00
cba12e009f
Added missing HTTP prefix to the $_SERVER variable
2013-10-30 21:07:19 +01:00
330d026be7
fix the privatedata key value store
2013-10-30 19:36:29 +01:00
c9f3f2874f
Merge branch 'master' into update-parent-storage-mtime
...
Conflicts:
lib/private/files/cache/updater.php
2013-10-30 13:41:10 +01:00
de342a5ac7
Merge pull request #5603 from owncloud/fix_file_cache_updater_master
...
Fix file cache updater (backport to master of #5513 )
2013-10-30 02:31:08 -07:00
3d42e402c5
http header OCS-ApiRequest: true is required in case of session based OCS API calls
2013-10-29 23:07:27 +01:00
e1e4c7c214
Merge branch 'master' into fix_file_cache_updater_master
2013-10-29 17:47:33 +01:00
e08f38f99b
Merge pull request #5605 from owncloud/fix_delete_user
...
remove user from cache if he was deleted successfully
2013-10-29 09:46:21 -07:00
e0bc89c87f
Merge pull request #5577 from owncloud/fix_urlgenerator_imagepath
...
use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace
2013-10-29 09:29:29 -07:00
0d7d396d80
make sure that also the storage etag gets changed
2013-10-29 16:30:47 +01:00
f021dad204
remove user from cache if he was deleted successfully
2013-10-29 15:50:33 +01:00
a80ac9c492
make getUidAndFilename() private
2013-10-29 15:10:02 +01:00
fcfac51aa1
backport of https://github.com/owncloud/core/pull/5513
2013-10-29 15:08:12 +01:00
b3626f34cd
Update the parent folders storage_mtime on write and delete to prevent rescans
2013-10-29 14:18:57 +01:00
b3e39dd3d9
Map empty mimetypes to octet-stream for Oracle DBMS.
2013-10-29 14:18:42 +01:00
fa6ae81149
Return early if fileinfo is there.
2013-10-29 13:48:30 +01:00
68d13210bd
Reset mimetype to application/octet-stream on empty reply from file command.
2013-10-29 13:29:35 +01:00
0e92a4896d
dont use the home storage for non-existing users
2013-10-29 13:12:28 +01:00
a04a01d51f
Do not calculate $isWrapped if not needed.
2013-10-29 12:54:30 +01:00
aaefb64306
Merge pull request #5493 from owncloud/fix-language-detection
...
Fix HTTP language detection
2013-10-28 16:37:12 -07:00
e273c14540
use the new home storage backend when no existing local storage backend exists for the user's home
2013-10-29 00:26:35 +01:00
f1e6e80eb1
add specialized storage backend for home folders
2013-10-29 00:14:23 +01:00
db0fa6c529
use getHome() to delete users data
2013-10-29 18:01:37 +01:00
682d6e8a80
use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace
2013-10-28 14:18:20 +01:00
e62ca4ea4f
Append file etag to preview URLs
...
Fixes #5534
2013-10-28 14:14:55 +01:00
4750fbc226
Merge pull request #5550 from owncloud/fix-4716-master
...
'Update to' is shown when there is no update
2013-10-28 03:33:27 -07:00
78971c61e6
update documentation for app update
2013-10-28 11:27:51 +01:00
466b6c1ee0
local user backend shall search for both username and displayname, fixes #5401
2013-10-25 21:57:12 +02:00
ebcd9ae628
Added comment for clarification about fseek() call in quota.php
2013-10-25 16:15:01 +02:00
b6c67c4c63
'Update to' is shown when there is no update
...
See #4716
2013-10-25 15:41:59 +02:00
310c8400df
When updating an appstore app, execute a database update
...
See #5202
2013-10-25 15:38:08 +02:00
c455cb989b
add header 'OC-FileId' on PUT
2013-10-25 13:20:59 +02:00
3bca1519ee
switch instance id and file id
2013-10-25 13:20:29 +02:00
8253994262
using array_diff_assoc to detect diffs in values as well
2013-10-25 12:40:31 +02:00
f619f59f1c
cast storage_mtime to int
2013-10-25 12:39:50 +02:00
c8df27de73
Fixed quota stream to not wrap read-only fopen calls
2013-10-25 12:33:16 +02:00
d8b245490b
Fixed quota stream's fseek method
...
- Added missing return statement
- Added missing support for SEEK_END
- Fixes #5524
2013-10-25 12:09:46 +02:00
66813e9df6
Merge branch 'master' into fix-language-detection
2013-10-24 19:27:33 +02:00
222f1b8da2
Merge pull request #5494 from owncloud/fixing-3593-master
...
introducing new dav property {xmlns:oc="http://owncloud.org/ns }id
2013-10-24 09:41:56 -07:00
c5b8963b18
log the data arrays
2013-10-24 18:13:21 +02:00
a22f12cfe0
- fixing namespace
...
- remove property only if present
2013-10-24 14:40:43 +02:00
88d1e20d56
some logging added ....
2013-10-24 14:24:56 +02:00
808e9b0f51
Merge pull request #5402 from owncloud/fixing-5367-master
...
fixes chunked upload
2013-10-24 00:56:46 -07:00
db70b18c1d
Merge pull request #5496 from owncloud/prefer_png_from_theme_over_core_svg
...
prefer logo png from theme over svg from core
2013-10-23 14:44:43 -07:00
caa3a8d784
Merge pull request #5464 from owncloud/fixing-5456-master
...
Fixing 5456 master
2013-10-23 10:50:36 -07:00
54e0f1d739
fixing PHPDoc & grammar
2013-10-23 19:06:36 +02:00
3d5e229ac5
Merge pull request #5442 from owncloud/extstorage-ignoreduplicateinserts
...
Ignore duplicate inserts in file cache and mime type
2013-10-23 07:47:50 -07:00
0bf034da96
prefer logo png from theme over svg from core
...
The logo images are specified in the php templates with eg `image_path('', 'logo-wide.svg')`. If that file exists the correct path will be served to the client in the html template. Then the `SVGSupport()` is checked in https://github.com/owncloud/core/blob/master/core/js/js.js#L701 which will replace `svg` with `png` in img tags and css background definitions.
fixes #5074
partially solves #5421 , but not when an svg has been specified in css and is then 'fixed' by js to point to a png which does not exist in the theme but is then might be resolved to an image from core .... well theoretical problem ... might not even be a problem
@karlitschek @jancborchardt please review
2013-10-23 16:44:56 +02:00
b02a485712
handle case where fileid is not set
2013-10-23 16:40:29 +02:00
b60ae11db8
introducing new dav property {xmlns:oc=" http://owncloud.org/ns }id
2013-10-23 16:03:57 +02:00
06f2ae082e
Have to also strtolower() on available language name. Otherwise no match.
2013-10-23 15:39:50 +02:00
daf93c4516
Sort, so 'de' is preferred over 'de_DE' when performing non-exact matching.
2013-10-23 15:38:54 +02:00
c14b470ea2
Apply substring on the correct value.
2013-10-23 15:38:22 +02:00
959b0f9125
Merge pull request #5458 from owncloud/fixing-5222-master
...
php 5.3 compatibility regarding OC\DB\Connection fixed
2013-10-23 05:35:33 -07:00
a542c57a7b
Catch duplicate insertion errors while scanning files
...
When two scanning processed run at the same time, for example when
scan.php and list.php were called at the same time on an external
storage mountpoint, duplicate insertion errors can occurs.
These errors are now logged and ignored.
Since both scans are running in parallel transactions, they don't see
each other's changes directly in the DB which can cause duplicate
insertion errors for mime types as well, but those mime types can't be
selected yet. The solution to this is to force-reload the mimetypes list
after the transaction is finished.
Fixes #5199
2013-10-23 13:00:46 +02:00
4c76dd3871
Better variable names.
2013-10-23 12:56:51 +02:00
207f6d55ce
Fix coding style for else.
2013-10-23 12:39:12 +02:00
3c710696e8
add missing file header
2013-10-23 12:27:54 +02:00
9d1b425b62
Correct indentation for default language.
2013-10-23 12:25:48 +02:00
2d14daf36b
Merge pull request #5472 from owncloud/enc_init_status_on_enable
...
Encryption set init status on enable
2013-10-23 01:02:45 -07:00
4bf37f72b2
Merge pull request #5482 from owncloud/fix_weird_http_namespace
...
Fix namespace for OCP\Appframework\Http
2013-10-23 00:40:30 -07:00
cf61b1a977
Merge pull request #5391 from owncloud/undefined-property-in-schema-master
...
removing pointless calls on quoteIdentifier() - reason: name on $tableDi...
2013-10-22 22:46:43 -07:00
ad017285e1
Fix namespace for OCP\Appframework\Http
...
To avoid having to use OCP\Appframework\Http\Http in the public - and stable
- API OCP\Appframework\Http is now both a class and a namespace.
2013-10-23 05:57:34 +02:00
064fd5ae53
Merge pull request #5451 from owncloud/reuse-session-ocs-master
...
Support existing sessions within OCS API calls
2013-10-22 14:41:21 -07:00
09903aa36c
- delete properties on node delete
...
- move properties on node move
2013-10-22 19:41:26 +02:00
bd450d6f6b
add post_enable hook if a app gets enabled
2013-10-22 16:15:19 +02:00
6e0e621218
creating and deleting of file and folder 'Shared' in root is not allowed
2013-10-22 11:10:07 +02:00
cadd71ec8a
Merge pull request #5455 from owncloud/fixing-2423-master
...
introduce link_to_docs() and migrate links
2013-10-22 01:28:43 -07:00
9d976013da
Merge pull request #5437 from owncloud/create-custom-logfile
...
Try to create custom log file before falling back to default.
2013-10-22 01:17:31 -07:00
7f1432600c
fixing php 5.3.3 error:
...
Undefined variable: this
lib/private/appframework/dependencyinjection/dicontainer.php:92
2013-10-22 09:29:17 +02:00
87a09156f8
use OC_Helper::linkToDocs() in lib/private/config.php
2013-10-21 23:08:09 +02:00
e30e4ea1cc
php 5.3 compatibility regarding OC\DB\Connection fixed
2013-10-21 22:51:56 +02:00
408e0022dd
Merge pull request #5249 from owncloud/activities-api
...
[OC6] Activities api
2013-10-21 13:21:17 -07:00
124984905e
introduce OC_Helper::linkToDocs()
2013-10-21 22:01:27 +02:00
97aff7c64e
Use quoteIdentifier with proper objects
2013-10-21 22:31:57 +03:00
148d2616e5
introduce link_to_docs() and migrate links
2013-10-21 21:29:45 +02:00
66a2f3b0b9
New OCS route:
...
/ocs/cloud/user
Response:
<?xml version="1.0"?>
<ocs>
<meta>
<status>ok</status>
<statuscode>100</statuscode>
<message/>
</meta>
<data>
<id>thomas</id>
<display-name>DeepDiver</display-name>
<email>no-response@domain.tld</email>
</data>
</ocs>
2013-10-21 20:14:18 +02:00
581cd9bb9c
Support existing sessions within OCS API calls
2013-10-21 18:58:46 +02:00
2628601e79
adding oc-mtime handling to chunked upload
2013-10-21 15:00:28 +02:00
3cb666ad77
chunked files are assembled into a part file on the target storage followed by an atomic rename operation.
2013-10-21 13:21:39 +02:00
5978ddbec6
Try to create custom log file before falling back to default.
2013-10-20 23:58:07 +02:00
701009bd72
dispayNamesInGroup(s) should always return uid as key in the result attr, fixes #5209
2013-10-20 20:55:27 +02:00
9e99f9d13d
the logfile shoudn't be world readable.
2013-10-18 17:15:02 +02:00
1f1fcc6129
Remove "link" shares right after disabling the "allow_link_share" setting
2013-10-18 11:37:13 +02:00
5c5621d84e
Merge pull request #5395 from owncloud/more_check_options
...
add options to disable the check for a working .htaccess file in data
2013-10-18 01:23:20 -07:00
11cfb9dc48
Merge pull request #5358 from owncloud/postinstall-ocdavclientwithtimeout
...
Added timeout for WebDAV post setup check
2013-10-18 01:10:04 -07:00
b1f72edc57
Fixed spaces
2013-10-17 23:22:19 +02:00
d2d2c9a46d
fixes #5367
2013-10-17 20:20:13 +02:00
6a60a47d59
add options to disable the check for a working .htaccess file in data and for a working WebDAV server. This are advanced settings that are needed in special situations where our check fail and the user runs into an http timeout.
2013-10-17 16:27:43 +02:00
c3c27b3e58
Merge pull request #5394 from owncloud/sabre-server-location
...
Move OC_Connector_Sabre_Server to expected location.
2013-10-17 07:11:50 -07:00
5ee74b656c
Move OC_Connector_Sabre_Server to expected location.
2013-10-17 16:04:59 +02:00
4c5959e1f5
fix comment
2013-10-17 15:19:15 +02:00
e55d2359b1
removing pointless calls on quoteIdentifier() - reason: name on $tableDiff doesn't exist and my design the name cannot be changed
...
adding PHPDoc
2013-10-17 14:54:37 +02:00
521277b8b6
only call shell_exec if enabled
2013-10-17 14:31:07 +02:00
9c8d1190c0
Merge pull request #5385 from owncloud/generate-sql-migration-master
...
new console command to generate sql migration scripts
2013-10-17 04:53:18 -07:00
d2b1a361cc
Merge pull request #5379 from owncloud/undefined-shipped
...
fix undefined "shipped"
2013-10-17 04:37:40 -07:00
6e1881dbe4
new console command to generate sql migration scripts
2013-10-17 12:51:30 +02:00
793ccfd1df
fix undefined "shipped"
2013-10-17 11:35:13 +02:00
b70d67d49a
Merge pull request #5237 from owncloud/coverage-on-windows-master
...
PHP Code Coverage on windows master
2013-10-17 02:23:15 -07:00
186c6a56d1
Merge pull request #4949 from owncloud/improve_unknown_preview_backend
...
use svg to generate filetype icon if imagick available
2013-10-17 01:48:34 -07:00
04783da829
Merge pull request #5276 from owncloud/fixing-5170-master
...
only text/plain is now used to generate text previews
2013-10-16 14:21:40 -07:00
221a650815
Merge branch 'master' into activities-api
...
Conflicts:
lib/private/server.php
2013-10-16 21:15:25 +02:00
fdeef5e874
Merge branch 'master' into fixing-appframework-master
...
Conflicts:
lib/private/appframework/middleware/security/securitymiddleware.php
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
2013-10-16 15:45:55 +02:00
c3f7d22adc
Merge pull request #5067 from owncloud/urlParams_fix
...
Get urlParams registered before Request is instantiated
2013-10-16 06:42:09 -07:00
8c2b0b1394
Merge branch 'master' into activities-api
2013-10-16 15:36:35 +02:00
aca66270c7
accept text/markdown as well
2013-10-16 15:31:43 +02:00
d8a7b1e537
Merge branch 'master' into fixing-5170-master
2013-10-16 14:48:55 +02:00
fa3a65aea7
Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend
...
file system is now initialized with apache authentication as well
2013-10-16 04:23:45 -07:00
52e31405f7
Added timeout value to WebDAV post setup check
...
Fixes #5357
2013-10-16 12:34:22 +02:00
7037f9c6f8
Added DAV client wrapper that support timeout values
...
Since SabreDAV does not support passing a timeout value to curl, this
commit adds a subclass for it that will set the timeout value to
curlRequest().
2013-10-16 12:32:42 +02:00
ada94fb558
Merge pull request #5333 from owncloud/avater_with_encryption
...
avatars should also work with encryption after pr #5332 was merged
2013-10-16 01:34:05 -07:00
5f249e1a54
Prevent renaming/deleting mount points
...
Fixed permissions returned for mount points to not include update and
delete permissions.
Fixes #5291
2013-10-15 14:58:58 +02:00
25320f19df
Merge branch 'master' into avater_with_encryption
2013-10-15 11:53:51 +02:00
fa341e49a8
Merge pull request #5341 from owncloud/fix-logout-link-html
...
Fix logout link HTML.
2013-10-15 00:33:00 -07:00
e3489b36ff
any preview requiring the which command will not be used on Windows
2013-10-15 00:15:45 +02:00
06f9b7b862
Fix logout link HTML.
...
<a id="logout" href=/projects/owncloud/core/index.php?logout=true>
2013-10-14 22:31:13 +02:00
6df5c7ebd5
streamCopy() should return proper structure.
...
Callers of streamCopy() expect an array to be returned containing count and result.
2013-10-14 21:33:23 +02:00
3380bd650f
avatars should also work with encryption after pr #5332 was merged
2013-10-14 17:30:24 +02:00
c97b52090e
Merge pull request #4867 from owncloud/fixing-4546-master
...
Adding detection of aborted uploads for chunked uploads
2013-10-14 06:39:32 -07:00
5318df3b3c
there shall be tabs
2013-10-14 14:51:25 +02:00
fb3829e8b8
file system is now initialized with apache authentication as well
2013-10-14 14:46:43 +02:00
71601a7c6f
implement previews for markdown
2013-10-14 14:10:47 +02:00
258ccdfabe
case insensitive sort
2013-10-14 11:15:04 +02:00
a201a66878
fix style
2013-10-14 10:57:00 +02:00
a5e808defc
Merge branch 'master' into fixing-4546-master
...
Conflicts:
lib/private/connector/sabre/file.php
2013-10-14 10:56:50 +02:00
f06df170cb
finally fix the app sorting
2013-10-14 10:54:38 +02:00
14617682c8
Merge branch 'master' of github.com:owncloud/core into fix-unlogged-session-error
2013-10-12 09:15:59 +01:00
dc58195c7f
Merge pull request #5207 from owncloud/fixing-4011-part2-master
...
[OC6] file upload exception handling
2013-10-11 10:35:17 -07:00
cf7ea4bec5
Handle ownCloud logging when data dir not created
2013-10-11 17:16:37 +01:00
e28f7f8a33
remove php and js previews
2013-10-11 11:43:26 +02:00
d75d80ba13
OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller
2013-10-11 10:07:57 +02:00
51e6565aab
only text/plain is now used to generate text previews
...
blacklist implementation remove because no longer needed
2013-10-11 00:25:34 +02:00
19ea4f79da
resize svg without loosing quality
2013-10-11 00:12:37 +02:00
26c0007a5f
Merge pull request #5263 from owncloud/fixing-5255-master
...
Proper behavior of resolvePath()
2013-10-10 09:27:45 -07:00
bc6e352ccd
the path need to be normalized before putting it into resolvePath()
...
otherwise the returned internalPath will not match followup calls to e.g. Cache::getID()
2013-10-10 16:06:26 +02:00
1378af838c
merge master into hooks-view-same-start
2013-10-10 11:34:30 +02:00
1cb47bf777
Merge pull request #5221 from owncloud/fixing-5217-master
...
fixing php 5.3 compatibility
2013-10-10 01:55:18 -07:00
6053007768
Merge pull request #5210 from owncloud/sharing_search_users_fix
...
find users which are in the same group
2013-10-10 01:50:51 -07:00
1a899ac4c3
Merge pull request #5232 from owncloud/fixing-webdav-touch-master
...
due to internal implementations touch will always be successful - $mtime...
2013-10-10 01:49:59 -07:00
7f8eeb0474
ensure the view's root is a subfolder of the the default root, not only starting the same
2013-10-09 20:46:43 +02:00
38c563dcdc
don't trigger the create hooks when if the file already exists for file_put_contents
2013-10-09 20:34:18 +02:00
8e97752bf7
adding OC6 public API for activities
2013-10-09 18:06:21 +02:00
926b3c9b7b
Merge branch 'master' into activities-api
2013-10-09 17:53:57 +02:00
27738fc4f5
due to internal implementations touch will always be successful - $mtime will be stored in the cache
...
from desktop client perspective it is necessary to set the mtime under every condition
2013-10-09 15:35:09 +02:00
b4df4cc61d
Merge pull request #5219 from owncloud/catch_wrong_timezone
...
catch unknown timezone and fall-back to UTC
2013-10-09 01:59:09 -07:00
c1e5725db9
changed default time format to ISO8601
2013-10-09 10:40:20 +02:00
fe64f7b900
Merge pull request #5032 from owncloud/fixing-5006-master
...
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
* owncloud/fixing-5006-master:
Use strict comparison === instead of ==.
Adjust return value tests for checkPassword() to what OC_User_Example says.
Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
Use parent:: in Test_User_Database::getUser().
Test_User_Backend::getUser() does not return an array, it returns a string.
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
2013-10-08 23:17:51 +02:00
7bd5352509
php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainer
2013-10-08 23:14:08 +02:00
Vincent Petry
Tom Needham
Thomas Tanghus
Robin Appelman
Oliver Gasser
Bart Visscher
Bjoern Schiessle
Morris Jobke
Thomas Müller
kondou
blizzz
Andreas Fischer
Jörn Friedrich Dreyer
Lukas Reschke
Frank Karlitschek
Björn Schießle
VicDeo
Victor Dubiniuk
Georg Ehrke
Tom Needham