]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoMerge pull request #3690 from owncloud/use_execute_audited_in_filecache
Thomas Müller [Thu, 13 Jun 2013 20:55:55 +0000 (13:55 -0700)]
Merge pull request #3690 from owncloud/use_execute_audited_in_filecache

use executeAudited in files cache

11 years agoMerge pull request #3686 from owncloud/minor_exception_cleanup
Thomas Müller [Thu, 13 Jun 2013 20:50:31 +0000 (13:50 -0700)]
Merge pull request #3686 from owncloud/minor_exception_cleanup

minor cleanup for exception handling

11 years agoMerge pull request #3586 from owncloud/contributing
Morris Jobke [Thu, 13 Jun 2013 19:36:11 +0000 (12:36 -0700)]
Merge pull request #3586 from owncloud/contributing

Revise Contributing document

11 years agoFix typo
Morris Jobke [Thu, 13 Jun 2013 19:35:32 +0000 (22:35 +0300)]
Fix typo

11 years agoMerge pull request #3687 from owncloud/template_updates
Björn Schießle [Thu, 13 Jun 2013 14:32:41 +0000 (07:32 -0700)]
Merge pull request #3687 from owncloud/template_updates

Make templates aware of different owncloud editions

11 years agoimproved footer
Björn Schießle [Thu, 13 Jun 2013 14:10:33 +0000 (16:10 +0200)]
improved footer

11 years agoMerge pull request #3558 from owncloud/files_encryption_check_private_key
Björn Schießle [Thu, 13 Jun 2013 11:18:32 +0000 (04:18 -0700)]
Merge pull request #3558 from owncloud/files_encryption_check_private_key

check if the decrypted private key is valid on login and on read/write files

11 years agoMerge branch 'master' into files_encryption_check_private_key
Björn Schießle [Thu, 13 Jun 2013 11:17:35 +0000 (13:17 +0200)]
Merge branch 'master' into files_encryption_check_private_key

Conflicts:
apps/files_encryption/appinfo/app.php
apps/files_encryption/lib/util.php

11 years agoPDOException has no previous(), oh the consistency ...
Jörn Friedrich Dreyer [Thu, 13 Jun 2013 11:14:00 +0000 (13:14 +0200)]
PDOException has no previous(), oh the consistency ...

11 years agoMerge pull request #3552 from owncloud/files_encryption_upgrade_fix
Björn Schießle [Thu, 13 Jun 2013 10:54:19 +0000 (03:54 -0700)]
Merge pull request #3552 from owncloud/files_encryption_upgrade_fix

Fix files_encryption app upgrade from 4.5 to 5.0

11 years agoMerge branch 'master' into files_encryption_upgrade_fix
Björn Schießle [Thu, 13 Jun 2013 10:53:29 +0000 (12:53 +0200)]
Merge branch 'master' into files_encryption_upgrade_fix

11 years agoMerge pull request #3640 from infoneo/master
Thomas Müller [Thu, 13 Jun 2013 10:34:36 +0000 (03:34 -0700)]
Merge pull request #3640 from infoneo/master

Folders with multiple periods problem fix

11 years agoMerge pull request #3668 from owncloud/encryption_migrate_only_once
Björn Schießle [Thu, 13 Jun 2013 10:31:31 +0000 (03:31 -0700)]
Merge pull request #3668 from owncloud/encryption_migrate_only_once

make sure that only one process can enter the migration mode

11 years agoMerge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_en...
Björn Schießle [Thu, 13 Jun 2013 08:49:23 +0000 (10:49 +0200)]
Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_encryption_upgrade_fix

11 years agoMerge pull request #3677 from owncloud/apps-buttons
Jan-Christoph Borchardt [Thu, 13 Jun 2013 08:44:48 +0000 (01:44 -0700)]
Merge pull request #3677 from owncloud/apps-buttons

remove App management top bar and move buttons more contextually in the interface

11 years agoLegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed
Björn Schießle [Thu, 13 Jun 2013 08:44:05 +0000 (10:44 +0200)]
LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed

11 years agoadd comment to explain the helper function
Björn Schießle [Thu, 13 Jun 2013 08:35:30 +0000 (10:35 +0200)]
add comment to explain the helper function

11 years agofix typo in var name
Björn Schießle [Thu, 13 Jun 2013 08:11:23 +0000 (10:11 +0200)]
fix typo in var name

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 13 Jun 2013 00:20:23 +0000 (02:20 +0200)]
[tx-robot] updated from transifex

11 years agoupdate submodule
Florin Peter [Wed, 12 Jun 2013 21:21:24 +0000 (23:21 +0200)]
update submodule

11 years agofix another double wrapped array
Jörn Friedrich Dreyer [Wed, 12 Jun 2013 21:01:52 +0000 (23:01 +0200)]
fix another double wrapped array

11 years agoTL;DR and remove link from "Report issue here"
Morris Jobke [Wed, 12 Jun 2013 19:58:19 +0000 (21:58 +0200)]
TL;DR and remove link from "Report issue here"

11 years agoremove additional array wrapping
Jörn Friedrich Dreyer [Wed, 12 Jun 2013 19:23:34 +0000 (21:23 +0200)]
remove additional array wrapping

11 years agoMerge branch 'master' into files_encryption_upgrade_fix
Björn Schießle [Wed, 12 Jun 2013 18:53:45 +0000 (20:53 +0200)]
Merge branch 'master' into files_encryption_upgrade_fix

Conflicts:
apps/files_encryption/tests/crypt.php

11 years agouse executeAudited in files cache
Jörn Friedrich Dreyer [Fri, 7 Jun 2013 12:11:05 +0000 (14:11 +0200)]
use executeAudited in files cache

11 years agoMerge pull request #3679 from owncloud/multiselect-fixes
Thomas Tanghus [Wed, 12 Jun 2013 16:52:15 +0000 (09:52 -0700)]
Merge pull request #3679 from owncloud/multiselect-fixes

Multiselect fixes

11 years agoRevert "FIX: Download of files named "true" or "false" impossible"
Roland Hager [Wed, 12 Jun 2013 16:30:28 +0000 (18:30 +0200)]
Revert "FIX: Download of files named "true" or "false" impossible"

This reverts commit d2d71c8797f7e7b51e55bec4217738faaf6a08ca.
which was accidentally commited

11 years agoMerge pull request #3676 from owncloud/move-storage-bar
Frank Karlitschek [Wed, 12 Jun 2013 16:02:16 +0000 (09:02 -0700)]
Merge pull request #3676 from owncloud/move-storage-bar

move storage bar below clients showcase to make it more visible

11 years agoMerge branch 'template_updates' of github.com:owncloud/core into template_updates
Björn Schießle [Wed, 12 Jun 2013 15:26:38 +0000 (17:26 +0200)]
Merge branch 'template_updates' of github.com:owncloud/core into template_updates

11 years agoFIX: Download of files named "true" or "false" impossible
Roland Hager [Fri, 7 Jun 2013 11:44:17 +0000 (13:44 +0200)]
FIX: Download of files named "true" or "false" impossible

It was not possible to download a file called "true" or "false" (caseinsensitive) when clicking the link "download" due to the result of json_decode().
Both cases are now implicitly checked.

Hotfix provided by Herbert Pophal

11 years agoadd logo-claim
Björn Schießle [Wed, 12 Jun 2013 15:20:09 +0000 (17:20 +0200)]
add logo-claim

11 years agodon't show translation hints in enterprise edition
Björn Schießle [Wed, 12 Jun 2013 15:07:43 +0000 (17:07 +0200)]
don't show translation hints in enterprise edition

11 years agomove common settings footer fieldset out of conditional
Jan-Christoph Borchardt [Wed, 12 Jun 2013 14:59:23 +0000 (16:59 +0200)]
move common settings footer fieldset out of conditional

11 years agoshort explanation about OC_Defaults
Björn Schießle [Wed, 12 Jun 2013 14:33:09 +0000 (16:33 +0200)]
short explanation about OC_Defaults

11 years agomake pub link share footer aware of different owncloud editions
Björn Schießle [Wed, 12 Jun 2013 14:28:47 +0000 (16:28 +0200)]
make pub link share footer aware of different owncloud editions

11 years agomake main menu aware of the different owncloud editions
Björn Schießle [Wed, 12 Jun 2013 14:20:23 +0000 (16:20 +0200)]
make main menu aware of the different owncloud editions

11 years agoadd default doc url
Björn Schießle [Wed, 12 Jun 2013 14:19:28 +0000 (16:19 +0200)]
add default doc url

11 years agominor cleanup for exception handling
Jörn Friedrich Dreyer [Wed, 12 Jun 2013 13:48:22 +0000 (15:48 +0200)]
minor cleanup for exception handling

11 years agomake footer and urls aware of ownCloud editions
Björn Schießle [Wed, 12 Jun 2013 13:44:11 +0000 (15:44 +0200)]
make footer and urls aware of ownCloud editions

11 years agokeep all strings in one place to make it easier to change them
Björn Schießle [Wed, 12 Jun 2013 13:15:08 +0000 (15:15 +0200)]
keep all strings in one place to make it easier to change them

11 years agomake footer aware of ownCloud editions
Björn Schießle [Wed, 12 Jun 2013 12:49:30 +0000 (14:49 +0200)]
make footer aware of ownCloud editions

11 years agoapps management: change misleading + to ...
Jan-Christoph Borchardt [Wed, 12 Jun 2013 12:49:23 +0000 (14:49 +0200)]
apps management: change misleading + to ...

11 years agomage page title aware of ownCloud edition
Björn Schießle [Wed, 12 Jun 2013 12:33:24 +0000 (14:33 +0200)]
mage page title aware of ownCloud edition

11 years agoadapt test to the code changes
Björn Schießle [Wed, 12 Jun 2013 12:00:53 +0000 (14:00 +0200)]
adapt test to the code changes

11 years agoremove App management top bar and move buttons more contextually in the interface
Jan-Christoph Borchardt [Tue, 11 Jun 2013 15:24:47 +0000 (17:24 +0200)]
remove App management top bar and move buttons more contextually in the interface

11 years agoMerge pull request #3681 from owncloud/fix_ajax_removeuser.php
Morris Jobke [Wed, 12 Jun 2013 11:23:52 +0000 (04:23 -0700)]
Merge pull request #3681 from owncloud/fix_ajax_removeuser.php

Init language object before using it

11 years agoMerge pull request #3654 from owncloud/clean_up_exceptions
Thomas Müller [Wed, 12 Jun 2013 11:13:12 +0000 (04:13 -0700)]
Merge pull request #3654 from owncloud/clean_up_exceptions

Introduce more robust SQL execution and exception handling

11 years agoevery test now has 15min to execute
Jörn Friedrich Dreyer [Wed, 12 Jun 2013 10:58:25 +0000 (13:58 +0300)]
every test now has 15min to execute

we don't want to check performance just yet. we just want to make jenkins end more reliably.

11 years agoMerge pull request #3682 from owncloud/disable_proxys_on_sslcert_upload
Björn Schießle [Wed, 12 Jun 2013 10:55:10 +0000 (03:55 -0700)]
Merge pull request #3682 from owncloud/disable_proxys_on_sslcert_upload

disable proxys during ssl root cert upload to avoid encryption

11 years agouse number of manipulated rows as idicator if it was possible to enter the migration...
Björn Schießle [Wed, 12 Jun 2013 10:21:11 +0000 (12:21 +0200)]
use number of manipulated rows as idicator if it was possible to enter the migration mode

11 years agodisable proxys during ssl root cert upload to avoid encryption
Björn Schießle [Wed, 12 Jun 2013 08:37:09 +0000 (10:37 +0200)]
disable proxys during ssl root cert upload to avoid encryption

11 years agoMerge branch 'master' of github.com:owncloud/core
Björn Schießle [Wed, 12 Jun 2013 08:31:39 +0000 (10:31 +0200)]
Merge branch 'master' of github.com:owncloud/core

11 years agobackport of https://github.com/owncloud/core/commit/1fa76e53dc5c515035f19e78f39882055...
Björn Schießle [Wed, 12 Jun 2013 08:30:54 +0000 (10:30 +0200)]
backport of https://github.com/owncloud/core/commit/1fa76e53dc5c515035f19e78f3988205521720f6

11 years agoinit language object before using it
Georg Ehrke [Wed, 12 Jun 2013 07:40:13 +0000 (09:40 +0200)]
init language object before using it

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 12 Jun 2013 01:05:58 +0000 (03:05 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3672 from owncloud/files-contrast
Jan-Christoph Borchardt [Tue, 11 Jun 2013 18:11:55 +0000 (11:11 -0700)]
Merge pull request #3672 from owncloud/files-contrast

Contrast fixes

11 years agomultiselect: up min-width of group multiselect to 150px
Jan-Christoph Borchardt [Tue, 11 Jun 2013 16:23:29 +0000 (18:23 +0200)]
multiselect: up min-width of group multiselect to 150px

11 years agomultiselect: fixed 'add group' interface a bit
Jan-Christoph Borchardt [Tue, 11 Jun 2013 16:21:13 +0000 (18:21 +0200)]
multiselect: fixed 'add group' interface a bit

11 years agomultiselect: more breathing space for entries
Jan-Christoph Borchardt [Tue, 11 Jun 2013 16:08:47 +0000 (18:08 +0200)]
multiselect: more breathing space for entries

11 years agomultiselect: drop shadow for better focus
Jan-Christoph Borchardt [Tue, 11 Jun 2013 16:04:33 +0000 (18:04 +0200)]
multiselect: drop shadow for better focus

11 years agomultiselect: do not cut off group names
Jan-Christoph Borchardt [Tue, 11 Jun 2013 16:04:11 +0000 (18:04 +0200)]
multiselect: do not cut off group names

11 years agocheckstyle: add space after colon
Jan-Christoph Borchardt [Tue, 11 Jun 2013 16:02:30 +0000 (18:02 +0200)]
checkstyle: add space after colon

11 years agoremove leading spaces
Jan-Christoph Borchardt [Tue, 11 Jun 2013 16:01:50 +0000 (18:01 +0200)]
remove leading spaces

11 years agomove storage bar below clients showcase to make it more visible
Jan-Christoph Borchardt [Tue, 11 Jun 2013 14:05:02 +0000 (16:05 +0200)]
move storage bar below clients showcase to make it more visible

11 years agoMerge pull request #3675 from owncloud/allow_autotest_to_run_10x
Thomas Müller [Tue, 11 Jun 2013 13:59:57 +0000 (06:59 -0700)]
Merge pull request #3675 from owncloud/allow_autotest_to_run_10x

allow autotest to run 10x times longer

11 years agoallow autotest to run 10x times longer
Jörn Friedrich Dreyer [Tue, 11 Jun 2013 13:57:00 +0000 (15:57 +0200)]
allow autotest to run 10x times longer

11 years agoMerge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2
Jörn Friedrich Dreyer [Tue, 11 Jun 2013 13:20:27 +0000 (06:20 -0700)]
Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2

fix fetchRow checks to also work with MDB2

11 years agoMerge branch 'master' into files_encryption_check_private_key
Björn Schießle [Tue, 11 Jun 2013 13:19:02 +0000 (15:19 +0200)]
Merge branch 'master' into files_encryption_check_private_key

Conflicts:
apps/files_encryption/tests/crypt.php

11 years agoMerge pull request #3673 from owncloud/gitignore-apps2
Thomas Müller [Tue, 11 Jun 2013 13:10:25 +0000 (06:10 -0700)]
Merge pull request #3673 from owncloud/gitignore-apps2

gitignore apps2 folder as well

11 years agogitignore apps2 folder as well
Jan-Christoph Borchardt [Tue, 11 Jun 2013 12:57:06 +0000 (14:57 +0200)]
gitignore apps2 folder as well

11 years agofeedback for hover/tap on breadcrumbs
Jan-Christoph Borchardt [Tue, 11 Jun 2013 12:51:29 +0000 (14:51 +0200)]
feedback for hover/tap on breadcrumbs

11 years agobetter contrast and grouping for blocks in personal settings through darker backgroun...
Jan-Christoph Borchardt [Tue, 11 Jun 2013 12:51:06 +0000 (14:51 +0200)]
better contrast and grouping for blocks in personal settings through darker background color

11 years agobetter contrast for controls bar
Jan-Christoph Borchardt [Tue, 11 Jun 2013 12:50:23 +0000 (14:50 +0200)]
better contrast for controls bar

11 years agobetter contrast for files list, darker greys for selection and hover
Jan-Christoph Borchardt [Tue, 11 Jun 2013 12:48:53 +0000 (14:48 +0200)]
better contrast for files list, darker greys for selection and hover

11 years agoMerge pull request #3650 from owncloud/use_to_char_for_oracle_clob_comparisons
Jörn Friedrich Dreyer [Tue, 11 Jun 2013 12:34:55 +0000 (05:34 -0700)]
Merge pull request #3650 from owncloud/use_to_char_for_oracle_clob_comparisons

use to_char to allow comparing string to CLOB cloumns in oracle

11 years agodarker low threshold color for file size and age fading, better contrast
Jan-Christoph Borchardt [Tue, 11 Jun 2013 12:30:13 +0000 (14:30 +0200)]
darker low threshold color for file size and age fading, better contrast

11 years agoMerge pull request #3671 from owncloud/fix_user_creation
icewind1991 [Tue, 11 Jun 2013 12:02:06 +0000 (05:02 -0700)]
Merge pull request #3671 from owncloud/fix_user_creation

createUser() needs to return something; the user object or false

11 years agocreateUser() needs to return something; the user object or false
Björn Schießle [Tue, 11 Jun 2013 11:48:17 +0000 (13:48 +0200)]
createUser() needs to return something; the user object or false

11 years agoMerge pull request #3666 from owncloud/allow_null_in_text_columns
Morris Jobke [Tue, 11 Jun 2013 11:42:22 +0000 (04:42 -0700)]
Merge pull request #3666 from owncloud/allow_null_in_text_columns

db structure, allow null in columns for '' values

11 years agouse constants for different migration status
Björn Schießle [Tue, 11 Jun 2013 11:07:39 +0000 (13:07 +0200)]
use constants for different migration status

11 years agomake sure that only one process can enter the migration mode
Björn Schießle [Tue, 11 Jun 2013 10:03:50 +0000 (12:03 +0200)]
make sure that only one process can enter the migration mode

11 years agodb structure, allow null in columns for '' values
Jörn Friedrich Dreyer [Mon, 3 Jun 2013 16:28:48 +0000 (18:28 +0200)]
db structure, allow null in columns for '' values

11 years agoMerge pull request #3646 from owncloud/introduce_phpunit_timeouts
Thomas Müller [Tue, 11 Jun 2013 08:52:10 +0000 (01:52 -0700)]
Merge pull request #3646 from owncloud/introduce_phpunit_timeouts

add timeouts 3/30/90 to phpunit tests

11 years agoupdate submodule
Björn Schießle [Tue, 11 Jun 2013 08:02:55 +0000 (10:02 +0200)]
update submodule

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 11 Jun 2013 00:02:44 +0000 (02:02 +0200)]
[tx-robot] updated from transifex

11 years agofix fetchRow checks to also work with MDB2
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 09:07:41 +0000 (11:07 +0200)]
fix fetchRow checks to also work with MDB2

11 years agoMerge pull request #3653 from owncloud/shorten_identifiers_in_tests
Thomas Müller [Mon, 10 Jun 2013 15:38:54 +0000 (08:38 -0700)]
Merge pull request #3653 from owncloud/shorten_identifiers_in_tests

shorten table identifiers in tests

11 years agoallow 30 sec for testDeleteFile
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 12:45:39 +0000 (14:45 +0200)]
allow 30 sec for testDeleteFile

11 years agoMerge pull request #3647 from owncloud/missing_backticks
Morris Jobke [Mon, 10 Jun 2013 12:15:07 +0000 (05:15 -0700)]
Merge pull request #3647 from owncloud/missing_backticks

add missing backticks all over the place

11 years agoremove duplicate logging from db.php, now happens in entrypoints
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 12:03:12 +0000 (14:03 +0200)]
remove duplicate logging from db.php, now happens in entrypoints

11 years agoclean up usage of DatabaseSetupException and catch Exceptions in entrypoints
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 11:45:19 +0000 (13:45 +0200)]
clean up usage of DatabaseSetupException and catch Exceptions in entrypoints

11 years agointroduce and use executeAudited in db.php
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 10:56:45 +0000 (12:56 +0200)]
introduce and use executeAudited in db.php

11 years agoMerge branch 'master' into files_encryption_check_private_key
Björn Schießle [Mon, 10 Jun 2013 10:12:07 +0000 (12:12 +0200)]
Merge branch 'master' into files_encryption_check_private_key

Conflicts:
settings/ajax/changepassword.php

11 years agoMerge pull request #3648 from owncloud/sql_limit_as_param
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 09:48:15 +0000 (02:48 -0700)]
Merge pull request #3648 from owncloud/sql_limit_as_param

convert LIMIT to parameter

11 years agoshorten table identifiers in tests
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 09:44:04 +0000 (11:44 +0200)]
shorten table identifiers in tests

11 years agoMerge pull request #3610 from owncloud/encryption_recovery_for_ldap
Björn Schießle [Mon, 10 Jun 2013 09:03:56 +0000 (02:03 -0700)]
Merge pull request #3610 from owncloud/encryption_recovery_for_ldap

recover encryption keys if ownCloud can't change the log-in password

11 years agouse to_char to allow comparing string to CLOB cloumns in oracle
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 08:33:02 +0000 (10:33 +0200)]
use to_char to allow comparing string to CLOB cloumns in oracle

11 years agoraise failed tests from first commit to size @medium
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 08:17:47 +0000 (10:17 +0200)]
raise failed tests from first commit to size @medium

11 years agoconvert LIMIT to parameter
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 08:04:52 +0000 (10:04 +0200)]
convert LIMIT to parameter

11 years agoadd missing backticks all over the place
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 07:53:29 +0000 (09:53 +0200)]
add missing backticks all over the place