Jenkins for ownCloud
348812f2ce
[tx-robot] updated from transifex
2013-02-27 00:09:33 +01:00
Arthur Schiwon
60d4fdda57
sort users according to display name
2013-02-26 22:56:55 +01:00
Robin Appelman
47b899e0c8
Disable prepared query caching while doing an upgrade
2013-02-26 22:41:48 +01:00
Bart Visscher
4a26d63867
Fix using wrong quotes for breaking long lines
...
Fixes #1925
2013-02-26 20:48:01 +01:00
Michael Gapczynski
9a2ca0ae64
Check resharing setting
2013-02-26 13:31:15 -05:00
Thomas Tanghus
ea841e5e15
Catch exceptions on malformed categories.
2013-02-26 15:01:42 +01:00
Bernhard Posselt
b987c76d16
Merge pull request #1906 from owncloud/storage-stat-fail
...
Common storage: don't throw warning when a stat fails
2013-02-26 00:44:42 -08:00
Bernhard Posselt
5b250afafc
Merge pull request #1903 from owncloud/fix_version_check
...
return true once one owncloud version number is bigger at any position
2013-02-26 00:37:11 -08:00
Michael Gapczynski
8983465210
Correct parent folders' ETags for all users with access to a shared file
2013-02-26 01:21:48 -05:00
Robin Appelman
52dccd4aa1
Storage: don't throw warnings when a stat fails
2013-02-26 02:53:02 +01:00
Robin Appelman
6b33a23a51
Code style
2013-02-26 02:51:57 +01:00
Jenkins for ownCloud
63d9feb8c0
[tx-robot] updated from transifex
2013-02-26 00:06:26 +01:00
Michael Gapczynski
4a05e8820f
Merge branch 'master' into external_storage_ui_feedback
2013-02-25 17:56:40 -05:00
Bernhard Posselt
f415f3e03e
return true once one owncloud version number is bigger at any position
2013-02-25 23:06:26 +01:00
Lukas Reschke
d713948d3f
Merge pull request #1898 from owncloud/session_start_fix
...
set http 500 when session could not be started to prevent serving of emp...
2013-02-25 14:00:12 -08:00
Lukas Reschke
6735701c1e
Merge pull request #1837 from owncloud/fix-user-template
...
Remove unneeded code for user layout template
2013-02-25 13:41:32 -08:00
Lukas Reschke
a2a1e8c2cb
Merge pull request #1839 from owncloud/no_recursive_object_walking
...
Don't walk objects with array_walk_recursive()
2013-02-25 12:53:23 -08:00
Thomas Müller
6dd1d479da
Merge pull request #1706 from owncloud/master-sqlserver
...
Microsoft SQL-Server support for ownCloud!
2013-02-25 12:50:32 -08:00
Frank Karlitschek
a533bb6dcd
5 beta 2
2013-02-25 20:00:40 +01:00
Bernhard Posselt
7f7b8bc07a
use error template
2013-02-25 19:17:29 +01:00
Bernhard Posselt
aba60dba28
added simple error message for the browser
2013-02-25 18:47:34 +01:00
Bernhard Posselt
bc2fefed59
write an error log when session could not be initialized
2013-02-25 18:42:09 +01:00
Bernhard Posselt
55c72617c6
set http 500 when session could not be started to prevent serving of empty files see #1049
2013-02-25 18:37:05 +01:00
Bernhard Posselt
946a064fc6
Merge pull request #1891 from owncloud/set_timeout
...
use a 5 sec timeout for the webdav check
2013-02-25 08:27:20 -08:00
Frank Karlitschek
3009b43e3d
use a 5 sec timeout for the webdav check
2013-02-25 16:30:11 +01:00
Björn Schießle
2954c7e97a
Merge pull request #1865 from owncloud/fix-displaying-db-errors
...
Don't use routes when displaying error page
2013-02-25 07:09:48 -08:00
Bart Visscher
9ceae51091
Merge pull request #1887 from owncloud/fixing-1843-master
...
remove the check for session data folder - causes trouble on some enviro...
2013-02-25 04:16:38 -08:00
Bernhard Posselt
5bf3d286f0
created unittests and factored out version test into seperate method
2013-02-25 12:38:00 +01:00
Bernhard Posselt
ecd40f0abc
spaces to tabs
2013-02-25 11:40:55 +01:00
Bernhard Posselt
736d5deaee
version checks for apps now use all three version numbers and fixed bug that would not do the version check correctly for the second version
2013-02-25 11:39:55 +01:00
Frank Karlitschek
9ee5069f2a
Merge pull request #1856 from owncloud/fix_error_handling_stream_copy
...
don't use the number of written bytes as indicator if streamCopy() was successful
2013-02-25 02:04:12 -08:00
Thomas Mueller
ebcb778a99
remove the check for session data folder - causes trouble on some environments
...
let's try to find another solution for =C6
2013-02-25 10:12:47 +01:00
Bart Visscher
e1818675d2
Remove MDB2 sqlite3 driver
2013-02-25 08:27:23 +01:00
Bart Visscher
e97c7ae806
Change PDO Exceptions to Doctrine Exceptions
2013-02-25 08:27:23 +01:00
Bart Visscher
d0d9b63ab5
Codestyle cleanup
2013-02-25 08:27:23 +01:00
Bart Visscher
c8ec1bd2a6
Merge branch 'master' into doctrine
...
Conflicts:
lib/base.php
lib/db.php
2013-02-25 08:24:59 +01:00
Jenkins for ownCloud
21f3291eee
[tx-robot] updated from transifex
2013-02-25 00:06:17 +01:00
Thomas Mueller
9898ba4daf
Merge branch 'master' into master-sqlserver
...
Conflicts:
core/templates/installation.php
2013-02-22 22:59:09 +01:00
Bart Visscher
15f5325078
Don't use routes when displaying error page
2013-02-22 21:39:44 +01:00
Björn Schießle
eabfd9b69b
put value assignment into brackets
2013-02-22 16:45:57 +01:00
Bernhard Posselt
608ebb59dd
Merge pull request #1859 from owncloud/blacklist-fix
...
Add OC\Files\Filesystem::isFileBlacklisted
2013-02-22 07:43:13 -08:00
Björn Schießle
d8137fdf66
return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied
2013-02-22 16:43:11 +01:00
Robin Appelman
62c65bc1c8
Add OC\Files\Filesystem::isFileBlacklisted
2013-02-22 16:13:08 +01:00
Jörn Friedrich Dreyer
e8da90d0f4
Merge pull request #1711 from owncloud/style-cleanup
...
Codestyle cleanup
2013-02-22 07:02:51 -08:00
Björn Schießle
40efeb9187
isSharedFile() doesn't detect all shares, just use getUsersSharingFile() directly either you get a list of users or not
2013-02-22 16:02:27 +01:00
Björn Schießle
5b94959686
using the number of writen bytes as indicator if streamCopy() was successfully. Instead check if fwrite returns the number of bytes or false
2013-02-22 14:56:50 +01:00
Georg Ehrke
f51d8c1cd9
fix order of mount commands
2013-02-22 14:19:29 +01:00
Jörn Friedrich Dreyer
16a5f15f85
keep transparency when resizing or cropping png/gif
2013-02-22 12:42:40 +01:00
Thomas Tanghus
efe33c508e
Don't walk objects with array_walk_recursive()
2013-02-22 00:51:54 +01:00
Bart Visscher
bf0b9bac8b
Remove unneeded code for user layout template
2013-02-22 00:22:43 +01:00
Jenkins for ownCloud
734a463297
[tx-robot] updated from transifex
2013-02-22 00:08:47 +01:00
Bart Visscher
19c5213b53
Join split translated strings
2013-02-21 23:47:56 +01:00
Bart Visscher
88bea55f97
Update hint by the internal version number.
...
So we don't repeat the 4.5 <=> 4.90 mixup
2013-02-21 21:30:25 +01:00
Björn Schießle
0a6e9933fc
Merge pull request #1812 from owncloud/add-logging-to-webdav-test-master
...
Enhancment to the WebDAV-Testing ...
2013-02-21 05:58:34 -08:00
Frank Karlitschek
c5e0dda887
add a safe_mode check
2013-02-21 11:09:00 +01:00
Michael Gapczynski
d29c2b0169
Reuse $freeSpace variable
2013-02-23 16:00:50 -05:00
Michael Gapczynski
a2d3333a09
Don't throw insufficient storage exception if free space is unknown
2013-02-23 15:37:44 -05:00
Bart Visscher
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
Björn Schießle
c8c0e72e73
Merge pull request #1768 from houqp/issue_1739
...
bug fix for issue 1739
2013-02-21 01:09:15 -08:00
Jenkins for ownCloud
dcd93a53e4
[tx-robot] updated from transifex
2013-02-21 00:15:58 +01:00
Thomas Mueller
7b7994b56b
WebDAV-Testing:
...
- write the exception to the log
- in case curl is missing we should return true as well
2013-02-20 23:11:38 +01:00
Frank Karlitschek
59fd9b2bd2
5.0.0 beta 1
2013-02-20 19:09:58 +01:00
Thomas Mueller
5062ae250b
Merge branch 'master' into master-sqlserver
...
Conflicts:
lib/files/cache/cache.php
2013-02-20 10:55:20 +01:00
Michael Gapczynski
702c27b0e6
Merge branch 'master' into external_storage_ui_feedback
...
Conflicts:
apps/files_external/js/settings.js
apps/files_external/lib/smb.php
apps/files_external/templates/settings.php
lib/files/storage/common.php
2013-02-19 19:12:14 -05:00
Frank Karlitschek
3878203679
Merge pull request #1731 from owncloud/unknown-freespace
...
Give storage backends the option to define having no known free space
2013-02-19 15:18:12 -08:00
Jenkins for ownCloud
99758dce2b
[tx-robot] updated from transifex
2013-02-20 00:03:28 +01:00
Jenkins for ownCloud
76c4dc6296
[tx-robot] updated from transifex
2013-02-19 00:06:51 +01:00
Qingping Hou
2c78c5ccab
bug fix for issue 1739, two changes included:
...
* fix typo in OC_Group_Database::DisplayNamesInGroup's SQL clause
* check array_diff return value in OC_Group::displayNamesInGroups,
when there is no difference between two arrays, it will return
NULL, so we have to take care of it.
2013-02-18 18:05:58 -05:00
Thomas Müller
d9035d4fdc
Merge pull request #1728 from owncloud/mountconfig
...
Use json for new mount configuration files
2013-02-18 14:56:25 -08:00
Frank Karlitschek
f554347db5
Merge pull request #1724 from owncloud/long-storage-id
...
Cache: hash long storage ids to ensure they fit in the database
2013-02-18 07:17:27 -08:00
Robin Appelman
2bbb57e429
merge master into mountconfig
2013-02-18 15:12:15 +01:00
Thomas Mueller
2675290325
Merge branch 'master' into master-sqlserver
2013-02-18 11:39:04 +01:00
Jenkins for ownCloud
3b9796bfcc
[tx-robot] updated from transifex
2013-02-18 00:06:45 +01:00
Thomas Müller
55d6b96348
Merge pull request #1719 from owncloud/fixing-1659-master
...
Fixing 1659 master
2013-02-17 11:47:35 -08:00
Robin Appelman
451daf3ab1
Keep user quota into account when the storage backend has unkown free space
2013-02-17 20:09:03 +01:00
Robin Appelman
d96146a017
Give storage backends the option to define having no known free space
...
When this is the case only the configured max upload size is taking into account for uploading
2013-02-16 03:27:50 +01:00
Robin Appelman
6da2c6c83e
Create new mountconfig files in json
2013-02-16 01:50:40 +01:00
Robin Appelman
46626915ef
Use a parser to read custom mount configuration instead of including the php files
2013-02-16 01:30:44 +01:00
Jenkins for ownCloud
83f0c8ce61
[tx-robot] updated from transifex
2013-02-16 00:05:50 +01:00
Robin Appelman
0c1ec758e8
Cache: hash long storage ids to ensure they fit in the database
2013-02-15 22:11:39 +01:00
Robin Appelman
2ed850e05b
merge master into filecache_mtime
2013-02-15 21:04:48 +01:00
Thomas Mueller
40739350c9
class Mapper no respects an unchanged physical root which will be excluded from slugifying the path
2013-02-15 17:42:17 +01:00
Thomas Mueller
b488800bd5
fix error in recursive search
2013-02-15 17:41:22 +01:00
Robin Appelman
b8e2454f68
Fix strict standard warning in user template
2013-02-15 16:10:06 +01:00
Thomas Müller
2ce398c68e
Merge pull request #1715 from owncloud/fixing-1640-master
...
changing the bit mask of OC_USER_BACKEND_SET_DISPLAYNAME
2013-02-15 03:58:05 -08:00
Thomas Mueller
297c50db18
changing the bit mask of OC_USER_BACKEND_SET_DISPLAYNAME
2013-02-15 12:24:49 +01:00
Jan-Christoph Borchardt
8b09fbc150
Merge pull request #1700 from owncloud/fixing-1680-master
...
Fixing 1680 master
2013-02-15 03:21:49 -08:00
Thomas Mueller
102619ab87
we should never drop a database
2013-02-15 08:22:31 +01:00
Thomas Müller
166693426d
Merge pull request #1712 from owncloud/debug-exception
...
Don't catch errors/exceptions when debug is enabled
2013-02-14 20:40:31 -08:00
Robin Appelman
ab70f9bd25
Fix quotes in OC_User::isEnabled
...
this broke login
2013-02-15 03:20:02 +01:00
Robin Appelman
0395715348
set DEBUG from xdebug session before we first use it
2013-02-15 03:15:09 +01:00
Robin Appelman
bcabdd7dd5
Don't cache errors/exceptions when debug is enabled
2013-02-15 03:14:41 +01:00
Jenkins for ownCloud
b169073169
[tx-robot] updated from transifex
2013-02-15 00:06:50 +01:00
Thomas Mueller
4b80466880
Merge branch 'master' into master-sqlserver
...
Conflicts:
lib/db.php
lib/files/cache/cache.php
lib/files/cache/legacy.php
lib/setup.php
2013-02-14 22:54:48 +01:00
Thomas Mueller
78a3625ddf
final adoptions for mssql connectivity
2013-02-14 21:59:24 +01:00
Bart Visscher
9058d398a7
Merge pull request #1662 from owncloud/style-cleanup
...
Style cleanup
2013-02-14 12:54:36 -08:00
Lukas Reschke
be194c5b5b
Invalidate existing HSTS headers
2013-02-14 19:23:29 +01:00
Thomas Mueller
e96f6ffa52
filter l10n-* files
2013-02-14 17:24:06 +01:00
Thomas Mueller
8877087b57
adding a compatibility.js as a single source to define all fallback function declarations
2013-02-14 12:20:04 +01:00
Bart Visscher
ffae6f4b84
Style-fix: Breakup long lines
2013-02-14 08:38:37 +01:00
Bart Visscher
2d6d0a4ad4
Whitespace indent fixes
2013-02-14 08:36:26 +01:00
Bart Visscher
2679123846
Add braces around single line if statements
2013-02-14 08:36:26 +01:00
Bart Visscher
cd35d257bb
Fix NoSpaceAfterComma and SpaceBeforeComma
2013-02-14 08:36:26 +01:00
Bart Visscher
d3ef967993
Fix indentation style
2013-02-14 08:36:26 +01:00
Bart Visscher
5c4a804ddb
Fix SpaceBeforeOpenBrace errors
2013-02-14 08:36:26 +01:00
Jenkins for ownCloud
bfe6334cd9
[tx-robot] updated from transifex
2013-02-14 00:06:51 +01:00
Thomas Müller
e1e77fe3be
Merge pull request #1598 from owncloud/fixing-1424-master
...
Fixing 1424 master
2013-02-13 12:59:30 -08:00
Björn Schießle
5005195db0
create keypair for ownCloud with empty passphrase, will be used for public link shares
2013-02-13 17:57:45 +01:00
Björn Schießle
9356f9a6bf
add post_unshareALll hook, update recursively all keyfiles if a folder was shared/unshared
2013-02-13 17:23:27 +01:00
Björn Schießle
4952dfe956
add post_unshare hook, also add public link shares to the list of user with access to a file
2013-02-13 14:56:39 +01:00
Thomas Mueller
bc43dd704f
Merge branch 'master' into fixing-1424-master
...
Conflicts:
settings/js/users.js
2013-02-13 01:18:01 +01:00
Jenkins for ownCloud
68fa0b7dcc
[tx-robot] updated from transifex
2013-02-13 00:05:40 +01:00
Thomas Mueller
a814361ca7
Merge branch 'master' into external_storage_ui_feedback
2013-02-12 23:01:54 +01:00
Thomas Mueller
b31cc83a2d
$this->numericId should be determined based on table storages not filecache
2013-02-12 17:26:58 +01:00
Thomas Müller
251b676a06
Merge pull request #1616 from owncloud/cache_fixes_rebase
...
Cache: reuse known folder sizes when doing a shallow scan - rebase
2013-02-12 08:07:49 -08:00
Björn Schießle
a692264fa4
add option to keep duplicates in the list of users with access to a file, e.g. for the unshare operation we need to know if access was granted more than once, for example as group share and as individual share
2013-02-12 17:00:33 +01:00
Robin Appelman
b54dcd1999
Cache: fix scanner trying to use existing data when file isn't in cache
2013-02-12 16:48:21 +01:00
Björn Schießle
d1bbb30385
also find users with access to the file if a folder above the actual file was already shared
2013-02-12 16:48:04 +01:00
Thomas Mueller
f2baf1ae0e
fixing syntax error
2013-02-12 16:18:48 +01:00
Jenkins for ownCloud
8d9352a40d
[tx-robot] updated from transifex
2013-02-12 15:12:46 +01:00
Robin Appelman
e1fe5279dd
Cache: also preserve etags for files
2013-02-12 14:56:57 +01:00
Björn Schießle
8eef919a75
take group shares into account if we retrieve the list a all recipients
2013-02-12 12:08:34 +01:00
Thomas Mueller
a953786d79
Merge branch 'master' into external_storage_ui_feedback
2013-02-12 11:01:14 +01:00
Michael Gapczynski
6eba790a75
Merge branch 'master' into external_storage_ui_feedback
...
Conflicts:
apps/files_external/js/dropbox.js
apps/files_external/js/google.js
apps/files_external/js/settings.js
apps/files_external/lib/amazons3.php
apps/files_external/lib/dropbox.php
apps/files_external/lib/google.php
apps/files_external/lib/smb.php
apps/files_external/lib/swift.php
apps/files_external/lib/webdav.php
lib/filestorage.php
2013-02-11 20:27:05 -05:00
Thomas Mueller
bcbf2e667b
fixing sql server syntax for database creation
2013-02-12 01:17:01 +01:00
Thomas Mueller
98d7e0f7cd
write any database messages / non critical errors to the log - don't pollute the browser
2013-02-12 01:14:53 +01:00
Thomas Mueller
8136851010
fixing indent
2013-02-12 01:05:47 +01:00
Thomas Mueller
b2dfdacaa1
fixing undefined variables
2013-02-12 01:04:35 +01:00
Thomas Mueller
76b31f870c
Merge branch 'master' into master-sqlserver
2013-02-12 00:32:38 +01:00
Thomas Müller
53111ccdc8
Merge pull request #1634 from irgsmirx/patch-6
...
Update/Bugfix lib/files/cache/legacy.php during database upgrade
2013-02-11 15:31:28 -08:00
Jenkins for ownCloud
fb23ac3ce2
[tx-robot] updated from transifex
2013-02-12 00:21:45 +01:00
Thomas Müller
04bf8c1b66
Merge pull request #1596 from owncloud/fix_470
...
webdav put improvements
2013-02-11 13:10:48 -08:00
Thomas Mueller
5731a1b01c
introduce new virtual method hasUserListings() to determine if a user backend can list it's users.
2013-02-11 22:01:52 +01:00
Thomas Mueller
037fcde133
Merge branch 'master' into fixing-1424-master
2013-02-11 21:42:27 +01:00
irgsmirx
062befd1fc
Update lib/files/cache/legacy.php
...
Fixing a bug that occurs when trying to update a non-existent 'fscache' table in the database - if unfixed upgrading does not succeed.
Unfortunately I could not get a call to PEAR::isError working. That is why I check for the existence of a property present in class MDB2_Error.
2013-02-11 20:28:36 +01:00
Jenkins for ownCloud
39d19a9274
[tx-robot] updated from transifex
2013-02-11 15:42:41 +01:00
Thomas Müller
766fbead96
Merge pull request #1578 from owncloud/mysql_admin_fix
...
added l10n for db error messages
2013-02-11 06:35:49 -08:00
Lukas Reschke
eed48c8159
Merge pull request #1608 from owncloud/fix-shared-links
...
Fix shared links
2013-02-11 05:17:24 -08:00
Thomas Mueller
c544a631d5
fixing indent
2013-02-11 14:14:37 +01:00
Bernhard Posselt
e70aef603f
Merge pull request #1573 from owncloud/fixing-ctor-local-storage-master
...
adding dtor to Local and revert call to it within Temporary
2013-02-11 04:40:54 -08:00
Robin Appelman
2921d2fb78
Cache: don't create a new etag when the mtime hasn't changed
2013-02-11 13:33:56 +01:00
Robin Appelman
d84c3cd014
Cache: actually use parameter
2013-02-11 13:33:48 +01:00
Robin Appelman
299649b40e
Cache: reuse known folder sizes when doing a shallow scan
2013-02-11 13:33:41 +01:00
Robin Appelman
56d10e9054
Cache: simplify scanner logic a bit when handeling with unknown folder sizes
2013-02-11 13:33:34 +01:00
Bernhard Posselt
36df2fbdfe
fixed argument for translation
2013-02-11 13:11:43 +01:00
Sam Tuke
92f06243be
Implementing sharing support
...
New file-specific methods in lib/public/share
Changes to how keyfiles are stored
2013-02-11 10:21:23 +00:00
Robin Appelman
ad360296b9
Update tests and apps to the new \OC\Files\Filesystem::init signature
2013-02-11 11:06:09 +01:00
Jörn Friedrich Dreyer
99f41de7de
only check content lenght on PUT to make litmus happy
2013-02-11 10:31:01 +01:00
Jörn Friedrich Dreyer
2cb2991c04
delete partial file when file upload is aborted
2013-02-11 09:53:07 +01:00
Jörn Friedrich Dreyer
15ab2fd52a
check Content-Length to detect aborted uploads
2013-02-11 09:53:07 +01:00
Jörn Friedrich Dreyer
806522d007
also rename file when it has not been present before
2013-02-11 09:53:07 +01:00
Jörn Friedrich Dreyer
72a2075b1c
readd renaming and mtime handling to new directory nodes
2013-02-11 09:43:26 +01:00
Jörn Friedrich Dreyer
2644003bf1
send back 'X-OC-MTime: accepted' when X-OC-MTime was applied
2013-02-11 09:34:03 +01:00
Jörn Friedrich Dreyer
d2332f60f3
add a custom header clients can use to skip a n additional propset request
2013-02-11 09:32:28 +01:00
Michael Gapczynski
eeb409a6ec
Merge branch 'master' into fix-shared-links
2013-02-10 19:10:06 -05:00
Michael Gapczynski
8e3b8c7f47
Proper fix for shared links
2013-02-10 19:09:58 -05:00
Jenkins for ownCloud
04146f2059
[tx-robot] updated from transifex
2013-02-11 00:04:49 +01:00
Robin Appelman
3292dc3eea
Cache: allow file sizes >2GB
2013-02-10 16:44:00 +01:00
blizzz
e4c9fc1381
Merge pull request #1592 from owncloud/display_name_setting
...
add switch to enable/disable the possibility to change the display name by the user
2013-02-10 06:52:03 -08:00
Frank Karlitschek
dc12dd523e
Merge pull request #1581 from owncloud/mapper_md5
...
Mapper: use md5 hashes for database indexes
2013-02-10 06:47:44 -08:00
Frank Karlitschek
bc2bfea399
Merge pull request #1588 from owncloud/etag_quotes
...
wrap etags in quotes when doing a propfind on a folder
2013-02-10 06:44:45 -08:00
Lukas Reschke
d08a3bb46e
Merge pull request #1590 from owncloud/fix_470
...
append .part to put files
2013-02-10 06:38:31 -08:00
Lukas Reschke
32b1c7ad5d
Merge pull request #1589 from owncloud/use-sanitizeHTML
...
Use sanitizeHTML instead of stripslashes + htmlspecialchars
2013-02-10 06:23:01 -08:00
Björn Schießle
d8fee28b3b
add switch to enable/disable the possibility to change the display name by the user
2013-02-10 14:43:31 +01:00
Jörn Friedrich Dreyer
1263511a17
append .part to put files
2013-02-10 14:16:45 +01:00
Lukas Reschke
46103e62d2
Coding style
2013-02-10 14:09:49 +01:00
Administrator
4e5a3fbcaf
- Fixed indentations.
...
- Fixed a bug in legacy.php: there was an error that was not checked for if the table 'fscache' did not exist in the database.
2013-02-10 14:08:00 +01:00
Lukas Reschke
6f785e211b
Merge pull request #1030 from hkjolhede/master
...
SFTP support in files_external app
2013-02-10 05:06:00 -08:00
Lukas Reschke
1b10032556
Use sanitizeHTML instead of stripslashes + htmlspecialchars
2013-02-10 14:03:40 +01:00
Robin Appelman
121c1f2fc0
wrap etags in quotes when doing a propfind on a folder
2013-02-10 13:55:20 +01:00
Administrator
41ec976fd7
Bugfixes and cleanup MS SQL Server installation
2013-02-10 13:07:59 +01:00
Tom Needham
6d74aa0d00
more code style
2013-02-10 12:46:41 +01:00
Tom Needham
28498e1af4
Code style and remove OAuth code
2013-02-10 12:44:59 +01:00
Robin Appelman
9738fae3cf
Emulate touch() for backends that don't support it
2013-02-10 12:44:27 +01:00
Tom Needham
266ba2806d
Remove debug call, correct app identifier
2013-02-10 12:35:39 +01:00
Robin Appelman
3e70d563a6
Cache: bookkeeping of storage_mtime
2013-02-10 12:27:35 +01:00
Robin Appelman
9c1196d73e
Cache: add seccond mtime field
2013-02-10 12:05:41 +01:00
Robin Appelman
0c05244f8b
Mapper: use md5 hashes for database indexes
...
indexing the full path exeeds the maximum index length for MySQL
2013-02-10 11:49:37 +01:00
Lukas Reschke
01fabd6c65
Merge pull request #1577 from owncloud/typo_catagory
...
Typo
2013-02-10 02:31:34 -08:00
Jenkins for ownCloud
f7d898d835
[tx-robot] updated from transifex
2013-02-10 00:10:29 +01:00
Lukas Reschke
bd2f8980cd
Typo
2013-02-09 23:37:42 +01:00
Sam Tuke
b3e59ca1e3
Work on post_share hook for files_encryption
...
New method in OCP\Share{}:: getUsersSharingFile()
Development shapshot
2013-02-09 18:39:32 +00:00
Bernhard Posselt
b2261c31eb
added l10n for db error messages
2013-02-09 19:23:36 +01:00
Thomas Müller
b9089fe8d9
Merge branch 'master' into fixing-1424-master
2013-02-09 19:15:23 +01:00
Thomas Müller
0222c589ac
Merge pull request #1546 from owncloud/fix-loading-hooks
...
Fix loading hooks when going though the routing system
2013-02-09 09:59:41 -08:00
Thomas Müller
e68cf72458
Merge pull request #1543 from owncloud/utf8-locale-master
...
some systems use en_US.UTF8 instead of en_US.UTF-8
2013-02-09 09:58:05 -08:00
Thomas Müller
460faf3f97
Merge pull request #1569 from owncloud/clean-app-id
...
Remove invalid characters from app id to prevent loading of invalid reso...
2013-02-09 09:56:26 -08:00
Bernhard Posselt
0664b98b4f
added icons and mimetypes for .msi and .exe files
2013-02-09 18:09:03 +01:00
Bernhard Posselt
43981e62e2
Revert "added exe and msi filetypes and icon"
...
This reverts commit aa1adf42c7
.
2013-02-09 17:46:07 +01:00
Bernhard Posselt
aa1adf42c7
added exe and msi filetypes and icon
2013-02-09 17:41:17 +01:00
Thomas Müller
2b0b6bb63c
Merge pull request #1566 from owncloud/fixing-1505-master
...
fixes zip download for folders containing a dot .....
2013-02-09 08:33:44 -08:00
Thomas Müller
d67d9566ce
Merge branch 'master' into clean-app-id
2013-02-09 17:28:30 +01:00
icewind1991
5a309c11ca
Merge pull request #1572 from owncloud/fix_empty_path_handling
...
fix empty path handling
2013-02-09 08:25:25 -08:00
Thomas Müller
e0da721a7d
adding ctor to Local and revert call to it within Temporary
2013-02-09 17:16:13 +01:00
Frank Karlitschek
5a0a9564ce
alpha 1
2013-02-09 17:13:43 +01:00
Lukas Reschke
06bba59249
Merge pull request #1618 from owncloud/mapped-storage-unit-testing-linux-master
...
Mapped storage unit testing linux master
2013-02-12 22:58:37 -08:00
Thomas Mueller
92e6409f40
fixing mappedlocal storage to work on non-windows as well
...
this allows us to run unit tests on linux - necessary to enable easy regression testing
2013-02-11 13:53:10 +01:00
Thomas Mueller
f223ab796b
Merge branch 'master' into mapped-storage-unit-testing-linux-master
2013-02-11 12:59:23 +01:00
Thomas Müller
8174e5faf1
make MappedLocal available and testable within Linux as well
2013-02-09 19:03:03 +01:00
Jörn Friedrich Dreyer
420b63cbe4
fix empty path handling
2013-02-09 16:58:55 +01:00
Bart Visscher
60411f7d3d
Remove unneeded __destruct call in OC\Files\Storage\Temporary
2013-02-09 16:18:30 +01:00
Bart Visscher
9dddcae9ca
Remove invalid characters from app id to prevent loading of invalid resources
2013-02-09 15:10:40 +01:00
Henrik Kjölhede
d6b4d25d1d
Merge branch 'master' of https://github.com/hkjolhede/owncloud_core
2013-02-09 14:13:54 +01:00
Thomas Müller
279cbeb001
Merge pull request #1481 from owncloud/fixing-1354-master
...
basic WebDAV test in place now
2013-02-09 05:13:33 -08:00
Henrik Kjölhede
41fa65e7be
Merge branch 'master' of https://github.com/owncloud/core
...
Conflicts:
apps/files_external/appinfo/app.php
2013-02-09 14:05:33 +01:00
Thomas Müller
ddc7af9a53
know your libraries ;-)
...
strrpos fails in cases the file in the path has no dot but the parent folder
2013-02-09 13:51:44 +01:00
Tom Needham
5ad1b63f76
Fix api result merging.
2013-02-09 12:50:19 +00:00
icewind1991
ec829bd345
Merge pull request #1512 from owncloud/mapped-filename-storage
...
initial version of a local storage implementation which will use unique ...
2013-02-09 04:45:25 -08:00
Tom Needham
5d14a2cc46
Merge in master
2013-02-09 12:05:48 +00:00
Tom Needham
eefaefe87d
Use OC_User::isAdminUser() in lib/api.php
2013-02-09 12:00:44 +00:00
Tom Needham
ab8777a623
Merge branch 'ocs_capabilities' into ocs_multiple_methods
2013-02-09 11:56:30 +00:00
Tom Needham
742cafb03a
Change strucutre of cloud/capabilities response
2013-02-09 11:22:29 +00:00
Frank Karlitschek
4a130d106c
I'm an evil bastard and I commit this 3 letter text fix without a pull request.
2013-02-09 10:09:37 +01:00
Frank Karlitschek
764409117a
Merge pull request #1493 from owncloud/fix_ldap_stored_homedir
...
Fix ldap stored homedir
2013-02-11 02:20:03 -08:00
Bart Visscher
ed1dc3e064
Fix files router download links
2013-02-08 22:05:13 +01:00
Thomas Müller
12bdc6ddb6
Merge pull request #1439 from owncloud/fix-archive-tar-on-win32-master
...
quick fixing this require_once.
2013-02-08 10:18:49 -08:00
Bart Visscher
fba9739448
Always load the apps before trying to match a route
2013-02-08 19:06:59 +01:00
Bart Visscher
340d6fce11
Better way of getting the navigation entries for an app
2013-02-08 18:53:43 +01:00
Thomas Müller
232a98524c
some systems use en_US.UTF8 instead of en_US.UTF-8
2013-02-08 17:49:54 +01:00
Thomas Müller
05b46f7828
on creation only test for existing users if the backend supports user creation
...
this solves the issue where no users can be created any more if backends are active which always return true on userExists() like WebDAV Auth
2013-02-08 17:16:18 +01:00
Thomas Müller
ea42014ba4
in case curl is not present we cannot test
2013-02-08 15:23:26 +01:00
Thomas Mueller
4c3d4f7d36
quick fixing this require_once.
...
On windows the wrong file will be required: lib/archive/tar.php and not Archive/Tar.php.
Best would be to rename the lib/archive/tar.php or put it into a different folder
2013-02-08 15:23:07 +01:00
Thomas Müller
1158447499
missing comma in sql statement
2013-02-08 13:49:26 +01:00
Tobias Ramforth
d577f790c8
Added MS SQL Server support
2013-02-08 00:00:51 +01:00
icewind1991
3bd33b69a1
Merge pull request #1527 from owncloud/simplyfy_file_mimetype_parsing
...
simplyfy mimetype parsing of 'file' output
2013-02-07 14:47:10 -08:00
Lukas Reschke
217328e0e3
Merge pull request #1514 from owncloud/fix-setup
...
Fix setup
2013-02-07 13:48:44 -08:00
blizzz
fc7230349b
Merge pull request #1530 from owncloud/fix-warning-displayname-layout
...
Fix warning with displayname in user layout template
2013-02-07 11:25:33 -08:00
Robin Appelman
73ed62976d
Fix previous commit
2013-02-07 18:30:01 +01:00
Robin Appelman
f3f55654ce
Use dummy request method in CLI
2013-02-07 18:28:56 +01:00
Bart Visscher
20b6cb28b1
Fix warning with displayname in user layout template
2013-02-07 18:07:27 +01:00
Robin Appelman
afa1a6d2b3
Don't try to use routes when called from cli
2013-02-07 17:53:38 +01:00
Jörn Friedrich Dreyer
1ef3e4c5c6
simplyfy mimetype parsing of 'file' output
2013-02-07 17:46:16 +01:00
Thomas Müller
0efcf33e2f
Merge pull request #1451 from eMerzh/fix_1065
...
Add Redirect to getUrlContent fix #1065
2013-02-07 06:27:58 -08:00
Thomas Mueller
5788d36c8d
Merge branch 'master' into fixing-1354-master
...
Conflicts:
settings/admin.php
settings/templates/admin.php
2013-02-07 10:44:28 +01:00
Bart Visscher
149d079fd4
Move loading of js_config to templatelayout
...
Also check for installed flag because this isn't available before setup
2013-02-07 08:09:53 +01:00
Jenkins for ownCloud
35bd7a400d
[tx-robot] updated from transifex
2013-02-07 00:11:04 +01:00
Thomas Mueller
fd8cb9974b
initial version of a local storage implementation which will use unique slugified filename on the local filesystem.
...
This implementation will only be enabled on windows based system to solve the issues around UTF-8 file names with php on windows.
2013-02-06 23:41:52 +01:00
Frank Karlitschek
223f538bb8
Merge pull request #1500 from chriskoch/patch-1
...
Update lib/public/util.php
2013-02-06 13:00:10 -08:00
Lukas Reschke
2dfe67423d
Merge pull request #1509 from owncloud/correct-public-contacts-tests
...
Correct lib/public/contacts.php tests
2013-02-06 12:29:51 -08:00
Lukas Reschke
e969a78cf9
Merge pull request #1443 from owncloud/use-module-file-info-master
...
we get best results regarding mime type detection if we use fileinfo - l...
2013-02-06 11:53:13 -08:00
Sam Tuke
ae8cfe6569
Added comments
2013-02-06 17:43:03 +00:00
Bart Visscher
3582f7bd09
Execute the post setup check after finishing the setup
2013-02-06 17:56:45 +01:00
Bart Visscher
a4d3cc798f
Correct lib/public/contacts.php tests
2013-02-06 17:37:47 +01:00
Christian Koch
a4f909cefd
Update lib/public/util.php
...
The call of \OC_MAIL::send() overrides all optional parameters. This is not necessary. But if you want to have html mail templates (what I'm thinking about) it is a real problem
2013-02-06 17:22:07 +01:00
Thomas Müller
efdaea4557
Merge pull request #1357 from owncloud/alternative-loging-master
...
add support for apps to register alternative login methods
2013-02-06 06:49:58 -08:00
Björn Schießle
9e08f85c5e
port already approved bugfix to master, https://github.com/owncloud/core/pull/1479
2013-02-06 14:19:32 +01:00
Björn Schießle
9d73e7eb1e
let the user change his display name, if supported by the back-end
2013-02-06 11:38:03 +01:00
Arthur Schiwon
a721f7d59f
check whether user belongs to the backend before calling getHome()
2013-02-06 02:26:35 +01:00
Thomas Müller
74157902d7
Merge pull request #1476 from owncloud/disable-error-handler-while-running-phpunit
...
disable error handler while running phpunit
2013-02-05 14:35:11 -08:00
Thomas Mueller
1adcc5fd23
basic WebDAV test in place now
2013-02-05 23:33:44 +01:00
Thomas Mueller
10ea45c916
fix failing test cases due to wrong typing
2013-02-05 20:19:54 +01:00
Arthur Schiwon
5221ee0c5a
offer change password only when the action is supported by the user backend
2013-02-05 19:26:00 +01:00
Lukas Reschke
e6400b3059
Merge pull request #1474 from samtuke/master
...
Improvements to files_encryption
2013-02-05 09:58:35 -08:00
Thomas Mueller
77369d8164
disable error handler while running phpunit
2013-02-05 16:44:02 +01:00
Sam Tuke
50faddfa40
Minor improvement to comments
2013-02-05 15:37:40 +00:00
Thomas Mueller
9446017821
spell check
2013-02-05 16:24:40 +01:00
Thomas Mueller
1fd807a7d6
pass the argument to the ctor
...
Conflicts:
lib/files/storage/temporary.php
2013-02-05 16:24:11 +01:00
Thomas Mueller
ac11c842e6
setlocale test is pointless on Windows
2013-02-05 15:46:55 +01:00
Thomas Mueller
d8084c132e
new function \OC_Util::runningOnWindows()
2013-02-05 15:43:12 +01:00
Sam Tuke
fd90b82acd
Merge github.com:owncloud/core
2013-02-05 13:44:45 +00:00
Jenkins for ownCloud
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
Brice Maron
c5079a63a8
Add Redirect to getUrlContent fix #1065
2013-02-04 23:38:10 +01:00
Thomas Müller
6e5f211ad1
Merge pull request #1449 from owncloud/fixing-namespace-local-storage-master
...
fixing namespace in local storage
2013-02-04 12:52:56 -08:00
Thomas Müller
3b8c071df4
Merge pull request #1234 from owncloud/fix-issue-192
...
Fix sharing issue with collection and children mismatches
2013-02-04 11:52:20 -08:00
Thomas Mueller
02e6adfdb3
fixing namespace
2013-02-04 20:49:01 +01:00
Thomas Müller
a7e62b0366
Merge pull request #1444 from owncloud/writable-temp-folder-for-session-data-master
...
in case file based session handling in enabled - we need to make sure th...
2013-02-04 11:11:15 -08:00
Thomas Müller
f04a91bd60
Merge pull request #1445 from owncloud/CSP_font
...
Allow loading of external fonts
2013-02-04 10:36:43 -08:00
Tom Needham
406922fc6a
Merge master
2013-02-04 18:36:39 +00:00
Tom Needham
aec5ab3ad2
Remove app related values and change structure of /cloud/capabilties call
2013-02-04 18:34:28 +00:00
Lukas Reschke
5fcb35efd6
Also allow local files
2013-02-04 18:43:26 +01:00
Lukas Reschke
bb90b0ee6e
Allow the loading of local font files embedded via data:
2013-02-04 18:38:16 +01:00
Lukas Reschke
8de0f96a24
Allow loading of external fonts
...
Required by several applications like our pdf viewer
2013-02-04 17:51:52 +01:00
Thomas Müller
301afac291
Merge pull request #1427 from TheSFReader/master
...
The mimetype/mimepart need to be readable, even from searchByMime
2013-02-04 06:44:40 -08:00
Thomas Mueller
0a113600f7
in case file based session handling in enabled - we need to make sure the configured folder is writable
2013-02-04 15:32:01 +01:00
Thomas Mueller
6058c2f734
we get best results regarding mime type detection if we use fileinfo - let's tell the admin about that
2013-02-04 15:04:26 +01:00
Thomas Müller
814369e0cd
Merge pull request #1436 from owncloud/cache_check_path
...
Cache: check for invalid paths in getFileInfo/getDirectoryContent
2013-02-04 05:51:34 -08:00
Robin Appelman
7c33d0a5a7
Cache: fix copy-paste errors
2013-02-04 13:28:31 +01:00
Thomas Müller
f7258cc5e8
Merge pull request #1423 from owncloud/getowner
...
Add getOwner to Filesystem and View classes
2013-02-04 03:08:13 -08:00
Robin Appelman
80dd8d7802
Cache: check for invalid paths in getFileInfo/getDirectoryContent
2013-02-03 23:34:27 +01:00
Lukas Reschke
3def7f8187
Make fileblacklist configurable
2013-02-03 23:03:06 +01:00
TheSFReader
d03155a8d5
translate the mimtype/mimepart to readable in the searchByMime function
2013-02-03 11:06:26 +01:00
Thomas Müller
a3b922763e
Merge pull request #1416 from herbrechtsmeier/set_include_path_early
...
initPaths: set include path before any owncloud function is called
2013-02-03 00:25:21 -08:00
Thomas Müller
743c330f03
Merge pull request #1422 from TheSFReader/master
...
Correct the Cache Scanner so that it doesn't try and scan subdirs of a non-dir path when renaming
2013-02-03 00:24:49 -08:00
Michael Gapczynski
6093d961a0
Add getOwner to Filesystem and View classes
2013-02-02 18:50:40 -05:00
Jenkins for ownCloud
2936140838
[tx-robot] updated from transifex
2013-02-03 00:06:15 +01:00
TheSFReader
42d59d5a16
Remove a warning by making sure the renamed file is a dir before trying and opening it
2013-02-02 23:18:29 +01:00
Robin Appelman
ed4130474a
Dav: update etag in filecache when doing a PROPSET
2013-02-02 18:26:27 +01:00
Robin Appelman
c61c98cbef
Dav: don't overwrite etag from filecache with old etag from properties table
2013-02-02 15:44:05 +01:00
herbrechtsmeier
37e6ac9a2a
initPaths: set include path before any owncloud function is called
...
Ensure we can find basic owncloud classes while detecting the owncloud
paths in function initPaths by add OC::$SERVERROOT . '/lib' to include
path before any owncloud function is called.
This fix a bug with XAMPP that cannot find the class OC_Config in
function OC_Request::scriptName when called from function
OC_Base::initPaths.
2013-02-02 12:07:18 +01:00
Jenkins for ownCloud
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
Frank Karlitschek
03c18a6186
Merge pull request #1413 from owncloud/enable_removing_search_providers
...
add function to remove a search provider
2013-02-01 10:34:39 -08:00
Jörn Friedrich Dreyer
0c85250380
add function to remove a search provider
2013-02-01 19:21:54 +01:00
Bart Visscher
2488a495c6
Merge pull request #1384 from owncloud/upgrade_fix
...
Check for upgrade/maintance mode before trying to load an app
2013-02-01 07:12:06 -08:00
Thomas Müller
b20529ee44
Merge pull request #1171 from owncloud/move-datadirectory-checks
...
Move data directory permission checks after data directory existence checks
2013-01-31 14:54:46 -08:00
Thomas Müller
caec0c476d
Merge pull request #1287 from owncloud/ocs_xml_attributes
...
API: Treat array keys starting with '@' as XML attributes
2013-01-31 14:39:31 -08:00
Thomas Müller
317261d6df
Merge pull request #1099 from herbrechtsmeier/ssl-proxy
...
add multiple domains reverse SSL proxy support
2013-01-31 14:01:32 -08:00
Brice Maron
17f94de19b
Case insensitive Lang Detection fix #1328
2013-01-31 22:37:46 +01:00
herbrechtsmeier
7747f49263
add SSL proxy support
...
Add support for a reverse proxy that only forwards SSL connections
unencrypted to the web server.
This patch allows to detect the reverse proxy via regular expression for
the remote IP address and conditional overwrite the host name, protocol
and web root.
2013-01-31 18:43:30 +01:00
Stefan Herbrechtsmeier
ab2b79cda6
add multiple domains reverse proxy support
...
Add support for a reverse proxy that handles multiple domains via different
web roots (http[s]://proxy.tld/domain.tld/owncloud).
As the reverse proxy web root is transparent for the web server the
REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace
the direct use of this _SERVER variables with function calls and extend
this functions to overwrite the web root. Additionally it adds a Sabre
request backend that extends the Sabre_HTTP_Request to use the same
functions.
2013-01-31 18:42:31 +01:00
Lukas Reschke
b471177439
Merge pull request #1379 from owncloud/improved_appsmanagement
...
Improved appsmanagement
2013-01-31 08:30:55 -08:00
Sam Tuke
31e723a907
Merge github.com:owncloud/core
...
Conflicts:
lib/public/share.php
2013-01-31 16:30:37 +00:00
Jenkins for ownCloud
209d599ec5
[tx-robot] updated from transifex
2013-01-31 17:05:21 +01:00
Frank Karlitschek
f7d281af67
just return "true" for now
2013-01-31 12:24:10 +01:00
Björn Schießle
77765bd967
remove some left over comments
2013-01-31 12:17:23 +01:00
Björn Schießle
ab255e8bb6
add missing brackets
2013-01-31 12:12:39 +01:00
Björn Schießle
9a19c0af4b
search for display name and uid (with no display name) since it is possible that not all users have a seperate display name
2013-01-31 12:09:42 +01:00
Thomas Mueller
e8b423f666
style fixes
2013-01-31 10:30:13 +01:00
Thomas Mueller
665bb41c1f
style fixes
2013-01-31 10:27:02 +01:00
Frank Karlitschek
5112dac102
remove spaces
2013-01-31 10:00:42 +01:00
Robin Appelman
057920b165
Still load js files in maintance mode
2013-01-30 23:05:44 +01:00
Robin Appelman
f452d2d0c4
Check for upgrade/maintance mode before trying to load an app
2013-01-30 22:55:33 +01:00
Robin Appelman
6043789394
Bumb version number for displayname db upgrade
2013-01-30 19:37:02 +01:00
Robin Appelman
207aa22d12
merge master into filesystem
2013-01-30 19:24:24 +01:00
Robin Appelman
af3b0e30ed
Cache: don't insert duplicated during upgrade
2013-01-30 19:19:19 +01:00
Frank Karlitschek
66cab77b6d
merge master
...
Merge branch 'master' into improved_appsmanagement
Conflicts:
settings/apps.php
settings/templates/apps.php
2013-01-30 14:36:17 +01:00
irgsmirx
0bce22966c
Update lib/base.php
...
Correction of typo "locate" -> "locale".
2013-01-30 14:27:08 +01:00
Frank Karlitschek
389c4e8415
mark recommended apps. server part not yet fully implemented
2013-01-30 13:39:53 +01:00
root
3fa4b3abff
apps updater is now working
2013-01-30 12:08:14 +01:00
Jörn Friedrich Dreyer
a6040d0cc7
Merge pull request #1308 from TheSFReader/master
...
Changed the linkTo function (from Helper class) to get rid of an unnecessary (and potentially non conform) leading '&' character when adding arguments
2013-01-30 02:37:11 -08:00
Jenkins for ownCloud
68266e70f2
[tx-robot] updated from transifex
2013-01-30 00:25:41 +01:00
Lukas Reschke
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
Björn Schießle
6659798197
only change display name if the display name from the current user was changed; add correct display name to new user
2013-01-29 22:33:46 +01:00
Björn Schießle
007bddceba
version dump to trigger db update
2013-01-29 21:04:28 +01:00
Björn Schießle
ebc3d1b2d7
remove dubug value
2013-01-29 21:01:59 +01:00
Arthur Schiwon
79c309da83
Typo
2013-01-29 20:42:21 +01:00
Arthur Schiwon
59bb9931df
Adjust user interface to additions around displayName Handling
2013-01-29 20:09:41 +01:00
Thomas Mueller
825cdf8560
add support for apps to register alternative login methods
...
below the standard login a list of icons/button will be displayed
2013-01-29 17:28:08 +01:00
Michael Gapczynski
ca4c006d5a
Make zip downloads use actual folder names, fix spelling mistakes
2013-01-28 23:51:35 -05:00
Jenkins for ownCloud
8c4931a645
[tx-robot] updated from transifex
2013-01-29 00:06:20 +01:00
Robin Appelman
74f6f85628
merge master into filesystem
2013-01-28 19:37:58 +01:00
Robin Appelman
06c1c35ac9
Fix phpdoc
2013-01-28 19:08:30 +01:00
Björn Schießle
590c4aa710
search display name instead of uid; fix key/value order for array access
2013-01-28 15:58:40 +01:00
Björn Schießle
c00b66fe5b
implement DisplayNamesInGroup for database back-end
2013-01-28 15:47:57 +01:00
Robin Appelman
232cc3211b
add oc:// streamwrapper to provide access to ownCloud's virtual filesystem
2013-01-28 15:35:30 +01:00
Robin Appelman
c9c919da57
Move streamwrappers to seperate files and put them in a namespace
2013-01-28 15:34:15 +01:00
Björn Schießle
e6cc0cd08a
implement display names for the database back-end
2013-01-28 15:07:31 +01:00
Lukas Reschke
99ec26578a
Merge pull request #1313 from owncloud/updater-CSP
...
Make update page with CSP compatible
2013-01-28 05:43:47 -08:00
Björn Schießle
70c3ab3c53
update the display name for the database back-end
2013-01-28 14:23:15 +01:00
Björn Schießle
e0f2ed2757
interface and API to change display names
2013-01-28 14:09:11 +01:00
Björn Schießle
022a7b13b8
prepare user table to show and edit display names
2013-01-28 13:12:44 +01:00
Björn Schießle
996b5cf368
change order, key -> uid and value -> display name, this way it is also possible to have non-unique display names
2013-01-28 13:10:54 +01:00
Thomas Müller
857b15db37
Merge pull request #1318 from j-ed/master
...
added parameter mail_smtpauthtype to set SMTP authentication type.
2013-01-28 01:42:46 -08:00
Thomas Mueller
1d44a99ebb
Merge branch 'master' into updater-CSP
...
Conflicts:
core/templates/update.php
2013-01-28 09:57:24 +01:00
Thomas Müller
31d83fddc4
Merge pull request #1321 from owncloud/csp-fixes
...
Files: CSP fixes
2013-01-28 00:29:46 -08:00
Robin Appelman
bca5ce724e
Merge branch 'master' into filesystem
2013-01-28 02:35:51 +01:00
Robin Appelman
3e59a87153
Filesystem: use the updated Mount::findById in getPath to ensure we get the correct path if the storage is also mounted outside the view
2013-01-28 01:02:04 +01:00
Robin Appelman
577e3b11d7
Filesystem: return all matching mounts in Mount::findById
2013-01-28 00:59:43 +01:00
hkjolhede
77763fb856
Update lib/filestorage/common.php
...
Small cleanup
2013-01-27 16:07:21 +01:00
Robin Appelman
4cae141673
Filesystem: also add getPath to \OC\Filesystem
2013-01-27 00:18:15 +01:00
Robin Appelman
17bcea1585
Filesystem: add View->getPath to the cache api
2013-01-27 00:13:50 +01:00
Robin Appelman
9e2a066c7b
Cache: add function to get storage id and internal path of a file by id
2013-01-27 00:13:50 +01:00
Robin Appelman
69f11151e9
Filesystem: add Mount::findById
2013-01-27 00:13:49 +01:00
Jenkins for ownCloud
00a28062e1
[tx-robot] updated from transifex
2013-01-27 00:06:21 +01:00
TheSFReader
9c7a18044d
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-01-26 23:19:40 +01:00
Michael Gapczynski
03b947e3ec
Don't check for updates for sub storages, these scans should be done in the background
2013-01-26 16:11:35 -05:00
Henrik Kjölhede
b1b2eafa50
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/files_external/lib/config.php
2013-01-26 21:51:18 +01:00
Robin Appelman
f25db779d9
Filesystem: move mount management to it's own class
2013-01-26 21:44:33 +01:00
Michael Gapczynski
7237ebf08b
Fix OC_Helper and change deprecated methods
2013-01-26 15:16:53 -05:00
hkjolhede
2fa3efd697
Update lib/filestorage/common.php
...
Added function to clean a path
2013-01-26 19:44:09 +01:00
Robin Appelman
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +01:00
Lukas Reschke
c9e25d3fab
Merge pull request #1320 from owncloud/implements-1316-master
...
lookup for OCA classes in all apps folders
2013-01-26 05:20:15 -08:00
Lukas Reschke
7f0a3018b6
Fix undefined variable
2013-01-26 13:46:00 +01:00
Thomas Müller
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
Thomas Mueller
2cc77759aa
lookup for OCA classes in all apps folders
2013-01-26 12:45:50 +01:00
j-ed
93834b78a1
Update lib/mail.php
...
added parameter mail_smtpauthtype to set SMTP authentication type.
2013-01-26 12:09:54 +01:00
Jenkins for ownCloud
af4411e33d
[tx-robot] updated from transifex
2013-01-26 00:10:07 +01:00
Lukas Reschke
a65410f23c
Remove the CSP header for Firefox
...
https://bugzilla.mozilla.org/show_bug.cgi?id=737064 *gnarf*
2013-01-25 21:57:51 +01:00
Lukas Reschke
dbc13cf6ee
Move update inline JS
2013-01-25 19:18:16 +01:00
Lukas Reschke
7f49d35930
Move checkMaintenance and checkUpgrade
...
This is needed to ensure that the routing and linkTo() function for CSP
are available.
2013-01-25 19:15:02 +01:00
Björn Schießle
a606e8d944
use display name to show share_width and owner information
2013-01-25 17:40:23 +01:00
TheSFReader
2aead5727e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-01-25 17:15:02 +01:00
TheSFReader
9f5847b739
Simplify the code and remove a first unnecessary (and non conform) '&' character when there are pending arguments
2013-01-25 17:02:44 +01:00
Lukas Reschke
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
Lukas Reschke
0d2a58bc5d
Initialize router also if ownCloud isn't installed
2013-01-25 14:57:52 +01:00
Lukas Reschke
e5cc5a0a2d
Allow the loading of external images
2013-01-25 14:26:14 +01:00
Tom Needham
934735043b
API: Remove api response structure from OC_OCS_Result, handle multiple registered methods for api calls
2013-01-25 12:48:59 +00:00
Björn Schießle
b4291f1e8e
allow to get the display name from an abitrary user
2013-01-25 13:00:17 +01:00
Björn Schießle
4271430e60
get all display names from users in a given group
2013-01-25 11:48:03 +01:00
Björn Schießle
9bb8e05839
get all display names
2013-01-25 11:05:00 +01:00
Jenkins for ownCloud
6832dddf39
[tx-robot] updated from transifex
2013-01-25 00:05:56 +01:00
Björn Schießle
2fee1208ef
add display name to title instead if login-ID
2013-01-24 15:49:23 +01:00
Björn Schießle
d16574f070
new branch which introduces display names
...
first commit with some infrastructure code
2013-01-24 13:07:59 +01:00
Tom Needham
b26279546c
Simpler method for getting the first char
2013-01-24 10:49:48 +00:00
Tom Needham
d89be72972
Remove some whitespace
2013-01-24 10:40:47 +00:00
Tom Needham
02f8c941f4
API: If key begins with '@' treat it as an xml attribute
2013-01-24 10:39:33 +00:00
Thomas Müller
1dac2ba496
Merge pull request #1286 from owncloud/ocs_api
...
Check that external api methods return instances of OC_OCS_Result
2013-01-24 02:37:40 -08:00
Lukas Reschke
f9a9fc5670
Merge pull request #1265 from j-ed/master
...
add additional mail_smtp.. parameters to fix possible SMTP connection problems.
2013-01-24 00:11:03 -08:00
Tom Needham
8f9d3cd01d
Code style update
2013-01-23 23:39:29 +00:00
Jenkins for ownCloud
3ff32eba25
[tx-robot] updated from transifex
2013-01-24 00:07:38 +01:00
Sam Tuke
14d0903a28
Merge branch 'master' of github.com:owncloud/core
2013-01-23 12:52:53 +00:00
Lukas Reschke
293e7bdcf0
Notice about changing the standard policy
2013-01-23 13:44:43 +01:00
Lukas Reschke
0517465f4d
Allow admins to change the CSP policy in the config file
2013-01-23 13:42:52 +01:00
Thomas Mueller
b4c3dd84b4
update to jquery-ui 1.10.0
2013-01-23 11:37:52 +01:00
Lukas Reschke
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
Jenkins for ownCloud
c986dbe573
[tx-robot] updated from transifex
2013-01-23 00:06:18 +01:00
Michael Gapczynski
9eecb91338
Merge pull request #1113 from owncloud/fix-issue-1085
...
Fix rendering of database connection error page
2013-01-22 14:38:44 -08:00
Robin Appelman
f858381775
merge master into filesystem
2013-01-22 23:27:04 +01:00
Thomas Müller
ec8609fa21
Merge pull request #1259 from TheSFReader/master
...
Add two specific mimetype extensions (ebooks): for epub and mobi files
2013-01-22 14:06:50 -08:00
Robin Appelman
9a1f65aab1
Some style fixes
2013-01-22 20:58:09 +01:00
Robin Appelman
7330fcf5e8
Cache: make mounts overwrite existing folders, prevents duplicate entries
2013-01-22 20:57:15 +01:00
Sam Tuke
aa648fca75
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_encryption/templates/settings.php
2013-01-22 17:31:05 +00:00
Sam Tuke
619780a67d
Merge branch 'master' into files_encryption
2013-01-22 16:50:20 +00:00
j-ed
df6ba6955d
Update lib/mail.php
...
Added three additional mail_smtp.. parameters.
- mail_smtpdebug - enable debug messages to analyse SMTP problems.
- mail_smtptimeout - set SMTP timeout which is set to 10s by
default and this is sometimes to short especially if a malware/
spam scanner is used.
- mail_smtpsecure - force secure SMTP connections.
2013-01-22 14:13:24 +01:00
Lukas Reschke
bd5ff29716
Merge branch 'master' into no-inline-js
2013-01-22 11:50:33 +01:00
Lukas Reschke
351d206dd3
Allow eval() and send headers for legacy browsers
...
The blocking of eval() seems to have problems with JQuery 1.7.2 - let's allow it for now and disable it in the future.
2013-01-22 08:09:01 +01:00
Michael Gapczynski
5136f6d818
Make database connection error messages less verbose
2013-01-21 22:53:32 -05:00
Lukas Reschke
3ffbaf4795
Allow iframes to external domains
2013-01-22 00:30:09 +01:00
Robin Appelman
f2d0eeae83
Merge branch 'master' into filesystem
2013-01-22 00:19:44 +01:00
Robin Appelman
8ede3290ae
Cache: add database indexes for mimetype and mimepart
2013-01-21 22:31:44 +01:00
Lukas Reschke
30274ee33e
Move to OC_App
2013-01-21 22:18:11 +01:00
Lukas Reschke
a29f9f90ab
Indentation
2013-01-21 22:17:48 +01:00
Robin Appelman
42a1a17a30
Cache: return non numberic storage id
2013-01-21 22:01:22 +01:00
Lukas Reschke
0c59074eeb
Correct copy paste fail
2013-01-21 20:46:42 +01:00
Frank Karlitschek
a27f92a17a
we are getting closer. updating is not working yet.
2013-01-21 20:40:23 +01:00
Lukas Reschke
8ca78fcf3f
Move requesttoken to oc-requesttoken.js
2013-01-21 20:24:18 +01:00
Thomas Mueller
d58cee2f76
returning http status code 503 in case connecting to the database failed
2013-01-21 14:57:33 +01:00
Jenkins for ownCloud
aede26d996
[tx-robot] updated from transifex
2013-01-21 00:05:34 +01:00
Lukas Reschke
af8c193605
Disallow inline JS
2013-01-20 23:30:16 +01:00
Thomas Mueller
dea77b7610
cached queries need to be reset on schema change because they become invalid
...
fixes: https://github.com/owncloud/apps/issues/468
2013-01-20 22:46:26 +01:00
Lukas Reschke
967b7947a1
Add the default-src
2013-01-20 12:19:09 +01:00
Lukas Reschke
c82d6e5153
Add CSP header
2013-01-20 12:06:33 +01:00
Robin Appelman
4c05661875
Merge branch 'filesystem' of github.com:owncloud/core into filesystem
2013-01-20 03:11:50 +01:00
Robin Appelman
83d6221322
merge master into filesytem
2013-01-20 03:11:04 +01:00
Michael Gapczynski
664f33a29c
Update mtimes of all parent folders after change inside
2013-01-19 21:04:25 -05:00
Jenkins for ownCloud
ebc0c4b85b
[tx-robot] updated from transifex
2013-01-20 00:06:40 +01:00
Lukas Reschke
42b924da0e
Also replace the backslash with a minus
...
For Windows systems
2013-01-19 19:47:26 +01:00
Bernhard Posselt
f1939866f3
Merge pull request #1214 from Raydiation/master
...
Load Classpaths of apps before appinfo/routes.php
2013-01-19 09:44:48 -08:00
Thomas Mueller
b8318e6df4
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-19 15:58:15 +01:00
Michael Gapczynski
316eef3ded
Fix sharing issue with collection and children mismatches
2013-01-19 01:50:02 -05:00
Michael Gapczynski
cd8d8360b0
Disable fancy folder sharing for now
2013-01-18 23:57:13 -05:00
Michael Gapczynski
5df6f9d14d
Fix merge
2013-01-18 23:56:47 -05:00
Michael Gapczynski
9e28f924c2
Merge branch 'master' into move-datadirectory-checks
2013-01-18 23:31:06 -05:00
Michael Gapczynski
da34e58589
Move permissions check to new function checkDataDirectoryPermissions()
2013-01-18 23:30:56 -05:00
Jenkins for ownCloud
a17ca3a69a
[tx-robot] updated from transifex
2013-01-19 00:05:38 +01:00
Thomas Mueller
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
Thomas Müller
31cc9aa80d
Merge pull request #986 from owncloud/fixing-784-master
...
the maximum upload size is now part of the response of the upload and de...
2013-01-18 14:06:00 -08:00
Thomas Mueller
5ff29b4348
fixing indent
2013-01-18 20:09:03 +01:00
davidgumberg
487e401361
Typo fix (comment) /lib/base.php
2013-01-18 10:52:29 -08:00
Bart Visscher
9ffd4197ae
Fix wrong word in comment
2013-01-18 16:38:40 +01:00
Björn Schießle
d2c5f9bec7
fix error message, add "appid" to the output to know which app caused the error if OC_App::getStorage() fails.
...
Port of approved patch for stable45: https://github.com/owncloud/core/pull/1222
2013-01-18 15:14:42 +01:00
Thomas Müller
0ed635240a
Merge pull request #1205 from owncloud/ocs_api
...
Return 401 headers when trying to access a restricted api call
2013-01-18 05:52:51 -08:00
Thomas Müller
5df57e4ada
Merge pull request #1181 from owncloud/return-503-in-maintenance
...
in case of maintenance the error page returns http status 503.
2013-01-18 04:02:03 -08:00
Jenkins for ownCloud
824fcf6624
[tx-robot] updated from transifex
2013-01-18 00:04:36 +01:00
TheSFReader
73522fe189
Add ebook specific mimetypes
2013-01-17 22:20:57 +01:00
TheSFReader
eb9cd0858e
Add ebook specific mimetypes
2013-01-17 21:57:04 +01:00
Bernhard Posselt
2b95ae1e6d
spaces to tabs
2013-01-17 21:44:40 +01:00
Bernhard Posselt
a8094abac7
load classpaths of apps before routes
2013-01-17 21:42:46 +01:00
tomneedham
b4954c0c89
Correct spelling of 'Authorization'
2013-01-17 16:30:14 +00:00
Frank Karlitschek
d85e440aa1
Merge pull request #1148 from seancomeau/topic/setup
...
Fix issue #108
2013-01-16 22:38:57 -08:00
Jenkins for ownCloud
433fa19268
[tx-robot] updated from transifex
2013-01-17 00:27:40 +01:00
Tom Needham
a08e8632bb
Add <syncpollinterval> and order the result for /cloud/capabilities
2013-01-16 21:57:06 +00:00
Tom Needham
9dc668740a
Check that api methods return the correct result type
2013-01-16 21:46:00 +00:00
Robin Appelman
6871a150bd
Cache: use a database transition for scanning each folder
...
gives a massive speed improvement while scanning files
2013-01-16 21:58:17 +01:00
Tom Needham
0956cae39e
Add new /cloud/capabilities route and remove unused methods
2013-01-16 20:43:46 +00:00
Robin Appelman
f9c42a196f
Cache: no longer using this file
2013-01-16 21:36:04 +01:00
Tom Needham
358671ac1d
Fix incorrect indentation
2013-01-16 20:29:29 +00:00
Tom Needham
098c84a29c
Return 401 headers when authentication is required for the api call
2013-01-16 20:27:43 +00:00
Robin Appelman
29ec007979
Cache: dont migrate permissions, cache them on demain instead
2013-01-16 19:11:33 +01:00
Robin Appelman
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
Bart Visscher
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
Bart Visscher
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
Jan-Christoph Borchardt
cb0fd30458
Merge pull request #1185 from owncloud/fixing-1162-master
...
handling proper display of files/folders with negative size
2013-01-16 05:18:53 -08:00
Thomas Müller
1f7bf57ece
Merge pull request #1195 from owncloud/cache_prepared
...
Cache prepared statements in OC_DB
2013-01-15 22:23:34 -08:00
Robin Appelman
f18fc1c510
Clear cached prepared statements when switching between mdb2 and pdo
2013-01-16 01:12:13 +01:00
Thomas Müller
4668f8c86e
Merge pull request #1178 from owncloud/return_true_because_of_ponies
...
Remove uneeded return
2013-01-15 14:01:48 -08:00
Robin Appelman
a08490364d
Cache prepared statements in OC_DB
2013-01-15 20:21:06 +01:00
Robin Appelman
7debfac0dc
Cache: more efficient upgrading
2013-01-15 19:11:12 +01:00
Robin Appelman
94068e5d08
Cache: show upgrade progress
2013-01-15 18:13:50 +01:00
Robin Appelman
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
Thomas Mueller
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
Thomas Mueller
44e5c052b3
handling proper display of files/folders with negative size
...
refs #1162
2013-01-14 23:39:31 +01:00
Lukas Reschke
ab287d2ba4
Move { to same line
2013-01-14 22:04:31 +01:00
Lukas Reschke
c845e75693
Expand if to multiple lines
...
Oneliners are ugly.
2013-01-14 22:01:52 +01:00
Bart Visscher
53ca0db434
Merge pull request #1177 from owncloud/OC_User--isAdminUser()
...
Check if user is admin - bool
2013-01-14 12:53:18 -08:00
Thomas Mueller
31ce320c52
in case of maintenance the error page returns http status 503.
...
This is necessary to enable the desktop sync client to react properly.
Currently the SabreDAV plugin OC_Connector_Sabre_MaintenancePlugin is not executed because this error page is returned before the SabreDAV code is executed
2013-01-14 21:39:55 +01:00
Lukas Reschke
eab6d7eb23
Enhanced auth is totally unmaintained and broken
...
Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)
2013-01-14 21:39:49 +01:00
Sean Comeau
0132a0b2cf
Rename TestException to DatabaseSetupException
2013-01-14 12:36:50 -08:00
Bart Visscher
8b2307ce4b
Merge pull request #1172 from owncloud/isSubDirectory
...
Simplify the isSubDirectory() function
2013-01-14 12:36:38 -08:00
Sean Comeau
42cd99626e
Use a custom exception instead of adding a delimiter to the error message
2013-01-14 11:57:40 -08:00
Lukas Reschke
cc00c54f6a
Remove uneeded returns
2013-01-14 20:18:08 +01:00
Lukas Reschke
e8b45caa51
Remove uneeded return
...
Thx @Raydiation
2013-01-14 19:57:28 +01:00
Lukas Reschke
31b1a73e1f
Check if user is admin - bool
...
There was no "isAdminUser()" function which returned bool. This is
irritiating as there were a loooooooot of places in the code which
checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not
use a function for this?
(Especially if you consider that we might change the group name in the
future, which would lead to problems then)
Additionally, @Raydiation needed such a method for his AppFramework :)
2013-01-14 19:45:17 +01:00
Sam Tuke
de0ed634f2
Added two hooks: pre_unshare and pre_unshareAll, useful for files_encryption
2013-01-14 17:05:47 +00:00
Lukas Reschke
99adfbdb86
Check for string position instead of string existence
...
otherwise /foo/bar would be detected as a subfolder of /bar
THX @icewind1991
2013-01-14 16:51:35 +01:00
Bart Visscher
fa78fbe0c3
Merge pull request #1112 from Raydiation/master
...
This fixes a problem that prevented app routes from being loaded after ocs_api merge
2013-01-14 07:35:14 -08:00
Jenkins for ownCloud
c29310aaef
[tx-robot] updated from transifex
2013-01-14 00:18:21 +01:00
Lukas Reschke
b7db967dc5
Commentblocks should begin with two *
2013-01-13 14:54:18 +01:00
Lukas Reschke
c27833b143
Add @brief to description
2013-01-13 14:50:31 +01:00
Lukas Reschke
e151210a62
Simplify the isSubDirectory() function
...
isSubDirectory() checks if a specified $sub is a subdirectory of the
$parent, this is needed to prevent file inclusions.
Actually, the current code is more kind of a "hack" which I always
struggle over if browsing through source. So this should be a much
better implementation.
The implementation is really straightforward:
- [realpath()](http://php.net/manual/function.realpath.php ) expands all
symbolic links and resolves references to '/./', '/../' and extra '/'
characters in the input path and return the canonicalized absolute
pathname.
- [strpos()](php.net/manual/function.strpos.php) returns FALSE if the
substring wasn't found.
Since this is an absolutely critical piece of code, I'd like to ensure
that this is absolutely safe!
2013-01-13 14:33:19 +01:00
Michael Gapczynski
ebcf41b420
Move data directory permission checks after data directory existence checks
2013-01-12 23:35:13 -05:00
Michael Gapczynski
094a852bff
Wrap the etag in double quotes
2013-01-11 21:09:58 -05:00
Michael Gapczynski
b30648cb7d
Don't waste time making another call since we know it doesn't exist
2013-01-11 21:09:01 -05:00
Michael Gapczynski
a00b9e0a03
Bump version
2013-01-11 21:01:28 -05:00
Michael Gapczynski
6f049d0889
Merge branch 'filesystem' into filesystem-etags
2013-01-11 21:00:02 -05:00
Michael Gapczynski
9e2f3a5324
Remove old create etag function
2013-01-11 20:59:53 -05:00
Michael Gapczynski
8a63bcc1e8
Don't use more entropy for etags
2013-01-11 20:56:36 -05:00
Thomas Mueller
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
Thomas Mueller
23896a7290
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 09:53:12 +01:00
Michael Gapczynski
4835525c46
Switch scan to scanFile for root of mount points
2013-01-10 22:28:50 -05:00
Thomas Müller
60489764f3
Merge pull request #1133 from owncloud/add_linebreaks_in_sharing
...
add more linebreaks, replace SQL LIMIT with param
2013-01-10 15:14:14 -08:00
Jenkins for ownCloud
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
Sean Comeau
ba9c967435
Throw an exception when creating a MySQL user fails and display exception error text to user
2013-01-10 14:43:08 -08:00
Sam Tuke
3e83023bf6
Removed unnecessary line
2013-01-10 18:16:56 +00:00
Sam Tuke
9ca9124dc1
Merge branch 'master' into files_encryption
2013-01-10 18:07:15 +00:00
Michael Gapczynski
aa15fcf22f
Scan mount points in root before adding a entry
2013-01-10 12:09:55 -05:00
Thomas Müller
23dd7f1bea
Merge pull request #1127 from owncloud/fixing-641-for-webdav-master
...
webdav returns "503 Service Unavailable" in case the ownCloud server is ...
2013-01-10 02:27:00 -08:00
Michael Gapczynski
106541361c
Change length of mimetypes to 255, the maximum length according to RFC 4288
2013-01-09 22:57:42 -05:00
Michael Gapczynski
fbcf62389c
Merge branch 'master' into external_storage_ui_feedback
...
Conflicts:
apps/files_external/lib/webdav.php
2013-01-09 21:49:21 -05:00
Jenkins for ownCloud
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
Jörn Friedrich Dreyer
42e3eaf45a
add more linebreaks, replace SQL LIMIT with param
2013-01-09 13:57:51 +01:00
Thomas Mueller
ccdaec6296
webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode.
2013-01-09 00:37:50 +01:00
Björn Schießle
43415386a8
Upstream merged my patch to add additional ssl root certificates to the webdav client.
...
This means that OC_Connector_Sabre_Client is no longer needed
2013-01-08 17:44:28 +01:00
Michael Gapczynski
e8b195bf10
Almost fix Shared scanner...
2013-01-07 20:52:51 -05:00
Bernhard Posselt
75dbe88664
added cleanup recommendations by including ocs in the cachedKey method and moving the ocs routes stuff at the end of the loadRoutes method
2013-01-07 21:57:13 +01:00
Michael Gapczynski
5174eda232
Fix permissions for mount point
2013-01-07 15:21:38 -05:00
Michael Gapczynski
d39655e126
Move template parameters around so database error page is properly rendered
2013-01-07 14:15:51 -05:00
Michael Gapczynski
6801f82d09
Merge branch 'filesystem' into filesystem-etags
...
Conflicts:
lib/files/cache/cache.php
2013-01-07 10:28:37 -05:00
Bernhard Posselt
5ccbfd9079
readded ocs routes
2013-01-07 15:48:45 +01:00
Bernhard Posselt
f80bc4ed53
fixed error that displayed a white page and a warning that routes could not be loaded from apps that was caused by the ocs_api merge
2013-01-07 15:34:42 +01:00
Robin Appelman
d0377b1951
Cache: normalize mimetypes
2013-01-07 02:09:21 +01:00
Robin Appelman
439578288f
Cache: split permission cache scanning and cache scanning
2013-01-07 01:03:11 +01:00
Robin Appelman
457dc270f5
Fix messed up mounts
2013-01-07 00:36:39 +01:00
Robin Appelman
0ca5047da5
Autoload namespaced test classes
2013-01-07 00:36:01 +01:00
Robin Appelman
e8d08d4930
merge master into filesystem
2013-01-07 00:16:10 +01:00
Thomas Mueller
a21da9f9fd
fixing returns
2013-01-06 23:59:02 +01:00
Thomas Mueller
1093cdd823
fixing returns
2013-01-06 23:57:27 +01:00
Thomas Mueller
19edb29cc3
add missing return
2013-01-06 23:54:18 +01:00
Thomas Mueller
cdd28fcc46
fixing undefined variable $where
2013-01-06 23:48:04 +01:00
Thomas Mueller
408b2cba58
fixing undefined variable $result - should be $query I assume
2013-01-06 23:45:12 +01:00
Thomas Mueller
01cecc9522
initialize $result
2013-01-06 23:43:02 +01:00
Thomas Mueller
19e604c104
fixing call of OC_Log::write() - missing parameter
2013-01-06 23:30:17 +01:00
Thomas Mueller
a143e77ee4
removing unused parameter $parameters
...
fixing undefined variable $useDir
2013-01-06 23:29:43 +01:00
Thomas Mueller
bae1755184
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
lib/helper.php
2013-01-06 22:40:35 +01:00
Sam Tuke
a68b597e83
Merge branch 'master' into files_encryption
2013-01-06 18:53:32 +00:00
Thomas Mueller
7ebfcab49b
Merge branch 'master' into fixing-998-master
...
Conflicts:
lib/helper.php
2013-01-06 12:18:21 +01:00
Thomas Mueller
6806484c16
Merge branch 'master' into fixing-998-master
2013-01-06 10:36:14 +01:00
Michael Gapczynski
035d0aa9d5
Merge branch 'master' into update-progress
2013-01-05 12:24:21 -05:00
Sam Tuke
69e86c0213
Merge branch 'master' into files_encryption
2013-01-05 17:22:01 +00:00
Michael Gapczynski
f6426cee04
Tweak failure message and throw exceptions from updateDbFromStructure()
2013-01-05 12:13:36 -05:00
Michael Gapczynski
89823ef4f9
Modify and include additional update messages from updating apps
2013-01-05 11:28:01 -05:00
Thomas Müller
0c6213a371
Merge pull request #1066 from owncloud/fix-388-master
...
workaround for 32-bit systems to handle filesizes bigger than 2GB
2013-01-05 06:21:28 -08:00
Michael Gapczynski
0b13b41189
Merge pull request #1053 from owncloud/ocs_api
...
External API for ownCloud based on OCS
2013-01-04 17:18:58 -08:00
Michael Gapczynski
a94405b4e4
Only show the version updating to instead of worrying about converting internal to a formatted version
2013-01-04 20:13:00 -05:00
Thomas Mueller
da28ae0069
remove duplicate return
2013-01-05 00:09:37 +01:00
Thomas Mueller
2cb6632752
enhanced log message
2013-01-04 23:44:01 +01:00
Thomas Mueller
ac50c2f973
documentation adjusted on the way
2013-01-04 23:04:23 +01:00
Thomas Mueller
cedec593ee
Fallback to use COM or exec('stat ..') is only executed if stat or filesize return negative values.
...
Special case of BSD has been added as stat syntax differs
In addition unknown OS is logged
2013-01-04 23:03:26 +01:00
Thomas Mueller
dfc8d757b5
OC_Helper::is_function_enabled() added to find out if a function is available
...
And some documentation adjusted on the way
2013-01-04 23:00:51 +01:00
Michael Gapczynski
f2e6df807d
Add back check if installed around background jobs
2013-01-04 14:16:59 -05:00
Michael Gapczynski
e7eea3dd2e
Use hooks to send updates from apps
2013-01-04 10:21:33 -05:00
Michael Gapczynski
7505837079
Basic update progress of database update only
2013-01-03 21:32:33 -05:00
Michael Gapczynski
a52aa69ffe
Rearrange code to prepare for updater feedback
2013-01-03 14:11:00 -05:00
Michael Gapczynski
1137723b2a
Remove unnecessary length parameter from last commit
2013-01-03 12:13:45 -05:00
Michael Gapczynski
38876fc98a
Update old storage classes names to the new namespace during mounting
2013-01-03 12:07:04 -05:00
Robin Appelman
e40be93e87
merge master into filesystem
2013-01-03 15:59:17 +01:00
Michael Gapczynski
ce443818d4
Check if oc_token cookie exists before trying to use it
2013-01-02 19:59:04 -05:00
Thomas Mueller
045c0acc92
workaround for 32-bit systems to handle filesizes bigger than 2GB
2013-01-03 00:38:44 +01:00
Thomas Mueller
34e5cb5070
fixing indent
2013-01-03 00:13:30 +01:00
Jenkins for ownCloud
3bcdd8c900
[tx-robot] updated from transifex
2013-01-03 00:05:19 +01:00
Thomas Müller
9dc5ea172e
Merge pull request #975 from irgsmirx/patch-1
...
Update lib/util.php
2013-01-02 14:01:38 -08:00
Michael Gapczynski
a068ddff64
Use the sub storage's permission cache for retrieving the correct permission
2013-01-02 14:40:06 -05:00
Thomas Mueller
1727b2e84d
add smtp port configuration option
2013-01-02 19:04:08 +01:00
Sam Tuke
bf69677933
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files/css/files.css
apps/files/index.php
apps/files/js/files.js
apps/files/js/keyboardshortcuts.js
apps/files/l10n/da.php
apps/files/l10n/el.php
apps/files/l10n/eu.php
apps/files/l10n/hu_HU.php
apps/files/l10n/mk.php
apps/files/l10n/nb_NO.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/ru_RU.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/templates/admin.php
apps/files/templates/index.php
apps/files/templates/part.breadcrumb.php
apps/files_encryption/appinfo/app.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/settings.php
apps/files_encryption/templates/settings.php
apps/files_encryption/tests/proxy.php
apps/files_encryption/tests/stream.php
apps/files_external/l10n/gl.php
apps/files_external/l10n/uk.php
apps/files_external/personal.php
apps/files_external/settings.php
apps/files_external/templates/settings.php
apps/files_sharing/public.php
apps/user_ldap/l10n/gl.php
apps/user_ldap/l10n/uk.php
apps/user_ldap/lib/access.php
apps/user_webdavauth/l10n/eo.php
apps/user_webdavauth/l10n/eu.php
apps/user_webdavauth/l10n/fr.php
apps/user_webdavauth/l10n/gl.php
apps/user_webdavauth/l10n/sl.php
apps/user_webdavauth/l10n/tr.php
apps/user_webdavauth/l10n/uk.php
apps/user_webdavauth/l10n/zh_CN.php
core/ajax/share.php
core/css/styles.css
core/l10n/ca.php
core/l10n/de.php
core/l10n/de_DE.php
core/l10n/el.php
core/l10n/eo.php
core/l10n/es.php
core/l10n/eu.php
core/l10n/fr.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/is.php
core/l10n/it.php
core/l10n/nl.php
core/l10n/pl.php
core/l10n/pt_PT.php
core/l10n/ru.php
core/l10n/sl.php
core/l10n/tr.php
core/l10n/uk.php
core/l10n/zh_CN.php
core/templates/installation.php
core/templates/login.php
l10n/ar/files_external.po
l10n/ar/settings.po
l10n/bg_BG/files_external.po
l10n/bg_BG/settings.po
l10n/ca/core.po
l10n/ca/files_external.po
l10n/ca/settings.po
l10n/cs_CZ/files_external.po
l10n/cs_CZ/settings.po
l10n/da/files.po
l10n/da/files_external.po
l10n/da/settings.po
l10n/de/core.po
l10n/de/files_external.po
l10n/de/settings.po
l10n/de_DE/core.po
l10n/de_DE/files_external.po
l10n/de_DE/settings.po
l10n/el/core.po
l10n/el/files.po
l10n/el/files_external.po
l10n/el/settings.po
l10n/eo/core.po
l10n/eo/files_external.po
l10n/eo/settings.po
l10n/eo/user_webdavauth.po
l10n/es/core.po
l10n/es/files_external.po
l10n/es/settings.po
l10n/es_AR/core.po
l10n/es_AR/files_external.po
l10n/es_AR/settings.po
l10n/et_EE/files_external.po
l10n/et_EE/settings.po
l10n/et_EE/user_webdavauth.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/files_external.po
l10n/eu/settings.po
l10n/eu/user_webdavauth.po
l10n/fa/files_external.po
l10n/fa/settings.po
l10n/fi_FI/files_external.po
l10n/fi_FI/settings.po
l10n/fr/core.po
l10n/fr/files_external.po
l10n/fr/settings.po
l10n/fr/user_webdavauth.po
l10n/gl/core.po
l10n/gl/files_external.po
l10n/gl/settings.po
l10n/gl/user_ldap.po
l10n/gl/user_webdavauth.po
l10n/he/core.po
l10n/he/files_external.po
l10n/he/settings.po
l10n/hi/files_external.po
l10n/hi/settings.po
l10n/hr/files_external.po
l10n/hr/settings.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hu_HU/settings.po
l10n/ia/files_external.po
l10n/ia/settings.po
l10n/id/files_external.po
l10n/id/settings.po
l10n/is/core.po
l10n/is/files.po
l10n/is/files_encryption.po
l10n/is/files_external.po
l10n/is/files_sharing.po
l10n/is/files_versions.po
l10n/is/lib.po
l10n/is/settings.po
l10n/is/user_ldap.po
l10n/is/user_webdavauth.po
l10n/it/core.po
l10n/it/files_external.po
l10n/it/settings.po
l10n/ja_JP/core.po
l10n/ja_JP/files_external.po
l10n/ja_JP/settings.po
l10n/ka_GE/files_external.po
l10n/ka_GE/settings.po
l10n/ko/core.po
l10n/ko/files_external.po
l10n/ko/settings.po
l10n/ko/user_ldap.po
l10n/ko/user_webdavauth.po
l10n/ku_IQ/files_external.po
l10n/ku_IQ/settings.po
l10n/lb/files_external.po
l10n/lb/settings.po
l10n/lt_LT/files_external.po
l10n/lt_LT/settings.po
l10n/lv/files_external.po
l10n/lv/settings.po
l10n/mk/files.po
l10n/mk/files_external.po
l10n/mk/settings.po
l10n/ms_MY/files_external.po
l10n/ms_MY/settings.po
l10n/nb_NO/files.po
l10n/nb_NO/files_external.po
l10n/nb_NO/settings.po
l10n/nl/core.po
l10n/nl/files_external.po
l10n/nl/settings.po
l10n/nn_NO/files_external.po
l10n/nn_NO/settings.po
l10n/oc/files_external.po
l10n/oc/settings.po
l10n/pl/core.po
l10n/pl/files_external.po
l10n/pl/settings.po
l10n/pl_PL/files_external.po
l10n/pl_PL/settings.po
l10n/pt_BR/core.po
l10n/pt_BR/files_external.po
l10n/pt_BR/settings.po
l10n/pt_PT/core.po
l10n/pt_PT/files_external.po
l10n/pt_PT/settings.po
l10n/ro/files.po
l10n/ro/files_external.po
l10n/ro/settings.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru/settings.po
l10n/ru_RU/files.po
l10n/ru_RU/files_external.po
l10n/ru_RU/settings.po
l10n/si_LK/files_external.po
l10n/si_LK/settings.po
l10n/sk_SK/core.po
l10n/sk_SK/files_external.po
l10n/sk_SK/settings.po
l10n/sk_SK/user_webdavauth.po
l10n/sl/core.po
l10n/sl/files_external.po
l10n/sl/settings.po
l10n/sl/user_webdavauth.po
l10n/sq/core.po
l10n/sq/files_external.po
l10n/sq/settings.po
l10n/sq/user_ldap.po
l10n/sq/user_webdavauth.po
l10n/sr/core.po
l10n/sr/files_external.po
l10n/sr/settings.po
l10n/sr@latin/files_external.po
l10n/sr@latin/settings.po
l10n/sv/files_external.po
l10n/sv/settings.po
l10n/ta_LK/files_external.po
l10n/ta_LK/settings.po
l10n/ta_LK/user_ldap.po
l10n/ta_LK/user_webdavauth.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/files_external.po
l10n/th_TH/settings.po
l10n/th_TH/user_webdavauth.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/files_external.po
l10n/tr/settings.po
l10n/tr/user_webdavauth.po
l10n/uk/core.po
l10n/uk/files_external.po
l10n/uk/settings.po
l10n/uk/user_ldap.po
l10n/uk/user_webdavauth.po
l10n/vi/core.po
l10n/vi/files_external.po
l10n/vi/settings.po
l10n/zh_CN.GB2312/files_external.po
l10n/zh_CN.GB2312/settings.po
l10n/zh_CN/core.po
l10n/zh_CN/files_external.po
l10n/zh_CN/settings.po
l10n/zh_CN/user_webdavauth.po
l10n/zh_HK/core.po
l10n/zh_HK/files_external.po
l10n/zh_HK/settings.po
l10n/zh_HK/user_ldap.po
l10n/zh_HK/user_webdavauth.po
l10n/zh_TW/core.po
l10n/zh_TW/files_external.po
l10n/zh_TW/settings.po
l10n/zh_TW/user_ldap.po
l10n/zh_TW/user_webdavauth.po
l10n/zu_ZA/files_external.po
l10n/zu_ZA/settings.po
lib/base.php
lib/filecache.php
lib/files.php
lib/helper.php
lib/l10n.php
lib/request.php
lib/util.php
settings/ajax/togglegroups.php
settings/js/users.js
settings/l10n/ar.php
settings/l10n/de_DE.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es_AR.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/gl.php
settings/l10n/he.php
settings/l10n/hi.php
settings/l10n/ko.php
settings/l10n/si_LK.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sr.php
settings/l10n/ta_LK.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/uk.php
settings/l10n/vi.php
settings/l10n/zh_CN.php
settings/l10n/zh_TW.php
settings/templates/help.php
2013-01-02 17:14:23 +00:00
Robin Appelman
54f6f1e6b7
phpdoc fixes for public api
2013-01-02 16:38:20 +01:00
Thomas Mueller
2d36a20a1d
moving storage calculation code to OC_Helper::getStorageInfo()
2013-01-02 14:35:45 +01:00
Robin Appelman
a164fd160f
Cache: provide path hints to getCache/etc where available
2013-01-01 20:20:20 +01:00
Robin Appelman
04f83e3b53
Cache: optional path argument for getCache/Scanner/etc
2013-01-01 20:20:20 +01:00
Michael Gapczynski
f4e4a06826
Forgot to select storage from filecache
2013-01-01 12:17:54 -05:00
Robin Appelman
b41189de44
Cache: allow storage backends to overwrite Watcher
2013-01-01 18:04:29 +01:00
Michael Gapczynski
f2ca7023e1
Fix Shared root problems with Watcher and Quota proxy
2013-01-01 11:19:33 -05:00
Michael Gapczynski
d0a50fae83
Fix eTagUpdate and add tests
2012-12-31 18:16:44 -05:00
Tom Needham
8a5f583cac
Remove WIP OAuth code
2012-12-31 16:19:46 +00:00
Tom Needham
9626d9ce31
Code cleanup and add copyright info
2012-12-31 16:08:21 +00:00
Tom Needham
6eb194b702
Merge branch 'master' into ocs_api
...
Conflicts:
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
2012-12-31 15:47:15 +00:00
Tom Needham
218a5ea890
Remove unused methods
2012-12-31 14:16:29 +00:00
Michael Gapczynski
aea8b0ff5c
Merge branch 'filesystem' into filesystem-etags
...
Conflicts:
lib/files/cache/updater.php
2012-12-30 21:26:48 -05:00
Michael Gapczynski
96e08a1d96
Fix function name
2012-12-30 21:23:17 -05:00
Michael Gapczynski
3ee3323b87
Fix retrieving of cache and scanner in Updater class
2012-12-30 20:27:38 -05:00
Michael Gapczynski
77f12c526b
Update etags in parent folders
2012-12-30 19:54:51 -05:00
Michael Gapczynski
83064aca51
Remove old etag code
2012-12-30 19:23:31 -05:00
Michael Gapczynski
a5cb7363a5
Use etags from file cache in SabreDAV connector
2012-12-30 19:18:05 -05:00
Jenkins for ownCloud
329bddab48
[tx-robot] updated from transifex
2012-12-31 00:05:31 +01:00
Michael Gapczynski
2c23e143d3
Store etags in the file cache
2012-12-30 16:32:55 -05:00
Jenkins for ownCloud
66e57f5fb1
[tx-robot] updated from transifex
2012-12-30 00:05:52 +01:00
Michael Gapczynski
7980bccaab
Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826
2012-12-29 19:30:31 +00:00
Michael Gapczynski
cfc3526b25
Fix data for shared root folder
2012-12-29 11:45:13 -05:00
Michael Gapczynski
8bdfb04056
Fix shared folders
2012-12-28 15:06:12 -05:00
Michael Gapczynski
ad902a9848
Move storage backend tests from constructor to test function
2012-12-28 12:00:48 -05:00
Jenkins for ownCloud
e9c51b319e
[tx-robot] updated from transifex
2012-12-28 00:20:34 +01:00
Michael Gapczynski
b035626709
Retrieve storage correctly, filename is not the mountpoint
2012-12-27 16:53:32 -05:00
Michael Gapczynski
65f1e52107
Change old is_readable to isReadable, fixes downloads
2012-12-27 15:49:48 -05:00
Jenkins for ownCloud
27f9ea2abb
[tx-robot] updated from transifex
2012-12-27 00:05:17 +01:00
Michael Gapczynski
1910057900
Fix shared statuses inside folders
2012-12-26 16:20:10 -05:00
Michael Gapczynski
b4515d874e
Only folders have Create permission
2012-12-26 15:36:50 -05:00
Robin Appelman
7e36f730ec
merge master into filesystem
2012-12-25 14:29:29 +01:00
Jenkins for ownCloud
7d52c39419
[tx-robot] updated from transifex
2012-12-24 00:12:16 +01:00
Frank Karlitschek
15da11effe
Merge pull request #845 from owncloud/sqlite_error
...
Try to fix #836
2012-12-22 15:22:09 -08:00
Thomas Müller
986f5d9f3e
fixing variable name
2012-12-21 00:04:58 +01:00
Thomas Müller
39d874cd90
the maximum upload size is now part of the response of the upload and delete operation.
...
the maximum upload size is updated within the browser once an upload or delete operation has been finished
2012-12-20 17:16:53 +01:00
irgsmirx
1e3231c732
Update lib/util.php
...
getUrlContent should take proxy setting into consideration when not using curl, as well
2012-12-20 12:01:11 +01:00
Thomas Müller
7d811e57e6
setting the timezone is now part of the login process and true part of the core.
2012-12-20 11:10:45 +01:00
root
a64a923d56
call it "proxy" instead of "curlproxy"
...
Thanks Bart for the hint.
This also switches "==" to "<>" and not the code actually works ;-)
2012-12-19 18:50:19 +01:00
Frank Karlitschek
f012135992
make it more readable as deepdiver suggested
2012-12-19 18:50:19 +01:00
Frank Karlitschek
019da9943a
add curl proxy support. Fixes #504
...
https://github.com/owncloud/core/issues/504
2012-12-19 18:50:19 +01:00
Frank Karlitschek
b162e72f94
Merge pull request #961 from owncloud/check_locale
...
add a check and a warning if setlocale is working
2012-12-19 08:53:43 -08:00
Frank Karlitschek
d7fbe47583
Merge pull request #868 from owncloud/new_doc_system
...
New doc system
2012-12-19 06:40:37 -08:00
Frank Karlitschek
196f1c3786
add a check and a warning if setlocale is working
2012-12-19 15:10:33 +01:00
Thomas Mueller
186147d1ee
refs #933 send content length header - this will allow the browser to show the progressbar
2012-12-19 11:22:01 +01:00
Randolph Carter
d2828bab07
fixes default email sender address
2012-12-19 01:09:14 +01:00
Jenkins for ownCloud
a4b0df419e
[tx-robot] updated from transifex
2012-12-18 00:14:58 +01:00
Jörn Friedrich Dreyer
b6eb95349e
fix utf8 filenames in ie download response header according to rfc5987, see http://stackoverflow.com/questions/93551/how-to-encode-the-filename-parameter-of-content-disposition-header-in-http
2012-12-17 16:46:07 +01:00
Michael Gapczynski
39eebebd99
Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826
2012-12-16 19:43:32 -05:00
Tom Needham
3c98f36121
Merge branch 'master' into ocs_api
2012-12-16 22:29:00 +00:00
Robin Appelman
4301cd7f61
wrap hooks into a try, catch to prevent a faulty app from crashing the request
2012-12-16 20:29:36 +01:00
Michael Gapczynski
bf05ff351f
Initial support for file sharing with filesystem branch
2012-12-15 19:44:59 -05:00
Robin Appelman
b12abb2c94
use numeric ids for storages in the filecache
2012-12-15 23:35:07 +01:00
Michael Gapczynski
8951769cae
Check sub storage isn't null or false
2012-12-15 17:16:26 -05:00
Tom Needham
39b5199775
API: PUT and DELETE variables are now accessed from the parameters array
2012-12-15 12:37:44 +00:00
Robin Appelman
cf3665057c
make sure folders that are not fully scanned are at least shallow scanned when we open them
...
the fact that they are in the cache does not mean they are scanned
2012-12-15 03:21:39 +01:00
Robin Appelman
4be039e6cb
Filecache Watcher: use scan or scanFile based on the current item, not the cached item
2012-12-15 03:10:56 +01:00
Robin Appelman
bc52f12162
dont insert and entry in the filecache during upgrade if the id already exists in the filecache
...
most likely the result from an incompelte upgrade
2012-12-15 02:29:34 +01:00
Robin Appelman
c6a5ce54a7
these functions should be static
2012-12-15 02:22:09 +01:00
Robin Appelman
946d58eaa8
merge master into filesystem
2012-12-15 02:21:26 +01:00
Bart Visscher
df7d6cb26c
More style fixes
2012-12-15 00:43:46 +01:00
Bart Visscher
68562dafb4
More whitespace fixes
2012-12-15 00:43:46 +01:00
Bart Visscher
2ef2dc4dda
Fix "There must be a single space between the closing parenthesis and the opening brace"
2012-12-15 00:43:46 +01:00
Bart Visscher
85bd28c508
Fix some of "Closing brace must be on a line by itself"
2012-12-15 00:43:46 +01:00
Bart Visscher
f39454ed12
Fix "Line indented incorrectly"
2012-12-15 00:43:46 +01:00
Bart Visscher
8256650da8
Fix "No space found after comma in function call"
2012-12-15 00:43:46 +01:00
Tom Needham
5fe6129698
Merge master into ocs_api, fix conflicts.
2012-12-14 15:15:05 +00:00
Arthur Schiwon
627da205b3
implement getCurrentUser in Sabre Auth Connector, fixes #508
2012-12-14 01:06:09 +01:00
Arthur Schiwon
4466e06e7d
use username, not passed loginname, might differ
2012-12-14 01:06:00 +01:00
Frank Karlitschek
79b8d67627
remove PgeNavi. It's no longer used
2012-12-13 19:26:05 +01:00
blizzz
680ff3a51b
Merge pull request #584 from wardragon/ldap_access_userExists_fix
...
Really fix OCP\Share::shareItem with LDAP users
2012-12-12 16:59:43 -08:00
Tom Needham
1475ff63dd
API: Add check to see if the user is authorised to run the api method
2012-12-12 21:04:23 +00:00
Tom Needham
228a75ebaa
API: Include totalitems and itemsperpage meta data when needed.
2012-12-12 20:58:40 +00:00
Thomas Mueller
84420035df
throwing InsufficientStorage in case the quota is reached
2012-12-12 20:09:57 +01:00
Tom Needham
3cc3405536
API: Remove old code. Move remaining methods to OC_OCS_Result.
2012-12-12 18:06:07 +00:00
Sam Tuke
063f225a26
Merge branch 'master' into files_encryption
...
Encryption unit tests still failing, needs work
Conflicts:
3rdparty/Archive/Tar.php
3rdparty/MDB2/Driver/Datatype/Common.php
3rdparty/MDB2/Driver/mysql.php
3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
3rdparty/Sabre/CalDAV/Plugin.php
3rdparty/Sabre/CalDAV/Version.php
3rdparty/Sabre/CardDAV/AddressBook.php
3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
3rdparty/Sabre/CardDAV/Plugin.php
3rdparty/Sabre/CardDAV/Version.php
3rdparty/Sabre/DAV/Client.php
3rdparty/Sabre/DAV/Locks/Plugin.php
3rdparty/Sabre/DAV/Server.php
3rdparty/Sabre/DAV/Tree/Filesystem.php
3rdparty/Sabre/DAV/Version.php
3rdparty/Sabre/HTTP/BasicAuth.php
3rdparty/Sabre/HTTP/Version.php
3rdparty/Sabre/VObject/Component/VEvent.php
3rdparty/Sabre/VObject/DateTimeParser.php
3rdparty/Sabre/VObject/RecurrenceIterator.php
3rdparty/Sabre/VObject/Version.php
3rdparty/class.phpmailer.php
3rdparty/class.smtp.php
3rdparty/css/chosen-sprite.png
3rdparty/css/chosen.css
3rdparty/css/chosen/chosen.css
3rdparty/fullcalendar/css/fullcalendar.css
3rdparty/fullcalendar/css/fullcalendar.print.css
3rdparty/fullcalendar/js/fullcalendar.js
3rdparty/fullcalendar/js/fullcalendar.min.js
3rdparty/fullcalendar/js/gcal.js
3rdparty/js/chosen/VERSION
3rdparty/js/chosen/chosen.jquery.js
3rdparty/js/chosen/chosen.jquery.min.js
3rdparty/openid/class.openid.v3.php
3rdparty/openid/phpmyid.php
3rdparty/php-cloudfiles/cloudfiles.php
3rdparty/smb4php/smb.php
3rdparty/timepicker/css/jquery.ui.timepicker.css
3rdparty/timepicker/js/i18n/i18n.html
3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js
3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js
3rdparty/timepicker/js/jquery.ui.timepicker.js
3rdparty/timepicker/releases.txt
README
apps/files/admin.php
apps/files/ajax/autocomplete.php
apps/files/ajax/move.php
apps/files/ajax/newfile.php
apps/files/ajax/scan.php
apps/files/ajax/timezone.php
apps/files/ajax/upload.php
apps/files/appinfo/filesync.php
apps/files/appinfo/update.php
apps/files/css/files.css
apps/files/index.php
apps/files/js/fileactions.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/l10n/ar.php
apps/files/l10n/bg_BG.php
apps/files/l10n/ca.php
apps/files/l10n/cs_CZ.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/el.php
apps/files/l10n/eo.php
apps/files/l10n/es.php
apps/files/l10n/es_AR.php
apps/files/l10n/et_EE.php
apps/files/l10n/eu.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/he.php
apps/files/l10n/hr.php
apps/files/l10n/hu_HU.php
apps/files/l10n/ia.php
apps/files/l10n/id.php
apps/files/l10n/it.php
apps/files/l10n/ja_JP.php
apps/files/l10n/ko.php
apps/files/l10n/lb.php
apps/files/l10n/lt_LT.php
apps/files/l10n/lv.php
apps/files/l10n/mk.php
apps/files/l10n/ms_MY.php
apps/files/l10n/nb_NO.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/oc.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/ru_RU.php
apps/files/l10n/si_LK.php
apps/files/l10n/sk_SK.php
apps/files/l10n/sl.php
apps/files/l10n/sr.php
apps/files/l10n/sr@latin.php
apps/files/l10n/sv.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/l10n/uk.php
apps/files/l10n/vi.php
apps/files/l10n/zh_CN.GB2312.php
apps/files/l10n/zh_CN.php
apps/files/l10n/zh_TW.php
apps/files/templates/admin.php
apps/files/templates/index.php
apps/files/templates/part.breadcrumb.php
apps/files/templates/part.list.php
apps/files_encryption/appinfo/app.php
apps/files_encryption/appinfo/info.xml
apps/files_encryption/js/settings.js
apps/files_encryption/l10n/fa.php
apps/files_encryption/l10n/sl.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/settings.php
apps/files_encryption/templates/settings.php
apps/files_encryption/tests/encryption.php
apps/files_encryption/tests/proxy.php
apps/files_encryption/tests/stream.php
apps/files_external/l10n/cs_CZ.php
apps/files_external/l10n/et_EE.php
apps/files_external/l10n/lt_LT.php
apps/files_external/l10n/nl.php
apps/files_external/l10n/ru.php
apps/files_external/l10n/sk_SK.php
apps/files_external/l10n/sl.php
apps/files_external/l10n/vi.php
apps/files_external/lib/config.php
apps/files_external/lib/ftp.php
apps/files_external/lib/smb.php
apps/files_external/lib/streamwrapper.php
apps/files_external/lib/swift.php
apps/files_external/lib/webdav.php
apps/files_external/tests/ftp.php
apps/files_sharing/appinfo/update.php
apps/files_sharing/css/public.css
apps/files_sharing/js/share.js
apps/files_sharing/l10n/de.php
apps/files_sharing/l10n/et_EE.php
apps/files_sharing/l10n/ja_JP.php
apps/files_sharing/l10n/nb_NO.php
apps/files_sharing/l10n/ru.php
apps/files_sharing/l10n/sl.php
apps/files_sharing/l10n/vi.php
apps/files_sharing/lib/share/file.php
apps/files_sharing/lib/share/folder.php
apps/files_sharing/lib/sharedstorage.php
apps/files_sharing/public.php
apps/files_sharing/templates/public.php
apps/files_versions/l10n/et_EE.php
apps/files_versions/l10n/lt_LT.php
apps/files_versions/l10n/nb_NO.php
apps/files_versions/l10n/nl.php
apps/files_versions/l10n/ru.php
apps/files_versions/l10n/sl.php
apps/files_versions/l10n/vi.php
apps/files_versions/lib/hooks.php
apps/files_versions/lib/versions.php
apps/user_ldap/appinfo/database.xml
apps/user_ldap/appinfo/update.php
apps/user_ldap/group_ldap.php
apps/user_ldap/l10n/da.php
apps/user_ldap/l10n/et_EE.php
apps/user_ldap/l10n/pt_PT.php
apps/user_ldap/l10n/sl.php
apps/user_ldap/l10n/vi.php
apps/user_ldap/l10n/zh_CN.php
apps/user_ldap/lib/access.php
apps/user_ldap/lib/connection.php
apps/user_ldap/settings.php
apps/user_ldap/templates/settings.php
apps/user_ldap/tests/group_ldap.php
apps/user_ldap/user_ldap.php
apps/user_webdavauth/appinfo/app.php
apps/user_webdavauth/appinfo/info.xml
apps/user_webdavauth/settings.php
apps/user_webdavauth/templates/settings.php
apps/user_webdavauth/user_webdavauth.php
autotest.sh
core/ajax/appconfig.php
core/ajax/share.php
core/ajax/translations.php
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
core/ajax/vcategories/edit.php
core/css/share.css
core/js/eventsource.js
core/js/js.js
core/js/oc-vcategories.js
core/js/share.js
core/l10n/ar.php
core/l10n/bg_BG.php
core/l10n/ca.php
core/l10n/cs_CZ.php
core/l10n/da.php
core/l10n/de.php
core/l10n/el.php
core/l10n/eo.php
core/l10n/es.php
core/l10n/es_AR.php
core/l10n/et_EE.php
core/l10n/eu.php
core/l10n/fa.php
core/l10n/fi_FI.php
core/l10n/fr.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/hi.php
core/l10n/hr.php
core/l10n/hu_HU.php
core/l10n/ia.php
core/l10n/id.php
core/l10n/it.php
core/l10n/ja_JP.php
core/l10n/ko.php
core/l10n/ku_IQ.php
core/l10n/lb.php
core/l10n/lt_LT.php
core/l10n/lv.php
core/l10n/mk.php
core/l10n/ms_MY.php
core/l10n/nb_NO.php
core/l10n/nl.php
core/l10n/nn_NO.php
core/l10n/oc.php
core/l10n/pl.php
core/l10n/pt_BR.php
core/l10n/pt_PT.php
core/l10n/ro.php
core/l10n/ru.php
core/l10n/ru_RU.php
core/l10n/si_LK.php
core/l10n/sk_SK.php
core/l10n/sl.php
core/l10n/sr.php
core/l10n/sr@latin.php
core/l10n/sv.php
core/l10n/th_TH.php
core/l10n/tr.php
core/l10n/uk.php
core/l10n/vi.php
core/l10n/zh_CN.GB2312.php
core/l10n/zh_CN.php
core/l10n/zh_TW.php
core/lostpassword/index.php
core/lostpassword/resetpassword.php
core/templates/layout.base.php
core/templates/layout.guest.php
core/templates/layout.user.php
cron.php
db_structure.xml
files/webdav.php
index.php
l10n/.tx/config
l10n/af/calendar.po
l10n/af/contacts.po
l10n/af/core.po
l10n/af/files.po
l10n/ar/calendar.po
l10n/ar/contacts.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/files_encryption.po
l10n/ar/lib.po
l10n/ar/media.po
l10n/ar/settings.po
l10n/ar_SA/core.po
l10n/ar_SA/files.po
l10n/bg_BG/calendar.po
l10n/bg_BG/contacts.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/lib.po
l10n/bg_BG/media.po
l10n/bg_BG/settings.po
l10n/ca/calendar.po
l10n/ca/contacts.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/gallery.po
l10n/ca/lib.po
l10n/ca/settings.po
l10n/cs_CZ/calendar.po
l10n/cs_CZ/contacts.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/files_external.po
l10n/cs_CZ/gallery.po
l10n/cs_CZ/lib.po
l10n/cs_CZ/settings.po
l10n/da/calendar.po
l10n/da/contacts.po
l10n/da/core.po
l10n/da/files.po
l10n/da/lib.po
l10n/da/settings.po
l10n/da/user_ldap.po
l10n/de/calendar.po
l10n/de/contacts.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_sharing.po
l10n/de/gallery.po
l10n/de/lib.po
l10n/de/settings.po
l10n/de_DE/core.po
l10n/de_DE/files.po
l10n/de_DE/settings.po
l10n/el/calendar.po
l10n/el/contacts.po
l10n/el/core.po
l10n/el/files.po
l10n/el/gallery.po
l10n/el/lib.po
l10n/el/settings.po
l10n/eo/calendar.po
l10n/eo/contacts.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/lib.po
l10n/eo/media.po
l10n/eo/settings.po
l10n/es/calendar.po
l10n/es/contacts.po
l10n/es/core.po
l10n/es/files.po
l10n/es/gallery.po
l10n/es/lib.po
l10n/es/settings.po
l10n/es_AR/core.po
l10n/es_AR/files.po
l10n/es_AR/lib.po
l10n/es_AR/settings.po
l10n/et_EE/calendar.po
l10n/et_EE/contacts.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/files_external.po
l10n/et_EE/files_sharing.po
l10n/et_EE/files_versions.po
l10n/et_EE/lib.po
l10n/et_EE/settings.po
l10n/et_EE/user_ldap.po
l10n/eu/calendar.po
l10n/eu/contacts.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/lib.po
l10n/eu/settings.po
l10n/eu_ES/core.po
l10n/eu_ES/files.po
l10n/fa/calendar.po
l10n/fa/contacts.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/files_encryption.po
l10n/fa/lib.po
l10n/fa/settings.po
l10n/fi/core.po
l10n/fi/files.po
l10n/fi_FI/calendar.po
l10n/fi_FI/contacts.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/gallery.po
l10n/fi_FI/lib.po
l10n/fi_FI/settings.po
l10n/fr/calendar.po
l10n/fr/contacts.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/gallery.po
l10n/fr/lib.po
l10n/fr/media.po
l10n/fr/settings.po
l10n/gl/calendar.po
l10n/gl/contacts.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/lib.po
l10n/gl/settings.po
l10n/he/calendar.po
l10n/he/contacts.po
l10n/he/core.po
l10n/he/files.po
l10n/he/lib.po
l10n/he/settings.po
l10n/hi/core.po
l10n/hi/files.po
l10n/hi/lib.po
l10n/hi/settings.po
l10n/hr/calendar.po
l10n/hr/contacts.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/lib.po
l10n/hr/settings.po
l10n/hu_HU/calendar.po
l10n/hu_HU/contacts.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/lib.po
l10n/hu_HU/settings.po
l10n/hy/calendar.po
l10n/hy/contacts.po
l10n/hy/core.po
l10n/hy/files.po
l10n/ia/calendar.po
l10n/ia/contacts.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/lib.po
l10n/ia/settings.po
l10n/id/calendar.po
l10n/id/contacts.po
l10n/id/core.po
l10n/id/files.po
l10n/id/files_encryption.po
l10n/id/files_external.po
l10n/id/files_sharing.po
l10n/id/files_versions.po
l10n/id/lib.po
l10n/id/settings.po
l10n/id/user_ldap.po
l10n/id_ID/core.po
l10n/id_ID/files.po
l10n/it/calendar.po
l10n/it/contacts.po
l10n/it/core.po
l10n/it/files.po
l10n/it/gallery.po
l10n/it/lib.po
l10n/it/settings.po
l10n/ja_JP/calendar.po
l10n/ja_JP/contacts.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/files_sharing.po
l10n/ja_JP/lib.po
l10n/ja_JP/settings.po
l10n/ko/calendar.po
l10n/ko/contacts.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/lib.po
l10n/ko/settings.po
l10n/ku_IQ/core.po
l10n/ku_IQ/files.po
l10n/ku_IQ/lib.po
l10n/ku_IQ/settings.po
l10n/lb/calendar.po
l10n/lb/contacts.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/lib.po
l10n/lb/settings.po
l10n/lt_LT/calendar.po
l10n/lt_LT/contacts.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/files_external.po
l10n/lt_LT/files_versions.po
l10n/lt_LT/lib.po
l10n/lt_LT/settings.po
l10n/lv/core.po
l10n/lv/files.po
l10n/lv/lib.po
l10n/lv/settings.po
l10n/mk/calendar.po
l10n/mk/contacts.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/lib.po
l10n/mk/settings.po
l10n/ms_MY/calendar.po
l10n/ms_MY/contacts.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/lib.po
l10n/ms_MY/settings.po
l10n/nb_NO/calendar.po
l10n/nb_NO/contacts.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/files_sharing.po
l10n/nb_NO/files_versions.po
l10n/nb_NO/gallery.po
l10n/nb_NO/lib.po
l10n/nb_NO/settings.po
l10n/nb_NO/user_ldap.po
l10n/nl/calendar.po
l10n/nl/contacts.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/files_external.po
l10n/nl/files_versions.po
l10n/nl/gallery.po
l10n/nl/lib.po
l10n/nl/settings.po
l10n/nl/user_ldap.po
l10n/nn_NO/calendar.po
l10n/nn_NO/contacts.po
l10n/nn_NO/core.po
l10n/nn_NO/files.po
l10n/nn_NO/lib.po
l10n/nn_NO/settings.po
l10n/oc/core.po
l10n/oc/files.po
l10n/oc/lib.po
l10n/oc/settings.po
l10n/pl/calendar.po
l10n/pl/contacts.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/gallery.po
l10n/pl/lib.po
l10n/pl/settings.po
l10n/pl_PL/core.po
l10n/pl_PL/files.po
l10n/pl_PL/lib.po
l10n/pl_PL/settings.po
l10n/pt_BR/calendar.po
l10n/pt_BR/contacts.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/lib.po
l10n/pt_BR/settings.po
l10n/pt_PT/calendar.po
l10n/pt_PT/contacts.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/gallery.po
l10n/pt_PT/lib.po
l10n/pt_PT/settings.po
l10n/pt_PT/user_ldap.po
l10n/ro/calendar.po
l10n/ro/contacts.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/lib.po
l10n/ro/settings.po
l10n/ru/calendar.po
l10n/ru/contacts.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru/files_sharing.po
l10n/ru/files_versions.po
l10n/ru/gallery.po
l10n/ru/lib.po
l10n/ru/settings.po
l10n/ru_RU/core.po
l10n/ru_RU/files.po
l10n/ru_RU/lib.po
l10n/ru_RU/settings.po
l10n/si_LK/core.po
l10n/si_LK/files.po
l10n/si_LK/files_encryption.po
l10n/si_LK/files_external.po
l10n/si_LK/files_sharing.po
l10n/si_LK/files_versions.po
l10n/si_LK/lib.po
l10n/si_LK/settings.po
l10n/si_LK/user_ldap.po
l10n/sk_SK/calendar.po
l10n/sk_SK/contacts.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/files_external.po
l10n/sk_SK/lib.po
l10n/sk_SK/settings.po
l10n/sk_SK/user_ldap.po
l10n/sl/calendar.po
l10n/sl/contacts.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/files_encryption.po
l10n/sl/files_external.po
l10n/sl/files_sharing.po
l10n/sl/files_versions.po
l10n/sl/gallery.po
l10n/sl/lib.po
l10n/sl/settings.po
l10n/sl/user_ldap.po
l10n/so/core.po
l10n/so/files.po
l10n/sr/calendar.po
l10n/sr/contacts.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/lib.po
l10n/sr/settings.po
l10n/sr@latin/calendar.po
l10n/sr@latin/contacts.po
l10n/sr@latin/core.po
l10n/sr@latin/files.po
l10n/sr@latin/lib.po
l10n/sr@latin/settings.po
l10n/sv/calendar.po
l10n/sv/contacts.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/gallery.po
l10n/sv/lib.po
l10n/sv/media.po
l10n/sv/settings.po
l10n/ta_LK/core.po
l10n/ta_LK/files.po
l10n/ta_LK/lib.po
l10n/ta_LK/settings.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/th_TH/calendar.po
l10n/th_TH/contacts.po
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/gallery.po
l10n/th_TH/lib.po
l10n/th_TH/settings.po
l10n/tr/calendar.po
l10n/tr/contacts.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/gallery.po
l10n/tr/lib.po
l10n/tr/settings.po
l10n/uk/calendar.po
l10n/uk/contacts.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/files_encryption.po
l10n/uk/files_versions.po
l10n/uk/lib.po
l10n/uk/media.po
l10n/uk/settings.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/vi/files_sharing.po
l10n/vi/files_versions.po
l10n/vi/lib.po
l10n/vi/settings.po
l10n/vi/user_ldap.po
l10n/zh_CN.GB2312/core.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN.GB2312/lib.po
l10n/zh_CN.GB2312/settings.po
l10n/zh_CN/calendar.po
l10n/zh_CN/contacts.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/files_external.po
l10n/zh_CN/gallery.po
l10n/zh_CN/lib.po
l10n/zh_CN/settings.po
l10n/zh_CN/user_ldap.po
l10n/zh_TW/calendar.po
l10n/zh_TW/contacts.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/lib.po
l10n/zh_TW/settings.po
lib/MDB2/Driver/sqlite3.php
lib/app.php
lib/appconfig.php
lib/archive.php
lib/archive/tar.php
lib/archive/zip.php
lib/base.php
lib/connector/sabre/auth.php
lib/connector/sabre/directory.php
lib/connector/sabre/file.php
lib/connector/sabre/locks.php
lib/connector/sabre/node.php
lib/db.php
lib/eventsource.php
lib/filecache.php
lib/filecache/cached.php
lib/filecache/update.php
lib/filechunking.php
lib/fileproxy.php
lib/fileproxy/fileoperations.php
lib/fileproxy/quota.php
lib/files.php
lib/filestorage.php
lib/filestorage/common.php
lib/filestorage/commontest.php
lib/filestorage/local.php
lib/filesystem.php
lib/filesystemview.php
lib/group.php
lib/group/dummy.php
lib/group/example.php
lib/helper.php
lib/image.php
lib/installer.php
lib/json.php
lib/l10n.php
lib/l10n/ca.php
lib/l10n/cs_CZ.php
lib/l10n/da.php
lib/l10n/de.php
lib/l10n/el.php
lib/l10n/eo.php
lib/l10n/es.php
lib/l10n/es_AR.php
lib/l10n/et_EE.php
lib/l10n/eu.php
lib/l10n/fa.php
lib/l10n/fi_FI.php
lib/l10n/fr.php
lib/l10n/gl.php
lib/l10n/he.php
lib/l10n/hu_HU.php
lib/l10n/it.php
lib/l10n/ja_JP.php
lib/l10n/lt_LT.php
lib/l10n/nb_NO.php
lib/l10n/nl.php
lib/l10n/oc.php
lib/l10n/pl.php
lib/l10n/pt_BR.php
lib/l10n/pt_PT.php
lib/l10n/ro.php
lib/l10n/ru.php
lib/l10n/ru_RU.php
lib/l10n/sk_SK.php
lib/l10n/sl.php
lib/l10n/sv.php
lib/l10n/th_TH.php
lib/l10n/uk.php
lib/l10n/vi.php
lib/l10n/zh_CN.GB2312.php
lib/l10n/zh_CN.php
lib/l10n/zh_TW.php
lib/log.php
lib/log/owncloud.php
lib/mail.php
lib/migrate.php
lib/migration/content.php
lib/minimizer.php
lib/ocs.php
lib/ocsclient.php
lib/preferences.php
lib/public/backgroundjob.php
lib/public/db.php
lib/public/share.php
lib/public/util.php
lib/request.php
lib/search.php
lib/search/provider/file.php
lib/search/result.php
lib/setup.php
lib/streamwrappers.php
lib/template.php
lib/templatelayout.php
lib/updater.php
lib/user.php
lib/user/database.php
lib/user/http.php
lib/util.php
lib/vcategories.php
lib/vobject.php
public.php
remote.php
search/ajax/search.php
settings/admin.php
settings/ajax/apps/ocs.php
settings/ajax/changepassword.php
settings/ajax/creategroup.php
settings/ajax/createuser.php
settings/ajax/disableapp.php
settings/ajax/enableapp.php
settings/ajax/getlog.php
settings/ajax/lostpassword.php
settings/ajax/openid.php
settings/ajax/removegroup.php
settings/ajax/removeuser.php
settings/ajax/setlanguage.php
settings/ajax/setloglevel.php
settings/ajax/setquota.php
settings/ajax/togglegroups.php
settings/ajax/togglesubadmins.php
settings/ajax/userlist.php
settings/apps.php
settings/css/settings.css
settings/help.php
settings/js/apps.js
settings/js/users.js
settings/l10n/ar.php
settings/l10n/bg_BG.php
settings/l10n/ca.php
settings/l10n/cs_CZ.php
settings/l10n/da.php
settings/l10n/de.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es.php
settings/l10n/es_AR.php
settings/l10n/et_EE.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/fi_FI.php
settings/l10n/fr.php
settings/l10n/gl.php
settings/l10n/hr.php
settings/l10n/hu_HU.php
settings/l10n/id.php
settings/l10n/it.php
settings/l10n/ja_JP.php
settings/l10n/ko.php
settings/l10n/lb.php
settings/l10n/lt_LT.php
settings/l10n/lv.php
settings/l10n/ms_MY.php
settings/l10n/nb_NO.php
settings/l10n/nl.php
settings/l10n/nn_NO.php
settings/l10n/oc.php
settings/l10n/pl.php
settings/l10n/pt_BR.php
settings/l10n/pt_PT.php
settings/l10n/ro.php
settings/l10n/ru.php
settings/l10n/ru_RU.php
settings/l10n/si_LK.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sr.php
settings/l10n/sr@latin.php
settings/l10n/sv.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/uk.php
settings/l10n/vi.php
settings/l10n/zh_CN.GB2312.php
settings/l10n/zh_CN.php
settings/l10n/zh_TW.php
settings/personal.php
settings/settings.php
settings/templates/admin.php
settings/templates/apps.php
settings/templates/help.php
settings/templates/personal.php
settings/templates/users.php
settings/trans.png
settings/users.php
tests/bootstrap.php
tests/data/db_structure.xml
tests/lib/archive.php
tests/lib/cache.php
tests/lib/cache/apc.php
tests/lib/cache/xcache.php
tests/lib/db.php
tests/lib/filesystem.php
tests/lib/geo.php
tests/lib/share/share.php
tests/lib/streamwrappers.php
tests/lib/util.php
tests/phpunit.xml
2012-12-12 17:39:43 +00:00
Tom Needham
2a4b554ca6
API: OCS methods now use OC_OCS_Result to return data
2012-12-12 17:35:58 +00:00
Tom Needham
140141edf2
API: Further tidying, implement OC_OCS_Result object for api results.
2012-12-12 16:50:25 +00:00
Frank Karlitschek
4265419bbd
Try to fix #836
...
https://github.com/owncloud/core/issues/836
2012-12-12 16:27:37 +01:00
Thomas Mueller
b8b64d6ffc
set the session name to the instance id - which is unique
...
Conflicts:
lib/base.php
2012-12-12 16:07:51 +01:00
Thomas Müller
72fe339c10
Merge pull request #766 from btactic/language_autodetect
...
Improve autodetection of language.
2012-12-12 03:43:17 -08:00
Robin Appelman
7969d6e646
Merge branch 'master' into filesystem
2012-12-11 23:57:59 +01:00
Tom Needham
115dbc721d
API: Specify the response format using a GET parameter
2012-12-11 22:36:46 +00:00
Bart Visscher
ddba90679d
Merge pull request #829 from owncloud/contacts_api_namespace_fix
...
[contacts_api] IAddressBook moved to OCP as it's used by apps to provide...
2012-12-11 13:38:57 -08:00
Thomas Müller
2361639a0d
Merge pull request #825 from owncloud/oc_namespace
...
Autoload classes with 'OC' namespace prefix.
2012-12-11 10:31:42 -08:00
Thomas Mueller
8ed0ce7801
[contacts_api] IAddressBook moved to OCP as it's used by apps to provide access to their contact data
2012-12-11 17:42:09 +01:00
Sam Tuke
31cbb5a09f
Reverted temporary changes to core lib files
2012-12-11 15:21:37 +00:00
Thomas Tanghus
af12b0f5da
Autoload classes with 'OC' namespace prefix.
2012-12-11 16:00:48 +01:00
Frank Karlitschek
728ea711b2
Merge pull request #824 from owncloud/add_user_backend_registration_debug_log
...
add debug logging for user backend registration
2012-12-11 06:34:20 -08:00
Jörn Friedrich Dreyer
8126b09bfe
add debug logging for user backend registration
2012-12-11 14:56:04 +01:00
Sam Tuke
aabef796a0
Added library phpseclib
...
First implementation of passphrase changing on user pwd change
2012-12-11 13:22:46 +00:00
Thomas Müller
eb7dbf3701
Merge pull request #697 from eMerzh/revoke_on_create
...
Revoke DB rights on install only if the db is newly created
2012-12-11 05:20:41 -08:00
Thomas Müller
b11912f9bc
Merge pull request #623 from owncloud/contacts_api_2
...
Contacts API has been implemented and unit tests are provided
2012-12-11 05:10:54 -08:00
Robin Appelman
438d3c21f6
actually connect the filesystem hooks to the cache updater
2012-12-11 01:24:53 +01:00
Robin Appelman
8635699db9
fix cache behaviour for non existing files
2012-12-11 01:06:21 +01:00
Jenkins for ownCloud
f7f462f273
[tx-robot] updated from transifex
2012-12-11 00:04:40 +01:00
Jenkins for ownCloud
a444999a8c
[tx-robot] updated from transifex
2012-12-10 00:12:32 +01:00
Sergi Almacellas Abellana
7b0e2b348b
Fix the loop to search al the available languages, not only the las element.
2012-12-09 20:21:04 +01:00
Thomas Mueller
4cc895aa0a
[contacts_api] move addressbook to it's own file
2012-12-08 16:42:54 +01:00
Thomas Müller
a84ae04c17
Merge pull request #762 from owncloud/database_exception
...
dont handle database exception in OC_DB
2012-12-08 03:42:01 -08:00
Jenkins for ownCloud
2ca72d0da7
[tx-robot] updated from transifex
2012-12-08 00:10:53 +01:00
Sergi Almacellas Abellana
b810e42cc7
Improve autodetection of language.
...
Fixes #730 .
2012-12-07 20:34:17 +01:00
Lorenzo M. Catucci
15afbfd198
Add an $excludingBackend optional parameter
...
to the userExists method both in OCP\User and in OC_User.
2012-12-07 17:19:26 +01:00
Robin Appelman
65e4dc183c
dont handle database exception in OC_DB
...
give the caller the option to handle the exception
2012-12-07 16:09:29 +01:00
Bart Visscher
dc8b22485e
Change to use 3rdparty version
2012-12-07 13:50:59 +01:00
Bart Visscher
1e062ea895
Merge pull request #182 from owncloud/fix-redirect
...
Make the redirect_url working again
2012-12-07 03:09:19 -08:00
Bart Visscher
271b8384e7
Fix warning about redirect_url not set
2012-12-07 12:07:56 +01:00
Bart Visscher
89cd8a3fc7
Merge branch 'master' into doctrine
...
Conflicts:
lib/base.php
lib/db.php
2012-12-07 11:35:57 +01:00
Thomas Mueller
889e55fdac
[contacts_api] update documentation
2012-12-06 23:51:35 +01:00
Robin Appelman
317cd4c70a
catch error if old filecache table is not present during upgrade
2012-12-06 17:49:35 +01:00
Robin Appelman
98f42d314c
merge master into filesystem
2012-12-06 17:47:28 +01:00
Bart Visscher
8bb62e74bd
Remove other database implementations from OC_DB
2012-12-06 17:26:01 +01:00
Björn Schießle
5b04db9b22
one more undefined index error
2012-12-06 15:58:12 +01:00
Björn Schießle
e3ae0b7ba6
fix more undefined indexes
2012-12-06 15:58:05 +01:00
Thomas Müller
76625e9ba5
Merge pull request #647 from owncloud/fix_app_settings_navigation
...
Move loading of all the apps to setting the active navigation entry.
2012-12-05 01:48:20 -08:00
Thomas Müller
521b6c7b04
Merge pull request #700 from eMerzh/fix_error_display
...
Quick Fix a dirty function preventing showing errors
2012-12-05 01:37:27 -08:00
Thomas Mueller
e65abb8054
minified version no longer available
2012-12-04 14:49:19 +01:00
Brice Maron
a310dcb0ff
Fix a dirty function preventing showing errors
2012-12-03 22:53:06 +00:00
Brice Maron
4327ed8382
Revoke DB rights on install only if the db is newly created
2012-12-03 20:20:17 +00:00
Robin Appelman
be30b1a8de
merge master into filesystem
2012-12-03 18:02:22 +01:00
Thomas Müller
cee92bde20
Merge pull request #682 from VicDeo/master
...
Minor cleanup in OC_OCSClient::getKnownledgebaseEntries. Fix for #487
2012-12-03 02:18:04 -08:00
Jenkins for ownCloud
f4d7955fe6
[tx-robot] updated from transifex
2012-12-03 00:05:40 +01:00
Victor Dubiniuk
3d5ffebb52
Clean KB entries processing code
2012-12-02 23:54:53 +03:00
Thomas Mueller
35e55214e2
[Contacts API] example for searching added
2012-12-02 11:54:30 +01:00
Robin Appelman
01eb5d2790
fix some edge cases while scanning the root of a storage
2012-12-02 03:43:51 +01:00
Isaac Rosenberg
d3ea7feb6b
Update lib/image.php
...
Corrected simple typo
2012-12-01 21:13:08 -05:00
Robin Appelman
72b6faa69d
merge master into filesystem
2012-12-02 03:03:48 +01:00
Jenkins for ownCloud
401c56ce7b
[tx-robot] updated from transifex
2012-12-02 00:03:12 +01:00
Robin Appelman
702444b242
fail gracefully when no old filecache is present during upgrade
2012-12-01 00:59:49 +01:00
Bart Visscher
8ce3aca331
Move loading of all the apps to setting the active navigation entry.
...
We can't do the loading before matching the route, because some routes
need to do the loading after matching of the route. For example the
navigation detection of the app settings page.
2012-11-30 12:47:44 +01:00
Bart Visscher
4db53f9d8e
Merge pull request #619 from samtuke/versions_cache
...
OC_FSV->copy now only caches files which are copied from data/user/files
2012-11-30 03:25:06 -08:00
Robin Appelman
dbbb357f62
add upgrade path from old cache to preserve file id's
2012-11-30 01:41:30 +01:00
Robin Appelman
d33f697a5f
merge master into filesystem
2012-11-30 00:18:42 +01:00
Robin Appelman
bcb27c81d4
use new obEnd function instead of ob_end_clean
2012-11-29 18:01:21 +01:00
Robin Appelman
59d5aa2cb7
add function to safely end output buffering
2012-11-29 17:58:24 +01:00
Thomas Mueller
f99497a05a
test for search and unregister added
2012-11-28 23:10:30 +01:00
Thomas Mueller
2d597c2238
first unit tests implemented
2012-11-28 23:10:00 +01:00
Thomas Mueller
5b1dea56e5
change name to IAddressBook
2012-11-28 23:08:15 +01:00
Thomas Mueller
fba8c776e1
plugin mechanism implemented
2012-11-28 23:07:09 +01:00
Sam Tuke
6975c5537b
OC_FSV->copy now only caches files which are copied from data/user/files
...
Added contextual comments
2012-11-28 16:57:44 +00:00
Sam Tuke
60f4ea8ddc
Cleaned up docblock comments
2012-11-28 15:10:58 +00:00
Jörn Friedrich Dreyer
eaa625c9bc
Merge pull request #401 from owncloud/share_hooks
...
Create functions to install standard hooks
2012-11-28 04:35:52 -08:00
Jenkins for ownCloud
1d4d4fd678
[tx-robot] updated from transifex
2012-11-28 00:11:21 +01:00
Jenkins for ownCloud
d251f04b98
[tx-robot] updated from transifex
2012-11-27 00:10:47 +01:00
Jörn Friedrich Dreyer
71e8755d31
Merge pull request #380 from butonic/feature_share_link_with_token
...
Feature share link with token
2012-11-26 07:42:53 -08:00
Jenkins for ownCloud
7892204077
[tx-robot] updated from transifex
2012-11-26 00:02:04 +01:00
Robin Appelman
a609992a75
better check if we are passing a fileid to Cache::get
2012-11-25 16:30:57 +01:00
Robin Appelman
0cfef83ed9
sort output of getFolderContent by name
2012-11-25 16:08:35 +01:00
Robin Appelman
03fd43a239
Merge branch 'master' into filesystem
2012-11-25 15:38:17 +01:00
Thomas Müller
f81321af3d
Merge pull request #556 from owncloud/postgres_insert_id
...
use lastval() to get the insert id in postgesql
2012-11-24 22:55:33 -08:00
Michael Gapczynski
cc5d8e5609
Check if data variable in scanner isn't null before using it
2012-11-24 20:29:57 -05:00
Robin Appelman
709aacfa0f
change behaviour of Filesystem::getMountPoint when a mountpoint is passed as path without trailing slash
2012-11-24 23:41:39 +01:00
Robin Appelman
d3e37fa157
remove fileatime from common storage backend
2012-11-24 22:55:26 +01:00
Michael Gapczynski
c47bf9bbce
Add checks for storage object
2012-11-24 16:42:54 -05:00
Frank Karlitschek
e450933650
remove left over tag
2012-11-24 18:25:05 +01:00
Frank Karlitschek
0f61816278
A new function to create nice error page. And use it for fatal db errors
2012-11-24 18:07:26 +01:00
Frank Karlitschek
fb5d0db037
prettier error output. Let´s see how many more low hanging fruits I find on my way to the real bug that I want to fix ;-)
2012-11-23 16:40:28 +01:00
Jörn Friedrich Dreyer
995b5c0739
readd fallback code for pre token links
2012-11-23 15:51:57 +01:00
Robin Appelman
95057e727d
merge master into filesystem
2012-11-23 00:40:58 +01:00
Robin Appelman
95340a9e67
use lastval() to get the insert id in postgesql
2012-11-23 00:23:27 +01:00
Robin Appelman
ad706229f5
explicitly sort files when using getFolderContents
2012-11-23 00:17:18 +01:00
Jenkins for ownCloud
3688376a6f
[tx-robot] updated from transifex
2012-11-23 00:03:17 +01:00
Frank Karlitschek
6cb3774706
make it possible to manually override the hostname and protocol if the automatic detection from ownCloud fails. This can happen in reverse proxy situations or with loadbalancers setups.
2012-11-22 19:22:00 +01:00
Robin Appelman
810563ae8a
don't redefine inherited functions as abstract
2012-11-22 12:45:29 +01:00
Robin Appelman
8687e0d346
add Scanner->backgroundScan
2012-11-22 12:45:29 +01:00
Robin Appelman
186c9e77e8
add Cache->getIncomplete for use in background scanning
2012-11-22 12:45:29 +01:00
Robin Appelman
e6cf082fe0
emit a hooks during the filesystem scan
2012-11-22 12:45:29 +01:00
Thomas Müller
54356636e4
Merge pull request #483 from owncloud/archive_sizes
...
stop increasing folder sizes once we hit a non folder
2012-11-22 01:56:08 -08:00
Thomas Mueller
208c6fd966
fixing namespace
2012-11-22 10:21:48 +01:00
Michael Gapczynski
b76d1afe19
Create public function initMountPoints() for initializing a specified user's mount points
2012-11-22 00:44:48 -05:00
Michael Gapczynski
77fdb16b7c
Remove incorrect extra parameter for init() call
2012-11-22 00:23:11 -05:00
Jenkins for ownCloud
3a5f5e127c
[tx-robot] updated from transifex
2012-11-22 00:02:16 +01:00
Robin Appelman
97380f3485
merge master into filesystem
2012-11-21 22:37:14 +01:00
Thomas Müller
a85d891938
Merge pull request #538 from Deltachaos/fix_537
...
Fixes update of shared files with mirall because it dose not update all ...
2012-11-20 22:55:08 -08:00
Jenkins for ownCloud
9204be827b
[tx-robot] updated from transifex
2012-11-21 00:02:33 +01:00
Maximilian Ruta
ac4cafcfc7
Fixes update of shared files with mirall because it dose not update all methadata for a file
2012-11-20 23:34:25 +01:00
Jörn Friedrich Dreyer
d8a171df26
implement share via link token
2012-11-20 15:03:12 +01:00
Jenkins for ownCloud
568def2b61
[tx-robot] updated from transifex
2012-11-20 00:02:08 +01:00
Brice Maron
8fa7d6a48a
Fix typo in getUrlContent fix #514
2012-11-19 17:13:07 +00:00
Thomas Müller
d91c841f73
Merge pull request #383 from owncloud/contacts_api
...
Proposal for a public contacts api
2012-11-19 05:42:01 -08:00
Frank Karlitschek
5b2aeebaf0
Merge pull request #280 from butonic/feature_bmp_support
...
add bmp support
2012-11-19 00:53:46 -08:00
Jenkins for ownCloud
c5e891008b
[tx-robot] updated from transifex
2012-11-19 00:01:48 +01:00
Robin Appelman
40fae0acbf
fix outdated permissions cache use in scanner
2012-11-18 14:10:28 +01:00
Robin Appelman
a922eb756e
merge master into filesystem
2012-11-18 14:07:52 +01:00
Thomas Müller
ea80a8b9e3
Merge pull request #114 from riso/xsendfile
...
Implement X-Sendfile support
2012-11-18 04:35:46 -08:00
Jenkins for ownCloud
e28d71bf55
[tx-robot] updated from transifex
2012-11-18 00:02:00 +01:00
Brice Maron
4337e0fb99
Little case fix
2012-11-17 22:12:24 +00:00
Brice Maron
71adad8817
Add User agent when OC does a request
2012-11-17 21:08:58 +00:00
Thomas Müller
ac3e962732
Merge pull request #375 from tdevos/master
...
Use curl to get remote file content
2012-11-17 12:31:25 -08:00
Jenkins for ownCloud
61670184c4
[tx-robot] updated from transifex
2012-11-17 00:02:24 +01:00
Robin Appelman
1007013833
stop increasing folder sizes once we hit a non folder
...
fixes #234
2012-11-16 17:54:58 +01:00
Robin Appelman
8fe69dfac6
also return fileid in OC_Filecache::get
2012-11-16 17:52:52 +01:00
Robin Appelman
74611801dd
typo
2012-11-16 17:41:38 +01:00
Robin Appelman
f4f00b4edb
Merge branch 'master' into filesystem
2012-11-16 12:13:03 +01:00
Thomas Müller
d1c0f2a739
Merge pull request #454 from Raydiation/master
...
Routing fixes
2012-11-15 15:15:07 -08:00
Jenkins for ownCloud
d86a368e54
[tx-robot] updated from transifex
2012-11-16 00:03:47 +01:00
Thomas Müller
36bf4e24f0
Merge pull request #433 from owncloud/user_setting_fixes
...
User setting fixes
2012-11-15 14:01:16 -08:00
Robin Appelman
288ecf318c
add getFileInfo and getDirectoryContent to OC_Files for compatibility
2012-11-15 22:08:08 +01:00
Robin Appelman
5569f07e8d
add OC_FilesystemView alias for compatibility
2012-11-15 22:04:48 +01:00
Robin Appelman
f94d62380f
Merge branch 'master' into filesystem
2012-11-15 21:27:24 +01:00
thomas
d2047a00cf
Remove parentheses in return, modify description, and fix a mistake
2012-11-15 20:46:17 +01:00
Bart Visscher
8bed38c78d
Rename install hook functions to register hook
2012-11-15 18:13:54 +01:00
Bart Visscher
9419913c06
Better place to check for user removal
2012-11-15 18:10:40 +01:00
Bernhard Posselt
e642d18e26
When using routing in apps, no apps are loaded in the left navigation tree. To fix this: load apps for matching a request
2012-11-15 14:48:18 +01:00
Arthur Schiwon
fd060d4849
really check if mod_deflate is loaded
2012-11-15 10:35:53 +01:00
Arthur Schiwon
64a8a0c872
coding style
2012-11-15 10:35:44 +01:00
Arthur Schiwon
4a75c539ed
Fix remote.php CSS+JS garbish on some systems
2012-11-15 10:35:34 +01:00
Robin Appelman
cbcd9ba84a
allow storage backends to implement custom permission management
2012-11-15 00:57:30 +01:00
Robin Appelman
bf2ac9f113
merge master into filesystem
2012-11-15 00:37:54 +01:00
Jenkins for ownCloud
a418a3ba65
[tx-robot] updated from transifex
2012-11-15 00:03:50 +01:00
thomas
40dd5ae61c
change and transfert getUrlContent
2012-11-14 23:14:04 +01:00
Bart Visscher
343e9d8621
Better check and handing of user deletion
2012-11-14 21:52:28 +01:00
Bart Visscher
59627367ae
Better check and handling of user creation
2012-11-14 21:52:28 +01:00
Valerio Ponte
de7e419610
Fixed style according to owncloud styleguide
2012-11-14 20:10:20 +01:00
Valerio Ponte
8e190a5a97
Moved X-Sendfile headers into OC_Files::get
...
now should work with temp files too
2012-11-14 20:10:20 +01:00
Valerio Ponte
8420b9bf67
Implemented X-Sendfile support
2012-11-14 20:10:20 +01:00
Lukas Reschke
8b03b683df
Merge pull request #271 from owncloud/239_webdav_999_files
...
fixes #239 - query the database in chunks of 200
2012-11-14 10:53:00 -08:00
Alessandro Cosentino
7d01342bab
fix translation issues with previous commit
2012-11-13 19:32:26 -05:00
Alessandro Cosentino
aa917cfb18
uncomment hours entries in relative date functions
2012-11-13 19:18:26 -05:00
Bart Visscher
530f3f8be9
Create functions to install standard hooks
...
Also use these in tests that needs them
Fix #151
2012-11-13 23:45:17 +01:00
Thomas Mueller
33a4dfa087
function isEnabled() added
2012-11-13 20:59:47 +01:00
Thomas Tanghus
bfb6faa850
Bump version to trigger update.
2012-11-13 12:11:18 +01:00
Thomas Tanghus
268a48479d
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-12 23:36:59 +01:00
Thomas Tanghus
d809efc1e5
Change insertIfNotExist() for sqlite. Not fast, but more reliable than previous attempt.
2012-11-12 23:34:02 +01:00
Thomas Mueller
c3825112a0
public contacts api as discussed here https://github.com/owncloud/apps/issues/113
2012-11-12 23:25:32 +01:00
Bart Visscher
7b53c9d3f0
Merge pull request #157 from owncloud/setup
...
Make lib/setup.php usable outside of install setup
2012-11-12 13:23:31 -08:00
Thomas Tanghus
42b871dcf1
Correct SQL syntax.
2012-11-12 18:45:56 +01:00
thomas
847467ab00
Add connection time out option
2012-11-12 16:29:22 +01:00
thomas
4564898c28
Use curl to get remote file content
2012-11-12 15:37:44 +01:00
Jörn Friedrich Dreyer
0ce5e9257e
add php-doc for ellipsis
2012-11-12 14:04:23 +01:00
Jörn Friedrich Dreyer
28671d92c0
move code to better places
2012-11-12 13:56:29 +01:00
Jörn Friedrich Dreyer
bb56581192
add php-doc
2012-11-12 13:04:00 +01:00
Jörn Friedrich Dreyer
43bfabf68f
add bmp support
2012-11-12 13:04:00 +01:00
blizzz
e0fdb8272b
Merge pull request #371 from butonic/sql_and_error_log_fixes
...
add missing sql backticks, check sharing for error and add log
2012-11-12 03:37:43 -08:00
Jörn Friedrich Dreyer
ba91f9a237
add missing sql backticks, check sharing for error and add log
2012-11-12 12:04:46 +01:00
Thomas Tanghus
82e010c51c
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-12 00:37:40 +01:00
Thomas Tanghus
56239df2e7
Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*
2012-11-11 23:10:23 +01:00
Thomas Tanghus
7f0c69eb0e
Added CRUDS permissions to the OCP namespace. Implements issue #345
2012-11-11 23:09:54 +01:00
Thomas Tanghus
fd709fc021
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-11 20:20:09 +01:00
Diederik de Haas
f6daddadf5
Fixed new checkstyle issues in util.php from build #1341 .
2012-11-10 00:58:03 +01:00
Diederik de Haas
20541c610e
Fixed new checkstyle issues in migrate.php from build #1341 .
2012-11-10 00:53:28 +01:00
Jenkins for ownCloud
7ec0efe5c2
[tx-robot] updated from transifex
2012-11-10 00:02:29 +01:00
Thomas Müller
6dbdc16287
Merge pull request #340 from butonic/fix_quota_zero_cornercase
...
fix quota off by one error
2012-11-09 05:54:50 -08:00
Jörn Friedrich Dreyer
c5ba4f476a
fix quota off by one error
2012-11-09 14:34:15 +01:00
Stefan Seidel
8f669880bc
Fix WebDAV (and Android Client) not being able to authorize on Debian Squeeze + mod_fcgid installs.
2012-11-09 13:30:07 +01:00
Thomas Müller
c053863644
Merge pull request #330 from owncloud/check_connection
...
add a check and a warning if the ownCloud server is not able to establis...
2012-11-09 02:11:24 -08:00
Jenkins for ownCloud
cb57a20ec2
[tx-robot] updated from transifex
2012-11-09 00:03:49 +01:00
Robin Appelman
46071fed80
fix quota proxy
2012-11-08 21:35:40 +01:00
Robin Appelman
fedff3eafe
add cache updater
2012-11-08 21:12:40 +01:00
Robin Appelman
5a173b901f
fix Scanner->scan setting the filesize to 0 for files
2012-11-08 20:47:40 +01:00
Robin Appelman
15b8a3f987
move correctFolderSize from Scanner to Cache
2012-11-08 18:10:54 +01:00
Frank Karlitschek
55f75c6d8e
add a check and a warning if the ownClodu server is not able to establish http connections to the internet. The reason is that users complained that external filesystem support, the update checker, downloading of new apps or the nowledgebase don´t work and don´t know why.
2012-11-08 18:08:44 +01:00
Robin Appelman
3f644fe70c
fix calculateFolderSize for non existing files
2012-11-08 18:07:30 +01:00
Robin Appelman
e7bed5ddab
allow creating Cache objects with only the storage id instead of the whole storage object
2012-11-08 17:59:08 +01:00
Robin Appelman
706bb3ccd6
move ETag generation to storage backends
2012-11-08 17:48:26 +01:00
Robin Appelman
72c3868644
add resolvePath to filesystem view api
2012-11-08 17:42:26 +01:00
Robin Appelman
091ff02362
merge master into filesystem
2012-11-08 17:32:00 +01:00
Tom Needham
8396c0478e
Migration: Allow for no app data cases; handle file copying better
2012-11-08 11:37:27 +00:00
Tom Needham
0833be9d4e
Migration: On import of user accounts only import folders in home dir, use OC_Helper::copyr
...
Check files when copying recursivley
Remove obsolete method
Dont count '.' and '..' as directories when importing.
2012-11-08 11:37:27 +00:00
Robin Appelman
ae74c54d65
normalize filepaths in OC_Files::getFileInfo
2012-11-07 22:54:10 +01:00
Björn Schießle
250f40fe40
check if $path is a empty string
2012-11-07 17:35:07 +01:00
Robin Appelman
961ff01a93
merge master into filesystem
2012-11-07 17:18:56 +01:00
icewind1991
5cad2d7ccc
Merge pull request #307 from owncloud/etag-function-overwrite
...
Allow apps to change the way etags are generated
2012-11-07 08:02:59 -08:00
Björn Schießle
311b04f609
backport from approved patch in stable45:
...
make root the default parameter for getAbsolutePath()
2012-11-07 16:54:42 +01:00
Thomas Tanghus
972ba89bc2
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-07 15:33:21 +01:00
Brice Maron
ba62d8dea7
Fix quoting problem in fs mount. give Big DB error at least in PG
2012-11-07 15:27:34 +01:00
Robin Appelman
99aa972a40
Allow changing the way etags are generated
2012-11-07 14:21:34 +01:00
Robin Appelman
012a907a8a
fix user specific mount configuration
2012-11-07 14:05:45 +01:00
Thomas Mueller
07ffa0de39
adding comments to explain what's going on here
2012-11-06 13:55:30 +01:00
Michael Gapczynski
3d13c9db70
Return empty array if file does not exist inside Shared folder, fixes issue #91
2012-11-05 17:54:23 -05:00
Thomas Mueller
415ec58422
fixes #329 : query the database in chunks of 200
2012-11-05 22:42:03 +01:00
Thomas Tanghus
a50f98606d
Check DB result.
2012-11-05 16:24:16 +01:00
Thomas Tanghus
1147dc9774
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-05 12:06:59 +01:00
Felix Moeller
a4b2ea586d
Style: Remove all the dangling white spaces
2012-11-04 22:16:04 +01:00
Robin Appelman
4b940955dd
merge master into filesystem
2012-11-04 21:12:18 +01:00
Felix Moeller
1e33ad9cbc
Style: Different line endings in one file are bad for sure
...
I think Checkstyle did not find this occurence, however consistant line endings are preferred.
@DeepDiver can Checkstyle find this?
2012-11-04 19:11:53 +01:00
Felix Moeller
27ab0357ae
Checkstyle: Fix last six NewlineBeforeOpenBrace
2012-11-04 18:36:16 +01:00
Felix Moeller
bc4382c5c5
Checkstyle: fix the last NoSpaceAfterEquals
2012-11-04 18:31:44 +01:00
Felix Moeller
0e70ea9d8b
Checkstyle: Fix the last 25 NoSpaceAfterComma
2012-11-04 18:28:29 +01:00
Felix Moeller
1205749f8c
Checkstyle: Fix the last two SpaceBeforeOpenBrace
2012-11-04 18:18:03 +01:00
Thomas Müller
8ac3849a95
Merge pull request #238 from fmms/checkstyle04
...
Checkstyle fixes
2012-11-04 08:59:45 -08:00
Lukas Reschke
8c4c74b23f
Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession
...
Just one CSRF token per session
2012-11-04 05:54:02 -08:00
Thomas Tanghus
e6a7bba095
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-04 12:31:06 +01:00
Thomas Tanghus
8e5b6bf21d
VCategories: Make $categories non-static again.
2012-11-04 12:24:49 +01:00
Felix Moeller
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
Felix Moeller
f8d1d7787e
Checkstyle fixes for SpaceBeforeOpenBrace
2012-11-04 10:46:32 +01:00
Jenkins for ownCloud
17d466b03b
[tx-robot] updated from transifex
2012-11-04 00:01:42 +01:00
Robin Appelman
4c0c78d15d
check for filename blacklist in OC_Filesystem::isValidPath
2012-11-03 00:26:36 +01:00
Lukas Reschke
fd584f446d
Merge pull request #220 from fmms/checkstyle02
...
Checkstyle: many fixes
2012-11-02 14:59:36 -07:00
Robin Appelman
8a6bb7965d
add Cache::move
2012-11-02 22:25:33 +01:00
Robin Appelman
4a5a36577e
merge master into filesystem
2012-11-02 21:42:29 +01:00
Robin Appelman
a1c37d4be5
fix OC_Filesystem::isValidPath when using \ instead of / in paths
2012-11-02 19:56:34 +01:00
Felix Moeller
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
Lukas Reschke
d2e842fcc9
Remove uneeded new line
2012-11-01 22:38:21 +01:00
Lukas Reschke
822e4d5f6c
Check for redirect_url for logged in users
...
This checks if there is a redirect_url for logged in users
2012-11-01 22:37:37 +01:00
Robin Appelman
51ba12890d
Merge branch 'master' into filesystem
2012-11-01 16:16:02 +01:00
Robin Appelman
553b1072b6
fix archive tar include path
2012-11-01 16:15:25 +01:00
Lukas Reschke
81f019b6c5
Make the redirect_url working again
...
Fixes #160
2012-10-31 22:03:55 +01:00
Thomas Tanghus
8cffbb5f7d
Added some more error checking on db queries.
2012-10-31 20:47:04 +01:00
Thomas Tanghus
5a738380f6
Cast object ids to integers.
2012-10-31 20:06:39 +01:00
Lukas Reschke
7a7f12a0c1
Create only one CSRF token per session
...
Before, the CSRF token expired every hour. We had a script in place
which should refresh the token but this don't worked in every case.
(Laptop sleeping etc.)
With this commit, the token will only get once created for every
session so that the "Token expired" warning shouldn't appear.
2012-10-31 18:37:59 +01:00
Thomas Tanghus
5fc0c89a73
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-31 16:09:11 +01:00
Thomas Müller
f851738169
Merge pull request #152 from scambra/webdav-quota
...
checking quota in webdav
2012-10-31 03:03:46 -07:00
Jenkins for ownCloud
aca6d3252f
[tx-robot] updated from transifex
2012-10-31 00:02:32 +01:00
Robin Appelman
6e9e263497
merge master into filesystem
2012-10-30 22:59:55 +01:00
Bart Visscher
6d09752940
DRY for creating htaccess to protect data-directory
2012-10-30 20:57:19 +01:00
Bart Visscher
246d7ea2ea
Separate control code from class definition
2012-10-30 20:56:31 +01:00
scambra
5af8adc169
code style changes
2012-10-30 12:17:15 +01:00
Jörn Friedrich Dreyer
b032819ab9
check for database error in userExists
2012-10-30 11:08:32 +01:00
scambra
d9c14292a4
fix checking quota in webdav, adding a sabredav plugin
2012-10-30 10:32:30 +01:00
Thomas Tanghus
5550cde03b
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Fix conflicts:
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
2012-10-30 06:53:49 +01:00
Sam Tuke
3fdf239b47
Merge pull request #147 from owncloud/htaccess-upgrade-check
...
Generate .htaccess when upgrading from old versions
2012-10-29 16:28:46 -07:00
Jenkins for ownCloud
56cf7660bd
[tx-robot] updated from transifex
2012-10-30 00:01:50 +01:00
Lukas Reschke
f6b6780072
Don't use OC_Setup as it will show up the installer
2012-10-29 22:44:49 +01:00
Lukas Reschke
6903475841
Generate .htaccess when upgrading from old versions
...
When upgrading from old ownCloud versions like 2.x the .htaccess is not
generated - which exposes the data to the internet. This fix will
generate a .htaccess when upgrading. (And no one exists)
Fixes #127
2012-10-29 22:03:18 +01:00
Lukas Reschke
2e1199acb8
Merge pull request #133 from fmms/checkstyle02
...
NoSpaceAfterComma -- checkstyle cleanup
2012-10-29 12:35:12 -07:00
Lukas Reschke
ac784baef6
Generate only one CSRF token
2012-10-29 16:35:29 +01:00
Lukas Reschke
4d61eb3e4c
Fix a typo
2012-10-29 16:33:39 +01:00
Bart Visscher
a9ff5635d8
Move loading setting routing to OC_Router
2012-10-29 15:04:56 +01:00
Bart Visscher
40fe6c6346
Remove subnavigation key, not used
2012-10-29 15:04:55 +01:00
Bart Visscher
4d03b3dbaf
Add ETag caching for Javascript routes
2012-10-29 15:04:55 +01:00
Bart Visscher
a7806076b1
Move generating cache key from files from OC_Minimizer to OC_Cache
2012-10-29 15:04:55 +01:00
Michael Gapczynski
5aec26a37c
Fix MySQL install, bug fix for issue 132
2012-10-28 19:50:26 -04:00
Michael Gapczynski
a6e18e0b6d
Check if error_report() is equal to 0, so suppressed errors aren't logged e.g. the htaccesstext.txt fopen failing
2012-10-28 19:38:57 -04:00
Jenkins for ownCloud
dbb4e74c79
[tx-robot] updated from transifex
2012-10-29 00:02:45 +01:00
Felix Moeller
dfc8228fb4
NoSpaceAfterComma
2012-10-28 23:58:08 +01:00
Felix Moeller
5d640f9ae3
NoSpaceAfterComma
2012-10-28 18:28:16 +01:00
Felix Moeller
b7a02f0c93
NoSpaceAfterComma
...
first in new branch
2012-10-28 18:12:31 +01:00
Robin Appelman
6bc156ba69
add svg mimetype to default htaccess
2012-10-28 16:03:52 +01:00
Arthur Schiwon
be215a097a
check if RUNTIME_NOAPPS is set before using it
2012-10-28 15:10:22 +01:00
Georg Ehrke
d7a6b09406
deny the usage of dots in database name
2012-10-28 14:11:41 +01:00
Arthur Schiwon
b8a48b55a3
make sure all filesystem apps are loaded when setupFS is proceeded, to make sure the emmited setup-hook is received. Fixes #89
2012-10-28 13:48:08 +01:00
Arthur Schiwon
5b9ba2e033
remove whitespaces, no code change
2012-10-28 13:48:08 +01:00
Bernhard Posselt
bf3dac05d1
added functions for printing escaped and unescaped values
2012-10-28 13:28:22 +01:00
Tom Needham
bcdf3a23db
Merge master into ocs_api
2012-10-28 11:16:04 +00:00
Tom Needham
b079447988
Add API method for sharing a file, currently only via a link.
2012-10-28 11:06:47 +00:00
Tom Needham
07111ff672
Allow apps to pass defaults and requirements for their API calls
2012-10-28 11:04:23 +00:00
Robin Appelman
b07672821b
check for changes when using the cache api
2012-10-28 11:43:45 +01:00
Robin Appelman
fba7be1194
add filesystem watcher to detect updates
2012-10-28 11:39:37 +01:00
Robin Appelman
c4a793913c
Merge branch 'master' into filesystem
2012-10-28 10:28:25 +01:00
Jenkins for ownCloud
1a08ef6a06
[tx-robot] updated from transifex
2012-10-28 00:02:29 +02:00
Robin Appelman
c964fe9f8d
merge master into filesystem
2012-10-27 18:11:52 +02:00
Robin Appelman
79d0ac21cc
delete child entries when a folder gets removed from cache
2012-10-27 18:08:00 +02:00
Robin Appelman
56e9ce44c3
add a way to recalucale the size of a folder in the cache
2012-10-27 18:08:00 +02:00
Björn Schießle
0d3f68cc7a
fix function documentation
2012-10-27 18:08:00 +02:00
Bart Visscher
fecfeac55d
Fix introduced style errors
2012-10-27 17:45:15 +02:00
Bart Visscher
894d44e796
Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'
...
Conflicts:
lib/base.php
2012-10-27 16:33:10 +02:00
Björn Schießle
8a3eda16f2
fix function documentation
2012-10-27 15:53:10 +02:00
Robin Appelman
38371d1275
Merge branch 'master' into filesystem
2012-10-27 14:28:24 +02:00
Robin Appelman
5bfff6c56e
use absolute paths when resolving mount points
2012-10-27 12:17:35 +02:00
Bart Visscher
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
Bart Visscher
43e8293d9c
Change Symfony/Component/Routing from submodule to composer fetching
2012-10-27 11:32:16 +02:00
Robin Appelman
3437071cf1
remove old searchByMime
2012-10-27 10:40:27 +02:00
Robin Appelman
fcc92a9f43
add searchByMime to new cache api
2012-10-27 10:34:25 +02:00
Jakob Sack
d0bbd9416b
Add BackgroundJob::setExecutionType() to public API
2012-10-27 10:15:39 +02:00
Jakob Sack
9cf9d41e51
Add a new backgroundjob class to access the type of background jobs easily
2012-10-27 10:08:56 +02:00
Robin Appelman
cbc71784c0
Merge branch 'master' into filesystem
2012-10-27 10:02:26 +02:00
Robin Appelman
695405dfeb
add permissions data to the results of the cache api
2012-10-27 10:01:20 +02:00
Jenkins for ownCloud
3bef19c623
[tx-robot] updated from transifex
2012-10-27 00:02:05 +02:00
Robin Appelman
9953427197
also use new cache api here
2012-10-26 23:26:12 +02:00
Robin Appelman
7d6da68d53
prove some compatibility with the old cache api
2012-10-26 23:25:52 +02:00
Florian Hülsmann
a48734bcb5
fixed user/group sharing hooks
2012-10-26 23:15:37 +02:00
Robin Appelman
6db81afab9
move some stuff to the new api
2012-10-26 23:05:02 +02:00
Bart Visscher
fe75793815
Split database setup code to functions
2012-10-26 22:48:57 +02:00
Robin Appelman
4b616764e8
Merge branch 'master' into filesystem
2012-10-26 22:32:44 +02:00
Florian Hülsmann
b7bf28d1c7
Hook emission on sharing stuff
2012-10-26 20:53:32 +02:00
Victor Dubiniuk
d428d72dab
Fix mimetype detection with the 'file' utility
2012-10-26 21:02:04 +03:00
Robin Appelman
c22a723785
add file permissions cache
2012-10-26 19:07:29 +02:00
Robin Appelman
ad5957207d
merge master into filesystem
2012-10-26 18:29:24 +02:00
Robin Appelman
ad720c4c17
possible fix for bombarding the server with the htaccess test during setup
2012-10-26 18:24:06 +02:00
Robin Appelman
286fd78865
Merge branch 'master' into filesystem
2012-10-26 17:40:57 +02:00
Robin Appelman
8bce661e4d
add search to the filecache api
2012-10-26 13:23:49 +02:00
Georg Ehrke
1888ac0d41
add the possibility to add an preupdate.php
2012-10-26 13:10:56 +02:00
Robin Appelman
7ef0ffe8ad
add View->putFileInfo to the filecache api
2012-10-26 12:43:23 +02:00
Robin Appelman
e63e246c48
fix problem with normalizePath when there was a double leading slash
2012-10-26 12:37:49 +02:00
Robin Appelman
39adadd3e3
move the cache api from OC_Files to filesystem(view)
2012-10-26 12:30:25 +02:00
Bart Visscher
8fb36c93f5
Add MDB2 compatible database schema writer
2012-10-26 10:51:21 +02:00
Robin Appelman
0e2bf8d373
Merge branch 'master' into filesystem
2012-10-26 10:42:41 +02:00
Jenkins for ownCloud
c7d64811d6
[tx-robot] updated from transifex
2012-10-26 02:05:56 +02:00
Thomas Tanghus
d9d8da0a5c
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-25 20:34:03 +02:00
Robin Appelman
7bc49d2a57
merge master into filesystem
2012-10-25 18:26:08 +02:00
Lukas Reschke
228a05a792
Check for iconv
2012-10-25 16:49:55 +02:00
Lukas Reschke
55277c8e5a
Allow any characters in the groupname
...
Fixes #82
2012-10-25 11:54:31 +02:00
Jenkins for ownCloud
43bae1b473
[tx-robot] updated from transifex
2012-10-25 02:11:53 +02:00
Thomas Tanghus
2fc495a91a
Also delete category/object relations when deleting a category.
2012-10-24 22:39:34 +02:00
Thomas Tanghus
675a56c5ed
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-10-24 21:55:25 +02:00
Lukas Reschke
515e1b467e
Merge pull request #81 from fmms/master
...
Codestyle add some needed spaces.
2012-10-24 10:16:32 -07:00