Commit graph

12624 commits

Author SHA1 Message Date
Bjoern Schiessle
97e910e087 make methods private which are not used from outside 2013-08-08 08:37:39 +02:00
Björn Schießle
930f0e4c18 Merge pull request #4270 from owncloud/fix_4253
cancel sharing if some users doesn't have a working encryption set-up.
2013-08-01 07:43:50 -07:00
Jörn Friedrich Dreyer
77dad7070d Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdoc
added @var tags
2013-08-01 07:40:01 -07:00
Jörn Friedrich Dreyer
43c6d82825 Merge pull request #4266 from berendt/OC_Files_Storage_AmazonS3_logging
write all catched exception messages to the log
2013-08-01 07:38:45 -07:00
Bjoern Schiessle
69173c2a6b fix test and make warning translatable 2013-08-01 14:19:33 +02:00
Bjoern Schiessle
9253627327 cancel sharing if some users doesn't have a working encryption set-up. 2013-08-01 13:04:55 +02:00
Morris Jobke
30963d60bc Merge pull request #4155 from owncloud/mdb2schemareader-booleans
Fix boolean support for xml schema definitions
2013-08-01 02:09:01 -07:00
Christian Berendt
5a4c39207e write all catched exception messages to the log 2013-08-01 10:08:41 +02:00
Christian Berendt
3e53e25cd1 added @var tags 2013-08-01 10:05:01 +02:00
Morris Jobke
0d69feb12e Merge pull request #4208 from owncloud/scanner-php53
Fix scanner hooks throwing errors
2013-08-01 00:05:56 -07:00
Jenkins for ownCloud
b037f2dc6e [tx-robot] updated from transifex 2013-08-01 01:57:04 -04:00
Morris Jobke
563c63bf9c Merge pull request #4259 from owncloud/search_result_scrollbar
Search result scrollbar
2013-07-31 13:03:41 -07:00
Jörn Friedrich Dreyer
cbf17617b0 update css properties with px based values 2013-07-31 17:07:23 +02:00
Jörn Friedrich Dreyer
627fd8ba8d add overflow-y scroll and clean up indents 2013-07-31 17:07:08 +02:00
Morris Jobke
50101a85a6 Merge pull request #3982 from owncloud/test_lastinsertid
test lastinsertid
2013-07-31 00:03:29 -07:00
Jenkins for ownCloud
761f40328c [tx-robot] updated from transifex 2013-07-31 02:01:45 -04:00
Andreas Fischer
79d355b526 Merge pull request #4246 from owncloud/speedup-autotest-master
use tmpfs at /dev/shm to speedup unit test execution

* owncloud/speedup-autotest-master:
  use tmpfs at /dev/shm to speedup unit test execution
2013-07-31 02:59:15 +02:00
Thomas Müller
d3e610f589 Merge pull request #4225 from owncloud/better-404
More verbose 404, closes #3225
2013-07-30 13:20:28 -07:00
Victor Dubiniuk
15e9e95817 Use default cursor for list items 2013-07-30 20:58:21 +03:00
Morris Jobke
dc8132f3a3 Merge pull request #4238 from owncloud/fix_4235
added missing isEmpty ajax file
2013-07-30 09:28:39 -07:00
Thomas Müller
01165fbd22 use tmpfs at /dev/shm to speedup unit test execution 2013-07-30 17:41:52 +02:00
Thomas Müller
f35aadb576 Merge pull request #4227 from owncloud/fixing-testGetById-master
implement a platform independent version of basename
2013-07-30 08:39:53 -07:00
Jörn Friedrich Dreyer
91318f7b06 Merge pull request #4237 from owncloud/fixing-4026-master
Allow public upload together with password protection
2013-07-30 08:30:07 -07:00
Bjoern Schiessle
6f20e081e4 added missing isEmpty ajax file 2013-07-30 12:48:41 +02:00
Thomas Müller
10939b0bdf Updating to the latest 3rdparty master commit 2013-07-30 11:09:58 +02:00
Thomas Müller
17c36b5074 fixes #4026 2013-07-30 10:26:42 +02:00
Thomas Müller
409268f322 adding test case with no / 2013-07-30 08:54:39 +02:00
Jenkins for ownCloud
88e1ccbce3 [tx-robot] updated from transifex 2013-07-30 01:57:50 -04:00
Thomas Müller
f658852276 Merge branch 'master' into fixing-testGetById-master 2013-07-30 00:37:05 +02:00
Thomas Müller
085fdfec2f adding unit tests for OC_Util::basename 2013-07-29 23:32:03 +02:00
icewind1991
7c6246fa45 Merge pull request #4213 from owncloud/scanning-performance
Cache: don't check if the parent exists in the cache if we are already sure it does
2013-07-29 13:08:23 -07:00
Robin Appelman
74c54587ec better variable naming 2013-07-29 18:27:19 +02:00
Thomas Mueller
e2d3225e5a implement a platform independent version of basename 2013-07-29 18:24:05 +02:00
Victor Dubiniuk
a10a17f818 Rewording 2013-07-29 18:25:17 +03:00
Björn Schießle
7f9795cc3d Merge pull request #4203 from owncloud/trashbin_improvements
Trashbin improvements
2013-07-29 08:15:53 -07:00
Bjoern Schiessle
4a9f5f64da remove whitespaces 2013-07-29 17:15:20 +02:00
Robin Appelman
dea3472ad7 remove unneeded 'use' 2013-07-29 17:04:28 +02:00
Robin Appelman
64774f30ba dont need to explicitly pass by reference 2013-07-29 17:03:57 +02:00
Victor Dubiniuk
dec7b2fa40 Move styles from core to app 2013-07-29 17:36:59 +03:00
Robin Appelman
a4df982dc3 add tests for MDB2SchemaReader 2013-07-29 16:33:27 +02:00
Robin Appelman
d6c56b584a make MDB2Schema reader non static 2013-07-29 16:33:00 +02:00
Robin Appelman
fbbe0ebe77 add function to get config object from OC_Config 2013-07-29 16:32:37 +02:00
Victor Dubiniuk
97f2c393c1 Allow apps to have own 404 content, closes #3225 2013-07-29 16:54:19 +03:00
Thomas Müller
954b5d9019 Merge pull request #4216 from owncloud/clean_php55_opcache
Also clean PHP 5.5 opcache
2013-07-29 04:40:01 -07:00
Jenkins for ownCloud
0fde473cb7 [tx-robot] updated from transifex 2013-07-29 01:57:04 -04:00
Jörn Friedrich Dreyer
b8bd1e5a81 check type, assertgreaterthan 2013-07-29 02:17:09 +02:00
Jörn Friedrich Dreyer
05fa55f2eb always return int 2013-07-29 02:17:09 +02:00
Jörn Friedrich Dreyer
7e5ae8d780 test lastinsertid 2013-07-29 01:57:30 +02:00
icewind1991
3d76530628 Merge pull request #4218 from owncloud/newdata
Fix potential undefined variable in Scanner
2013-07-28 16:31:48 -07:00
Michael Gapczynski
c8e60900fc Move check so the variable will never be undefined 2013-07-28 15:32:48 -04:00