wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12129 commits 157 branches 562 tags 714 MiB
Commit graph

12129 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jörn Friedrich Dreyer
7d3490036c Merge pull request #3838 from rgeber/master 
Public Upload Feature
 2013-06-28 07:30:41 -07:00
Bart Visscher
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
Thomas Müller
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
Bart Visscher
6ad7a0336f Oracle doesn't know & as bitwise AND 
Conflicts:
	lib/public/share.php
 2013-06-28 15:48:49 +02:00
Robin Appelman
125f9f4221 move storage wrappers to their own namespace 2013-06-28 15:34:25 +02:00
Bart Visscher
6ddfe2029c Merge pull request #3865 from owncloud/fix_test_for_oracle 
Fix sharing test for oracle
 2013-06-28 06:18:56 -07:00
Thomas Mueller
3b91ce695f session_life_time -> session_lifetime 
default session_lifetime is 24hrs
recreation of session is triggered at 50% of the session life time
 2013-06-28 15:17:54 +02:00
Thomas Mueller
de66861ef1 make phpunit happy - adding asserts 2013-06-28 15:13:57 +02:00
Bart Visscher
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
Thomas Mueller
3abeb252d8 make PHPUnit happy and add asserts 2013-06-28 14:37:52 +02:00
Thomas Mueller
42cb77b982 TimedJob: make PhpUnit happy with asserts 2013-06-28 13:24:24 +02:00
Bart Visscher
7f3ddd4341 Skip Test_Archive_TAR in php 5.5 for now 2013-06-28 11:30:47 +02:00
Bart Visscher
1edf01d09f Fix usage of non existent consts 2013-06-28 11:15:25 +02:00
Jenkins for ownCloud
6127fee5aa [tx-robot] updated from transifex 2013-06-28 02:04:58 +02:00
Thomas Mueller
de93b21505 missing $ 2013-06-27 23:14:32 +02:00
Jörn Friedrich Dreyer
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
Bart Visscher
fb80cbd499 Fix review points 2013-06-27 22:01:52 +02:00
Bart Visscher
2eaad58922 Make the object drive the logging backend 
This is the other way around then it was.
 2013-06-27 20:10:54 +02:00
Thomas Tanghus
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
Andreas Fischer
2269145b4d gitignore: Fix typo + adjust comment format. 2013-06-27 16:50:17 +02:00
Andreas Fischer
d015b9219c PHPUnit: Add tests/phpunit.xml to gitignore. 2013-06-27 16:44:55 +02:00
Andreas Fischer
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
Björn Schießle
2e6ebe1ab4 fix function documentation 2013-06-27 14:14:25 +02:00
Björn Schießle
c4aef89278 introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled 2013-06-27 14:09:22 +02:00
Jörn Friedrich Dreyer
45c897acf3 one if less 2013-06-27 13:13:49 +02:00
Thomas Müller
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
Jenkins for ownCloud
29caae3491 [tx-robot] updated from transifex 2013-06-27 02:12:00 +02:00
Roman Geber
da0caadf4e Added file-upload to GIT repo 
Optimized CSS identifiers
 2013-06-26 22:51:38 +02:00
Jörn Friedrich Dreyer
5d51118cb2 fix type of numeric columns 2013-06-26 20:03:24 +02:00
Jörn Friedrich Dreyer
bf49edde6b check item id is set 2013-06-26 19:57:28 +02:00
Björn Schießle
5a20c8b66f add openssl_error_string() output to the owncloud.log 2013-06-26 15:51:22 +02:00
Jörn Friedrich Dreyer
bc61a9c097 enable testing individual tests 2013-06-26 15:33:35 +02:00
VicDeo
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
Thomas Mueller
e6c1db7a3f move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - fixes #3853 2013-06-26 11:23:21 +02:00
Thomas Mueller
794c189650 session life time is now configurable and set to the same value 2013-06-26 09:21:38 +02:00
Jenkins for ownCloud
afc3d9314a [tx-robot] updated from transifex 2013-06-26 02:07:04 +02:00
Andreas Fischer
592bb01ccd phpunit: Remove PHPUnit_Util_Log_JSON which spammed to stdout on console. 2013-06-25 21:57:00 +02:00
Robin Appelman
6208780332 Sabre: throw exceptions when delete/create/write operations are not permitted 2013-06-25 17:04:25 +02:00
Jörn Friedrich Dreyer
9c9bfcd626 log as index, not remote 2013-06-25 17:45:42 +03:00
Thomas Müller
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
Roman Geber
ddb0ff346d Public upload feature 2013-06-25 12:24:14 +02:00
Jörn Friedrich Dreyer
7273b43cd5 manuall calculate unix_timestamp for oracle 2013-06-25 09:52:04 +02:00
Jenkins for ownCloud
c3b8f2bf64 [tx-robot] updated from transifex 2013-06-25 02:13:40 +02:00
Jörn Friedrich Dreyer
b32d6d8487 for oracle use BITAND() instead of & in sharing permissions sql 2013-06-24 22:52:01 +02:00
Thomas Müller
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
Jörn Friedrich Dreyer
1b97c186b4 use assertEquals number of rows in db tests 2013-06-24 16:29:59 +02:00
Jörn Friedrich Dreyer
c79f7f4f3c fix numRows usage in files_encryption 2013-06-24 16:29:59 +02:00
Jörn Friedrich Dreyer
c223bee6df fix numRows usage in core lib 2013-06-24 16:29:59 +02:00
Jörn Friedrich Dreyer
88fc410c19 fix numRows usage in user_ldap 2013-06-24 16:29:58 +02:00
Jörn Friedrich Dreyer
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