]>
source.dussan.org Git - nextcloud-server.git/log
Bart Visscher [Wed, 3 Apr 2013 06:31:47 +0000 (08:31 +0200)]
Change database creation to use array to select db setup class
Bart Visscher [Tue, 2 Apr 2013 20:01:23 +0000 (22:01 +0200)]
Convert database setup code to objects
Bart Visscher [Fri, 29 Mar 2013 15:28:48 +0000 (16:28 +0100)]
Split database specific install/setup code to their own class
Bart Visscher [Sat, 29 Jun 2013 11:38:18 +0000 (04:38 -0700)]
Merge pull request #3896 from owncloud/fix-dropdown-because-no-one-fixes-3241
Escape dropdown
Lukas Reschke [Sat, 29 Jun 2013 11:24:05 +0000 (13:24 +0200)]
Escape dropdown
Fixes #3241
Bart Visscher [Sat, 29 Jun 2013 11:09:50 +0000 (04:09 -0700)]
Merge pull request #2914 from Kondou-ger/label_overlapping_value
Fix textfield label overlapping value.
Bart Visscher [Sat, 29 Jun 2013 11:07:34 +0000 (04:07 -0700)]
Merge pull request #3688 from roha4000/fix_upload_max_filesize
upload_max_filesize = 0 not possible if post_max_size is not 0
Bart Visscher [Sat, 29 Jun 2013 11:00:03 +0000 (04:00 -0700)]
Merge pull request #3635 from owncloud/storage-wrapper
Give apps the option to wrap storage backends
Bart Visscher [Sat, 29 Jun 2013 10:38:56 +0000 (03:38 -0700)]
Merge pull request #3268 from owncloud/convert-oc_log
Convert OC_Log to object so it can be used for DI
Jenkins for ownCloud [Sat, 29 Jun 2013 00:09:10 +0000 (02:09 +0200)]
[tx-robot] updated from transifex
Thomas Müller [Fri, 28 Jun 2013 20:59:33 +0000 (13:59 -0700)]
Merge pull request #3886 from owncloud/disable-public-upload-if-encryption-enabled-master
for now we disable public upload in case encryption is enabled
Morris Jobke [Fri, 28 Jun 2013 20:41:18 +0000 (13:41 -0700)]
Merge pull request #3881 from owncloud/archive_tar_php5.5
Skip Test_Archive_TAR in php 5.5 for now
Morris Jobke [Fri, 28 Jun 2013 20:38:44 +0000 (13:38 -0700)]
Merge pull request #3884 from owncloud/fixing-unittests-master
Fixing unittests master
icewind1991 [Fri, 28 Jun 2013 19:24:33 +0000 (12:24 -0700)]
Merge pull request #3892 from owncloud/static-streamwrapper
Improvements for the static:// streamwrapper
Bart Visscher [Fri, 28 Jun 2013 19:00:35 +0000 (12:00 -0700)]
Merge pull request #1044 from owncloud/fix_extra_slash
Remove duplicate / for first folder in root
Bart Visscher [Fri, 28 Jun 2013 19:00:09 +0000 (21:00 +0200)]
update to !==
Robin Appelman [Fri, 28 Jun 2013 17:59:04 +0000 (19:59 +0200)]
better unit tests for static stream wrapper
Robin Appelman [Fri, 28 Jun 2013 17:54:16 +0000 (19:54 +0200)]
fix is_file and is_dir for the static streamwrapper
Robin Appelman [Fri, 28 Jun 2013 17:41:28 +0000 (19:41 +0200)]
add option to clear the files in the static streamwrapper
Jörn Friedrich Dreyer [Fri, 28 Jun 2013 17:22:59 +0000 (10:22 -0700)]
Merge pull request #3832 from owncloud/oracle_sql_fixes
for oracle use BITAND() instead of & in sharing permissions sql
Robin Appelman [Fri, 28 Jun 2013 16:18:12 +0000 (18:18 +0200)]
fix storage wrapper namespaces
Thomas Mueller [Fri, 28 Jun 2013 14:49:25 +0000 (16:49 +0200)]
for now we disable public upload in case encryption is enabled
Jörn Friedrich Dreyer [Fri, 28 Jun 2013 14:30:41 +0000 (07:30 -0700)]
Merge pull request #3838 from rgeber/master
Public Upload Feature
Bart Visscher [Fri, 28 Jun 2013 14:15:38 +0000 (07:15 -0700)]
Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
Fix pdo statement wrapper numrows on modification
Thomas Müller [Fri, 28 Jun 2013 14:05:09 +0000 (07:05 -0700)]
Merge pull request #3843 from owncloud/sabre-exceptions
Sabre: throw exceptions when delete/create/write operations are not permitted
Bart Visscher [Wed, 26 Jun 2013 19:40:31 +0000 (21:40 +0200)]
Oracle doesn't know & as bitwise AND
Conflicts:
lib/public/share.php
Robin Appelman [Fri, 28 Jun 2013 13:34:25 +0000 (15:34 +0200)]
move storage wrappers to their own namespace
Bart Visscher [Fri, 28 Jun 2013 13:18:56 +0000 (06:18 -0700)]
Merge pull request #3865 from owncloud/fix_test_for_oracle
Fix sharing test for oracle
Thomas Mueller [Fri, 28 Jun 2013 13:13:57 +0000 (15:13 +0200)]
make phpunit happy - adding asserts
Bart Visscher [Fri, 28 Jun 2013 13:11:28 +0000 (06:11 -0700)]
Merge pull request #3839 from owncloud/unix_timestamp_replacement_for_oracle
manually calculate unix_timestamp for oracle
Thomas Mueller [Fri, 28 Jun 2013 12:37:52 +0000 (14:37 +0200)]
make PHPUnit happy and add asserts
Thomas Mueller [Fri, 28 Jun 2013 11:24:24 +0000 (13:24 +0200)]
TimedJob: make PhpUnit happy with asserts
Bart Visscher [Mon, 24 Jun 2013 20:38:05 +0000 (22:38 +0200)]
Skip Test_Archive_TAR in php 5.5 for now
Bart Visscher [Fri, 28 Jun 2013 09:15:08 +0000 (11:15 +0200)]
Fix usage of non existent consts
Jenkins for ownCloud [Fri, 28 Jun 2013 00:04:58 +0000 (02:04 +0200)]
[tx-robot] updated from transifex
Thomas Mueller [Thu, 27 Jun 2013 21:14:32 +0000 (23:14 +0200)]
missing $
Jörn Friedrich Dreyer [Thu, 27 Jun 2013 20:07:42 +0000 (13:07 -0700)]
Merge pull request #3872 from bantu/phpunit-xml-dist
Use phpunit.xml.dist instead of phpunit.xml ...
Bart Visscher [Thu, 27 Jun 2013 20:01:52 +0000 (22:01 +0200)]
Fix review points
Bart Visscher [Thu, 27 Jun 2013 18:10:45 +0000 (20:10 +0200)]
Make the object drive the logging backend
This is the other way around then it was.
Thomas Tanghus [Thu, 27 Jun 2013 14:50:47 +0000 (07:50 -0700)]
Merge pull request #3576 from owncloud/jquery.multiselect-1.13
Update to jquery.multiselect 1.13
Andreas Fischer [Thu, 27 Jun 2013 14:50:17 +0000 (16:50 +0200)]
gitignore: Fix typo + adjust comment format.
Andreas Fischer [Thu, 27 Jun 2013 14:44:55 +0000 (16:44 +0200)]
PHPUnit: Add tests/phpunit.xml to gitignore.
Andreas Fischer [Thu, 27 Jun 2013 14:31:31 +0000 (16:31 +0200)]
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)
Jörn Friedrich Dreyer [Thu, 27 Jun 2013 11:13:49 +0000 (13:13 +0200)]
one if less
Thomas Müller [Thu, 27 Jun 2013 08:55:57 +0000 (01:55 -0700)]
Merge pull request #3847 from bantu/phpunit-json-listener-removal
phpunit: Remove PHPUnit_Util_Log_JSON which spammed to stdout on console
Jenkins for ownCloud [Thu, 27 Jun 2013 00:12:00 +0000 (02:12 +0200)]
[tx-robot] updated from transifex
Roman Geber [Wed, 26 Jun 2013 20:51:38 +0000 (22:51 +0200)]
Added file-upload to GIT repo
Optimized CSS identifiers
Jörn Friedrich Dreyer [Wed, 26 Jun 2013 18:03:24 +0000 (20:03 +0200)]
fix type of numeric columns
Jörn Friedrich Dreyer [Wed, 26 Jun 2013 17:57:28 +0000 (19:57 +0200)]
check item id is set
VicDeo [Wed, 26 Jun 2013 11:42:32 +0000 (04:42 -0700)]
Merge pull request #3855 from owncloud/fixing-3853-master
move javascript variables 'oc_current_user' and 'oc_requesttoken' to js....
Thomas Mueller [Wed, 26 Jun 2013 09:23:21 +0000 (11:23 +0200)]
move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - fixes #3853
Jenkins for ownCloud [Wed, 26 Jun 2013 00:07:04 +0000 (02:07 +0200)]
[tx-robot] updated from transifex
Andreas Fischer [Tue, 25 Jun 2013 19:57:00 +0000 (21:57 +0200)]
phpunit: Remove PHPUnit_Util_Log_JSON which spammed to stdout on console.
Robin Appelman [Tue, 25 Jun 2013 15:04:25 +0000 (17:04 +0200)]
Sabre: throw exceptions when delete/create/write operations are not permitted
Jörn Friedrich Dreyer [Tue, 25 Jun 2013 14:45:42 +0000 (17:45 +0300)]
log as index, not remote
Thomas Müller [Tue, 25 Jun 2013 10:34:49 +0000 (03:34 -0700)]
Merge pull request #3750 from owncloud/dummy_session_for_errors
Init dummy session to render error pages
Roman Geber [Tue, 25 Jun 2013 10:24:14 +0000 (12:24 +0200)]
Public upload feature
Jörn Friedrich Dreyer [Tue, 25 Jun 2013 07:52:04 +0000 (09:52 +0200)]
manuall calculate unix_timestamp for oracle
Jenkins for ownCloud [Tue, 25 Jun 2013 00:13:40 +0000 (02:13 +0200)]
[tx-robot] updated from transifex
Jörn Friedrich Dreyer [Mon, 24 Jun 2013 20:52:01 +0000 (22:52 +0200)]
for oracle use BITAND() instead of & in sharing permissions sql
Thomas Müller [Mon, 24 Jun 2013 14:37:21 +0000 (07:37 -0700)]
Merge pull request #3826 from owncloud/fix_webdav_locking_for_oracle
use to_char when comparing clob to string on oracle, use execute audited
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 13:38:02 +0000 (15:38 +0200)]
use assertEquals number of rows in db tests
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 12:49:10 +0000 (14:49 +0200)]
fix numRows usage in files_encryption
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 12:47:42 +0000 (14:47 +0200)]
fix numRows usage in core lib
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 12:47:12 +0000 (14:47 +0200)]
fix numRows usage in user_ldap
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 12:46:22 +0000 (14:46 +0200)]
make PDOStatementWrapper return number of updated rows on INSERT, UPDATE or DELETE queries, introduces isManipulation() to guess type of query
Jörn Friedrich Dreyer [Mon, 24 Jun 2013 14:12:21 +0000 (16:12 +0200)]
use to_char when comparing clob to string on oracle, use execute audited
Thomas Müller [Mon, 24 Jun 2013 12:49:01 +0000 (05:49 -0700)]
Merge pull request #3818 from owncloud/update-trigger-cli
Add a CLI script for manually triggering checking a folder for updates
Thomas Müller [Mon, 24 Jun 2013 12:46:30 +0000 (05:46 -0700)]
Merge pull request #3822 from owncloud/graceful_teardown_of_cache
graceful teardown of cache
Jörn Friedrich Dreyer [Mon, 24 Jun 2013 10:59:56 +0000 (12:59 +0200)]
graceful teardown of cache
Jenkins for ownCloud [Mon, 24 Jun 2013 00:11:03 +0000 (02:11 +0200)]
[tx-robot] updated from transifex
Robin Appelman [Sun, 23 Jun 2013 15:49:38 +0000 (17:49 +0200)]
Add a CLI script for manually triggering checking a folder for updates
Jenkins for ownCloud [Sun, 23 Jun 2013 00:05:39 +0000 (02:05 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 22 Jun 2013 00:11:35 +0000 (02:11 +0200)]
[tx-robot] updated from transifex
Thomas Müller [Fri, 21 Jun 2013 19:45:09 +0000 (12:45 -0700)]
Merge pull request #3766 from owncloud/fix_display_name_edit
Correct new user display name output
Thomas Müller [Fri, 21 Jun 2013 18:28:00 +0000 (11:28 -0700)]
Merge pull request #3810 from owncloud/improve_webdavauth
improve error handling of webdavauth
Lukas Reschke [Fri, 21 Jun 2013 16:59:15 +0000 (09:59 -0700)]
Merge pull request #3811 from owncloud/string_fixes_encryption_settings
fix some strings in the admin settings of the encryption app
Björn Schießle [Fri, 21 Jun 2013 12:47:31 +0000 (14:47 +0200)]
fix some strings in the admin settings, it's not a 'recovery account' but a 'recovery key'
Georg Ehrke [Fri, 21 Jun 2013 12:39:04 +0000 (14:39 +0200)]
improve error handling of webdavauth
Björn Schießle [Fri, 21 Jun 2013 11:07:52 +0000 (13:07 +0200)]
encryption is LDAP compatible
Björn Schießle [Fri, 21 Jun 2013 08:37:51 +0000 (10:37 +0200)]
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
Roland Hager [Thu, 13 Jun 2013 07:18:50 +0000 (09:18 +0200)]
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"
Jenkins for ownCloud [Fri, 21 Jun 2013 06:53:57 +0000 (08:53 +0200)]
[tx-robot] updated from transifex
Thomas Müller [Thu, 20 Jun 2013 11:07:33 +0000 (04:07 -0700)]
Merge pull request #3796 from owncloud/gracefully_handle_teardown_in_scanner_test
skip teardown if cache has not been set up
Thomas Müller [Thu, 20 Jun 2013 11:02:10 +0000 (04:02 -0700)]
Merge pull request #3792 from owncloud/scanfolder-remove
remove deleted files when re-scanning a folder
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 09:41:07 +0000 (11:41 +0200)]
skip teardown if cache has not been set up
blizzz [Thu, 20 Jun 2013 09:37:12 +0000 (02:37 -0700)]
Merge pull request #3779 from shkdee/patch-1
Update user.php
Björn Schießle [Thu, 20 Jun 2013 09:12:01 +0000 (02:12 -0700)]
Merge pull request #3788 from owncloud/more_error_messages
add some more error messages, in case something went wrong
Thomas Mueller [Thu, 20 Jun 2013 08:47:37 +0000 (10:47 +0200)]
adding unit test for folder remove: testRemovedFolder()
Thomas Müller [Thu, 20 Jun 2013 08:41:49 +0000 (01:41 -0700)]
Merge pull request #3784 from owncloud/rescan-all
Give admins the ability to rescan the filesystem for multiple users at once
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 08:18:29 +0000 (10:18 +0200)]
add missing backticks
guys, please ...
Thomas Mueller [Thu, 20 Jun 2013 06:17:31 +0000 (08:17 +0200)]
Merge branch 'rescan-all' into scanfolder-remove
Jenkins for ownCloud [Thu, 20 Jun 2013 00:43:39 +0000 (02:43 +0200)]
[tx-robot] updated from transifex
Robin Appelman [Wed, 19 Jun 2013 22:42:34 +0000 (00:42 +0200)]
remove deleted files when re-scanning a folder
Björn Schießle [Wed, 19 Jun 2013 14:55:31 +0000 (16:55 +0200)]
always have a defined return value
Michael Gapczynski [Wed, 19 Jun 2013 14:06:04 +0000 (07:06 -0700)]
Merge pull request #3783 from owncloud/improved_wording
fixed enghlish sentence
Björn Schießle [Wed, 19 Jun 2013 13:58:34 +0000 (15:58 +0200)]
some more error messages
Björn Schießle [Wed, 19 Jun 2013 13:52:33 +0000 (15:52 +0200)]
add some more error messages, in case something went wrong
Robin Appelman [Wed, 19 Jun 2013 13:02:18 +0000 (15:02 +0200)]
use json to encode user list
icewind1991 [Wed, 19 Jun 2013 11:30:55 +0000 (04:30 -0700)]
Merge pull request #3764 from owncloud/scanfolder-existing
Improve re-using existing data in the filescanner