icewind1991
|
af1c3dd4ce
|
Merge pull request #3963 from owncloud/update-logic-split
Move the upgrade logic to \OC\Updater
|
2013-07-08 12:38:39 -07:00 |
Robin Appelman
|
a0d5ba1167
|
fix typo
|
2013-07-08 21:13:31 +02:00 |
Jörn Friedrich Dreyer
|
15907f6aee
|
Merge pull request #3979 from owncloud/permissions-hook
Add update permissions hook to sharing
|
2013-07-08 09:32:10 -07:00 |
Bart Visscher
|
e7b882a4fc
|
stupid namespace
|
2013-07-08 18:29:43 +02:00 |
Bart Visscher
|
4a6803ef9d
|
Check if logger is set, also no need to return true
|
2013-07-08 18:26:11 +02:00 |
Bart Visscher
|
abe9abab99
|
Add constructor documentation
|
2013-07-08 18:01:32 +02:00 |
Jörn Friedrich Dreyer
|
301c9e1399
|
requires fixes in 3rdparty mdb2
|
2013-07-08 18:01:20 +02:00 |
Bart Visscher
|
52553c64ed
|
Merge branch 'master' into convert-oc_config
Conflicts:
lib/config.php
|
2013-07-08 17:59:50 +02:00 |
Michael Gapczynski
|
5c2a0325ba
|
Add update permissions hook to sharing
|
2013-07-08 11:40:10 -04:00 |
Robin Appelman
|
4a4e139c83
|
forward previously registerd hooks
|
2013-07-08 16:54:26 +02:00 |
Robin Appelman
|
925d09cb0e
|
add forwarding emitter for agregating multiple emitters
|
2013-07-08 16:45:19 +02:00 |
Jörn Friedrich Dreyer
|
ccce93755f
|
enable oracle testing by default
|
2013-07-08 16:42:19 +02:00 |
Thomas Müller
|
02d2e41e04
|
Merge pull request #3954 from owncloud/update_insertifnotexist_and_test
fix insertIfNotExist return value, update doc and corresponding test
|
2013-07-08 07:17:45 -07:00 |
Christian Berendt
|
020803aa7e
|
minimize waiting time
|
2013-07-08 16:06:08 +02:00 |
Christian Berendt
|
deda583fad
|
wait methods are probably not working, just wait
|
2013-07-08 15:56:56 +02:00 |
Jan-Christoph Borchardt
|
8d8f99fbc4
|
Merge pull request #3757 from owncloud/icon-cleanup
Icon cleanup
|
2013-07-08 06:56:29 -07:00 |
Christian Berendt
|
83a1fce1a3
|
make tests workable with Amazon S3
|
2013-07-08 15:25:49 +02:00 |
Christian Berendt
|
882d5ad728
|
added exception messages
|
2013-07-08 15:10:10 +02:00 |
Christian Berendt
|
8c9e6db1b1
|
increasing allowed time difference
|
2013-07-08 15:03:55 +02:00 |
Christian Berendt
|
fdeb21ba5b
|
wait until bucket exists after the creation
|
2013-07-08 15:00:07 +02:00 |
Christian Berendt
|
911e947fd7
|
check if used bucket name is valid
|
2013-07-08 14:59:09 +02:00 |
Christian Berendt
|
dc8ca00f1e
|
fixed syntax error
|
2013-07-08 13:26:41 +02:00 |
Thomas Müller
|
0365d244e0
|
Merge pull request #3946 from owncloud/fixing-3942-master
handle anonymous upload to reshared folder
|
2013-07-08 02:27:21 -07:00 |
Christian Berendt
|
d59291a8e7
|
remove needless check
|
2013-07-08 11:16:58 +02:00 |
Christian Berendt
|
0bc28dcb95
|
replaced substr with trim
|
2013-07-08 11:14:47 +02:00 |
Christian Berendt
|
adf0fe880c
|
removed aws.phar and added extracted zip instead
|
2013-07-08 11:11:07 +02:00 |
Björn Schießle
|
9b9ea7cd8e
|
Merge https://github.com/owncloud/core/pull/3827
Squashed commit of the following:
commit eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:03:23 2013 +0200
initialize OC_Defaults only once
commit bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:02:48 2013 +0200
link to doc in error messages
commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge: e41af3d 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:56 2013 +0200
Merge branch 'master' into better-messages
commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:41 2013 +0200
move to non-static defaults.php
commit 9e4258b1905244bdf34943a825421f041cbed43d
Author: Björn Schießle <schiessle@owncloud.com>
Date: Tue Jul 2 10:32:13 2013 +0200
no sprintf here, lets t() handle it
commit fe1df349e248667a137f70d78b04225e5b42a111
Merge: d8f6859 cb5811b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:13:38 2013 +0200
Merge branch 'master' into better-messages
commit d8f68595df2dc0e0917d916cbde511ec5333010b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:10:57 2013 +0200
use document base url from defaults.php
commit 6c5403748a45717125a2aa375550f05646317d72
Merge: bea6b1c 7b0e3e6
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:00:15 2013 +0200
Merge branch 'master' into better-messages
commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:21:12 2013 +0200
link to docs in WebDAV message, ref #3791
commit 3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:10:21 2013 +0200
link to docs in error messages, fix #3819
|
2013-07-08 10:07:57 +02:00 |
Jenkins for ownCloud
|
3cb4a72960
|
[tx-robot] updated from transifex
|
2013-07-08 02:09:41 +02:00 |
Jenkins for ownCloud
|
096d7674fc
|
[tx-robot] updated from transifex
|
2013-07-07 02:06:06 +02:00 |
Robin Appelman
|
9cd7ecd502
|
Updater: pass update url as argument to update check
|
2013-07-06 17:05:38 +02:00 |
Robin Appelman
|
58f473d734
|
split upgrade logic from ajax file
|
2013-07-06 17:00:00 +02:00 |
Jenkins for ownCloud
|
c8ad3df1fa
|
[tx-robot] updated from transifex
|
2013-07-06 02:08:38 +02:00 |
Thomas Müller
|
c956a08d22
|
fixing check if public share is a folder or not
|
2013-07-06 00:12:29 +02:00 |
Thomas Müller
|
98da4bf704
|
removing unused getSharedItem()
|
2013-07-06 00:04:01 +02:00 |
Thomas Müller
|
dad91c156f
|
Merge branch 'master' into fixing-3942-master
Conflicts:
apps/files/ajax/upload.php
|
2013-07-06 00:02:11 +02:00 |
Thomas Müller
|
bc1c776642
|
Merge pull request #3951 from owncloud/fixing-3936-master
get the real physical folder name for anonymous upload
|
2013-07-05 14:43:47 -07:00 |
Bart Visscher
|
ab2037ab5d
|
Only change integer type when the length is set
|
2013-07-05 22:05:16 +02:00 |
Bart Visscher
|
b8a7e97301
|
Add comment to column definition
|
2013-07-05 21:42:37 +02:00 |
Bart Visscher
|
2db839c4d3
|
Move error handlers from OC_Log to OC\Log\ErrorHandler
|
2013-07-05 19:28:10 +02:00 |
Thomas Müller
|
4e04a710b6
|
Merge pull request #3955 from owncloud/cache-scanner-test
Scanner test: ensure mtime in the cache is the same as on the storage to...
|
2013-07-05 10:11:58 -07:00 |
Thomas Müller
|
d14c5a3fa7
|
Merge pull request #3958 from owncloud/fixing-3933-master
adding tipsy to the upload button showing the max upload and restoring c...
|
2013-07-05 08:45:12 -07:00 |
Thomas Müller
|
e159cbf527
|
on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function
|
2013-07-05 17:39:41 +02:00 |
Bart Visscher
|
c8d700c713
|
Merge pull request #3948 from owncloud/fixing-3934-master
no anonymous upload on files only folders
|
2013-07-05 08:21:45 -07:00 |
Thomas Müller
|
f8dae11a23
|
Merge pull request #3957 from owncloud/config-glob-fail
OC_Config: handle failure of glob('*.config.php')
|
2013-07-05 07:38:04 -07:00 |
Björn Schießle
|
87063918f2
|
remove wrong closing bracket
|
2013-07-05 16:05:05 +02:00 |
Björn Schießle
|
9575c2f37c
|
added helper function to escape glob pattern
Conflicts:
apps/files_encryption/lib/helper.php
|
2013-07-05 16:03:20 +02:00 |
Björn Schießle
|
ec6350079f
|
fix getUidAndFilename() test
|
2013-07-05 16:00:43 +02:00 |
Björn Schießle
|
15cb8e4efd
|
only check for external mount points if the external storage app is enabled
|
2013-07-05 16:00:34 +02:00 |
Björn Schießle
|
ae30eb48f2
|
make trash bin aware of system wide mounts with respect to encryption keys
|
2013-07-05 16:00:25 +02:00 |
Björn Schießle
|
f9c337dd21
|
only escape glob pattern
|
2013-07-05 16:00:17 +02:00 |