dfa6aa25c3
Merge pull request #3886 from owncloud/disable-public-upload-if-encryption-enabled-master
...
for now we disable public upload in case encryption is enabled
2013-06-28 13:59:33 -07:00
c2ac0fb4df
Merge pull request #3881 from owncloud/archive_tar_php5.5
...
Skip Test_Archive_TAR in php 5.5 for now
2013-06-28 13:41:18 -07:00
67ed48d4c9
Merge pull request #3884 from owncloud/fixing-unittests-master
...
Fixing unittests master
2013-06-28 13:38:44 -07:00
30a403e327
Merge pull request #3892 from owncloud/static-streamwrapper
...
Improvements for the static:// streamwrapper
2013-06-28 12:24:33 -07:00
e3df2b8c87
Merge pull request #1044 from owncloud/fix_extra_slash
...
Remove duplicate / for first folder in root
2013-06-28 12:00:35 -07:00
89dc8be9f5
update to !==
2013-06-28 21:00:09 +02:00
a0d8377109
better unit tests for static stream wrapper
2013-06-28 19:59:04 +02:00
dc0ebe9007
fix is_file and is_dir for the static streamwrapper
2013-06-28 19:54:16 +02:00
156e72a0c4
add option to clear the files in the static streamwrapper
2013-06-28 19:41:28 +02:00
f3c4a37a78
Merge pull request #3832 from owncloud/oracle_sql_fixes
...
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-28 10:22:59 -07:00
f726de3cab
for now we disable public upload in case encryption is enabled
2013-06-28 16:49:25 +02:00
7d3490036c
Merge pull request #3838 from rgeber/master
...
Public Upload Feature
2013-06-28 07:30:41 -07:00
b1a2ddd149
Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
...
Fix pdo statement wrapper numrows on modification
2013-06-28 07:15:38 -07:00
3bedb09753
Merge pull request #3843 from owncloud/sabre-exceptions
...
Sabre: throw exceptions when delete/create/write operations are not permitted
2013-06-28 07:05:09 -07:00
6ad7a0336f
Oracle doesn't know & as bitwise AND
...
Conflicts:
lib/public/share.php
2013-06-28 15:48:49 +02:00
6ddfe2029c
Merge pull request #3865 from owncloud/fix_test_for_oracle
...
Fix sharing test for oracle
2013-06-28 06:18:56 -07:00
de66861ef1
make phpunit happy - adding asserts
2013-06-28 15:13:57 +02:00
df9e56efd0
Merge pull request #3839 from owncloud/unix_timestamp_replacement_for_oracle
...
manually calculate unix_timestamp for oracle
2013-06-28 06:11:28 -07:00
3abeb252d8
make PHPUnit happy and add asserts
2013-06-28 14:37:52 +02:00
42cb77b982
TimedJob: make PhpUnit happy with asserts
2013-06-28 13:24:24 +02:00
7f3ddd4341
Skip Test_Archive_TAR in php 5.5 for now
2013-06-28 11:30:47 +02:00
6127fee5aa
[tx-robot] updated from transifex
2013-06-28 02:04:58 +02:00
df43ddb902
Merge pull request #3872 from bantu/phpunit-xml-dist
...
Use phpunit.xml.dist instead of phpunit.xml ...
2013-06-27 13:07:42 -07:00
be22d28eb9
Merge pull request #3576 from owncloud/jquery.multiselect-1.13
...
Update to jquery.multiselect 1.13
2013-06-27 07:50:47 -07:00
2269145b4d
gitignore: Fix typo + adjust comment format.
2013-06-27 16:50:17 +02:00
d015b9219c
PHPUnit: Add tests/phpunit.xml to gitignore.
2013-06-27 16:44:55 +02:00
121e4ca395
PHPUnit: Allow developers to use their own custom phpunit.xml file.
...
The order of precedence of configuration files for PHPUnit is:
- phpunit.xml (allowing custom user defined configuration)
- phpunit.xml.dist (configuration distributed with the software)
2013-06-27 16:31:31 +02:00
45c897acf3
one if less
2013-06-27 13:13:49 +02:00
aa7403500f
Merge pull request #3847 from bantu/phpunit-json-listener-removal
...
phpunit: Remove PHPUnit_Util_Log_JSON which spammed to stdout on console
2013-06-27 01:55:57 -07:00
29caae3491
[tx-robot] updated from transifex
2013-06-27 02:12:00 +02:00
da0caadf4e
Added file-upload to GIT repo
...
Optimized CSS identifiers
2013-06-26 22:51:38 +02:00
5d51118cb2
fix type of numeric columns
2013-06-26 20:03:24 +02:00
bf49edde6b
check item id is set
2013-06-26 19:57:28 +02:00
6fcee1ee11
Merge pull request #3855 from owncloud/fixing-3853-master
...
move javascript variables 'oc_current_user' and 'oc_requesttoken' to js....
2013-06-26 04:42:32 -07:00
e6c1db7a3f
move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - fixes #3853
2013-06-26 11:23:21 +02:00
afc3d9314a
[tx-robot] updated from transifex
2013-06-26 02:07:04 +02:00
592bb01ccd
phpunit: Remove PHPUnit_Util_Log_JSON which spammed to stdout on console.
2013-06-25 21:57:00 +02:00
6208780332
Sabre: throw exceptions when delete/create/write operations are not permitted
2013-06-25 17:04:25 +02:00
9c9bfcd626
log as index, not remote
2013-06-25 17:45:42 +03:00
39cca72964
Merge pull request #3750 from owncloud/dummy_session_for_errors
...
Init dummy session to render error pages
2013-06-25 03:34:49 -07:00
ddb0ff346d
Public upload feature
2013-06-25 12:24:14 +02:00
7273b43cd5
manuall calculate unix_timestamp for oracle
2013-06-25 09:52:04 +02:00
c3b8f2bf64
[tx-robot] updated from transifex
2013-06-25 02:13:40 +02:00
b32d6d8487
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-24 22:52:01 +02:00
754bc86ec8
Merge pull request #3826 from owncloud/fix_webdav_locking_for_oracle
...
use to_char when comparing clob to string on oracle, use execute audited
2013-06-24 07:37:21 -07:00
1b97c186b4
use assertEquals number of rows in db tests
2013-06-24 16:29:59 +02:00
c79f7f4f3c
fix numRows usage in files_encryption
2013-06-24 16:29:59 +02:00
c223bee6df
fix numRows usage in core lib
2013-06-24 16:29:59 +02:00
88fc410c19
fix numRows usage in user_ldap
2013-06-24 16:29:58 +02:00
643c8d3088
make PDOStatementWrapper return number of updated rows on INSERT, UPDATE or DELETE queries, introduces isManipulation() to guess type of query
2013-06-24 16:29:58 +02:00
Thomas Müller
Morris Jobke
icewind1991
Bart Visscher
Robin Appelman
Jörn Friedrich Dreyer
Thomas Tanghus
Andreas Fischer
Roman Geber
VicDeo