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

12004 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Jörn Friedrich Dreyer
3e3b66bd0d use to_char when comparing clob to string on oracle, use execute audited 2013-06-24 16:12:21 +02:00
Thomas Müller
bca2eb39fa Merge pull request #3818 from owncloud/update-trigger-cli 
Add a CLI script for manually triggering checking a folder for updates
 2013-06-24 05:49:01 -07:00
Thomas Müller
993a1f1976 Merge pull request #3822 from owncloud/graceful_teardown_of_cache 
graceful teardown of cache
 2013-06-24 05:46:30 -07:00
Jörn Friedrich Dreyer
4ecca9e97b graceful teardown of cache 2013-06-24 12:59:56 +02:00
Jenkins for ownCloud
073464af0b [tx-robot] updated from transifex 2013-06-24 02:11:03 +02:00
Robin Appelman
909d279e55 Add a CLI script for manually triggering checking a folder for updates 2013-06-23 17:49:38 +02:00
Jenkins for ownCloud
aaecfa18ed [tx-robot] updated from transifex 2013-06-23 02:05:39 +02:00
Jenkins for ownCloud
52ba86678a [tx-robot] updated from transifex 2013-06-22 02:11:35 +02:00
Thomas Müller
d6650a51fe Merge pull request #3766 from owncloud/fix_display_name_edit 
Correct new user display name output
 2013-06-21 12:45:09 -07:00
Thomas Müller
65de0a5831 Merge pull request #3810 from owncloud/improve_webdavauth 
improve error handling of webdavauth
 2013-06-21 11:28:00 -07:00
Lukas Reschke
8c21cc64d0 Merge pull request #3811 from owncloud/string_fixes_encryption_settings 
fix some strings in the admin settings of the encryption app
 2013-06-21 09:59:15 -07:00
Björn Schießle
f40f49851c fix some strings in the admin settings, it's not a 'recovery account' but a 'recovery key' 2013-06-21 14:49:01 +02:00
Georg Ehrke
b0e1259295 improve error handling of webdavauth 2013-06-21 14:39:04 +02:00
Björn Schießle
76369b7424 encryption is LDAP compatible 2013-06-21 13:08:31 +02:00
Björn Schießle
d10ad0d603 Squashed commit of the following: 
commit 1345201c9da99a82f198e41fba24da6b0d7ae59a
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 16:27:46 2013 +0200

    add l10n support

commit bf2c79c8de8710e839a4a55642a91874c374fa1c
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 16:19:10 2013 +0200

    only init session if openssl extension is loaded

commit cbd52af6afbaa310bb1a534db64ff5e476dfd5d7
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:25:40 2013 +0200

    first disable app and than show error page

commit 55baf593179c433642de59552592e6b0f1932880
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:17:34 2013 +0200

    typo fixed

commit 1d9bef0b058e7cc3d511b81ae12d5a07660c75b2
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:15:40 2013 +0200

    move dependency check to the encryption app

commit c186e95da526f0470e20f014f1bd9513db5518ff
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 11:13:11 2013 +0200

    make sure that openssl is installed and loaded
 2013-06-21 10:37:51 +02:00
Roland Hager
a06d901e37 Fix: The check if upload_max_filesize or post_max_size is 0 fails if only one of them is 0. 
$upload_max_filesize and $post_max_size need to be casted to (int) to match "=== 0"
 2013-06-21 09:33:06 +02:00
Jenkins for ownCloud
8c923a85de [tx-robot] updated from transifex 2013-06-21 08:53:57 +02:00
Thomas Müller
59d3c5a575 Merge pull request #3796 from owncloud/gracefully_handle_teardown_in_scanner_test 
skip teardown if cache has not been set up
 2013-06-20 04:07:33 -07:00
Thomas Müller
4232ccbc6d Merge pull request #3792 from owncloud/scanfolder-remove 
remove deleted files when re-scanning a folder
 2013-06-20 04:02:10 -07:00
Jörn Friedrich Dreyer
7a7b54c4a2 skip teardown if cache has not been set up 2013-06-20 11:41:07 +02:00
blizzz
c41f11a821 Merge pull request #3779 from shkdee/patch-1 
Update user.php
 2013-06-20 02:37:12 -07:00
Björn Schießle
c4aa3fac7e Merge pull request #3788 from owncloud/more_error_messages 
add some more error messages, in case something went wrong
 2013-06-20 02:12:01 -07:00