Björn Schießle
|
2f4ba9d1e8
|
if file was shared to user than userIds is just the users Id
|
2013-05-13 15:45:30 +02:00 |
|
Björn Schießle
|
d1e2e47592
|
generate random key name for share key to avoid name conflicts
|
2013-05-13 15:15:35 +02:00 |
Lukas Reschke
|
665663432c
|
Merge pull request #3326 from owncloud/fix-3321
Add requesttoken to guest view
|
2013-05-13 05:45:38 -07:00 |
|
Björn Schießle
|
a6ef25ba08
|
use preShare hook only to check if all pub keys are available and the postShare hook to finaly update the shareKeys if the file was shared successfully
|
2013-05-13 14:28:45 +02:00 |
|
Lukas Reschke
|
739f799912
|
Add requesttoken to guest view
Should fix #3321
|
2013-05-13 14:23:56 +02:00 |
Arthur Schiwon
|
beaa10b823
|
Merge branch 'master' into ldap_configurable_username_n_uuid
|
2013-05-13 12:41:22 +02:00 |
|
Björn Schießle
|
0ef8590773
|
Merge branch 'master' into update_etags_on_restore
|
2013-05-13 10:48:06 +02:00 |
Morris Jobke
|
e60cf2a997
|
Merge pull request #3235 from NCTU-NBA/pr-langcode
Modify zh_* language codes
|
2013-05-13 00:42:13 -07:00 |
Frank Karlitschek
|
0e55accee2
|
Set the SQLite database lock timeout to 60 seconds which is the default in PHP anyways. I don't know why the MDB2 driver has this hardcoded to 0.1 seconds. This potentially fixes a lot of SQLite database lock problems and stuck in maintainance mode during upgrade issues.
|
2013-05-13 02:42:18 +02:00 |
Jenkins for ownCloud
|
e8c154f341
|
[tx-robot] updated from transifex
|
2013-05-13 02:10:20 +02:00 |
Pellaeon Lin
|
935675ab49
|
Merge remote-tracking branch 'upstream/master' into pr-langcode
|
2013-05-12 22:32:22 +08:00 |
infoneo
|
be4eef682a
|
Fixed problems with a dots in a filenames
|
2013-05-12 15:22:57 +03:00 |
|
Morris Jobke
|
e2bd32323d
|
[files] fix mock creation and remove hardcoded 'require' statement
|
2013-05-12 13:02:01 +02:00 |
|
Morris Jobke
|
c5cb3f9577
|
Merge pull request #3311 from owncloud/disable_mbstring.func_overload
disable mbstring.func_overload in setup v.3
|
2013-05-12 03:28:18 -07:00 |
|
Morris Jobke
|
b777c0fd75
|
[files] rename lib to "App"
|
2013-05-12 11:47:22 +02:00 |
|
Morris Jobke
|
b32c30b6d0
|
[files] ownCloud typo
|
2013-05-12 11:47:22 +02:00 |
|
Morris Jobke
|
7e23e97676
|
[files] rename test class and add rename test
|
2013-05-12 11:47:22 +02:00 |
|
Morris Jobke
|
d4ba9cf338
|
[files] remove realpath in test
|
2013-05-12 11:47:22 +02:00 |
|
Morris Jobke
|
bb5554de7f
|
[files] rename tests
|
2013-05-12 11:47:22 +02:00 |
|
Morris Jobke
|
b9f426b1d7
|
[files] remove normalizePath on rename and dependency injection
|
2013-05-12 11:47:22 +02:00 |
|
Morris Jobke
|
324c423548
|
[files] kill stripslashes
|
2013-05-12 11:47:22 +02:00 |
|
Morris Jobke
|
418e878ba8
|
[files] fix typos
|
2013-05-12 11:47:22 +02:00 |
|
Morris Jobke
|
1020d5c16c
|
[files] refactoring
|
2013-05-12 11:47:22 +02:00 |
|
Morris Jobke
|
33b31931bd
|
string comparision
|
2013-05-12 11:47:22 +02:00 |
|
Morris Jobke
|
b393c91a96
|
wrong root dir name
|
2013-05-12 11:47:22 +02:00 |
|
Morris Jobke
|
a878bd9923
|
fix allowed rename of folder in root directory to reserved name "Shared"
refs #2159
|
2013-05-12 11:47:22 +02:00 |
|
Lukas Reschke
|
564f26475c
|
Merge pull request #3290 from owncloud/config-data
Move config data to template
|
2013-05-12 02:40:30 -07:00 |
Thomas Tanghus
|
baf058316c
|
disable mbstring.func_overload in setup
|
2013-05-12 10:56:32 +02:00 |
|
Lukas Reschke
|
337e3ed61f
|
Typo
|
2013-05-12 10:51:21 +02:00 |
|
Lukas Reschke
|
63d51980e1
|
Get config from template
|
2013-05-12 10:51:21 +02:00 |
|
Jenkins for ownCloud
|
74f92d0c7f
|
[tx-robot] updated from transifex
|
2013-05-12 02:05:29 +02:00 |
|
infoneo
|
8f19c5ecab
|
Dots in a filenames fix
|
2013-05-12 01:47:48 +02:00 |
icewind1991
|
dd4a31df48
|
Merge pull request #3309 from owncloud/no_explicit_autoload
Use new autoloader class in tests
|
2013-05-11 14:22:08 -07:00 |
|
Thomas Tanghus
|
0d852dce3b
|
Use new autoloader class
|
2013-05-11 22:44:45 +02:00 |
|
Morris Jobke
|
ea88e295d3
|
Merge pull request #3296 from owncloud/disable_mbstring.func_overload
disable mbstring.func_overload
|
2013-05-11 02:01:19 -07:00 |
Florin Peter
|
8e004cc3e1
|
added handling for sharing with link
NOTE: only encryption work atm
|
2013-05-11 01:03:43 +02:00 |
|
Florin Peter
|
33e0dfeecb
|
sharing with group should work now
|
2013-05-11 00:25:32 +02:00 |
|
Florin Peter
|
e88595638c
|
fix for webdav
|
2013-05-11 00:23:30 +02:00 |
|
Florin Peter
|
dc8164a3f0
|
fix for accessing non object
|
2013-05-11 00:22:58 +02:00 |
Jan-Christoph Borchardt
|
f3f74f826a
|
Merge pull request #3257 from owncloud/fix_3251
Fix 3251
|
2013-05-10 08:41:27 -07:00 |
|
Morris Jobke
|
9f3c156aca
|
Merge pull request #3283 from owncloud/move-legacy-fs
Move legacy filesystem classes
|
2013-05-10 07:53:04 -07:00 |
|
icewind1991
|
5667d11f7d
|
Merge pull request #3304 from owncloud/fix_bypass_fo_file_blacklist
Properly check file blacklist
|
2013-05-10 06:15:34 -07:00 |
|
Björn Schießle
|
cc433d47cb
|
touch() needs to be performed relative to user/files otherwise ownCloud doesn't execute the hooks which means that etags aren't updated properly
|
2013-05-10 12:05:11 +02:00 |
Jörn Friedrich Dreyer
|
9134395b43
|
don't emit rename hooks on partial file renames
|
2013-05-10 12:01:50 +02:00 |
|
Jörn Friedrich Dreyer
|
c3b0d3d38c
|
rename isIgnoredFile to isPartialFile, remove check of blacklisted files in isPartialFile, correct usage of isPartialFile and isFileBlacklisted
|
2013-05-10 12:00:13 +02:00 |
|
Thomas Tanghus
|
78559c0863
|
disable mbstring.func_overload
|
2013-05-10 02:13:59 +03:00 |
|
Florin Peter
|
3eae26143f
|
added test for re-share folder
|
2013-05-10 01:00:24 +02:00 |
|
Florin Peter
|
15845bf0bf
|
fix for autotest.sh
|
2013-05-09 23:22:46 +02:00 |
|
Florin Peter
|
18a821b1e3
|
added helper
|
2013-05-09 23:22:22 +02:00 |
|
Florin Peter
|
1f464a7113
|
fix for accessing non object
|
2013-05-09 23:21:39 +02:00 |