]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoSave the plural information given in po files
Jakob Sack [Thu, 1 Aug 2013 17:13:52 +0000 (19:13 +0200)]
Save the plural information given in po files

11 years agoFix an error jenkins found
Jakob Sack [Tue, 16 Jul 2013 20:27:55 +0000 (22:27 +0200)]
Fix an error jenkins found

11 years agoFix two bugs in l10n.pl
Jakob Sack [Tue, 16 Jul 2013 20:25:19 +0000 (22:25 +0200)]
Fix two bugs in l10n.pl

11 years agoAdd multiple plural forms to the php part
Jakob Sack [Tue, 16 Jul 2013 20:16:53 +0000 (22:16 +0200)]
Add multiple plural forms to the php part

11 years agoAllow several plural forms in l10n php files
Jakob Sack [Tue, 16 Jul 2013 19:38:31 +0000 (21:38 +0200)]
Allow several plural forms in l10n php files

11 years agoPartly integrate plural translations into js
Jakob Sack [Sun, 7 Jul 2013 18:26:09 +0000 (20:26 +0200)]
Partly integrate plural translations into js

11 years agomake l10n libs capable of handling plural translations
Jakob Sack [Sun, 7 Jul 2013 18:06:14 +0000 (20:06 +0200)]
make l10n libs capable of handling plural translations

11 years agoAdd possibility to read/write plural translations
Jakob Sack [Sun, 7 Jul 2013 17:51:24 +0000 (19:51 +0200)]
Add possibility to read/write plural translations

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 7 Jul 2013 00:06:06 +0000 (02:06 +0200)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 6 Jul 2013 00:08:38 +0000 (02:08 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3951 from owncloud/fixing-3936-master
Thomas Müller [Fri, 5 Jul 2013 21:43:47 +0000 (14:43 -0700)]
Merge pull request #3951 from owncloud/fixing-3936-master

get the real physical folder name for anonymous upload

11 years agoMerge pull request #3955 from owncloud/cache-scanner-test
Thomas Müller [Fri, 5 Jul 2013 17:11:58 +0000 (10:11 -0700)]
Merge pull request #3955 from owncloud/cache-scanner-test

Scanner test: ensure mtime in the cache is the same as on the storage to...

11 years agoMerge pull request #3958 from owncloud/fixing-3933-master
Thomas Müller [Fri, 5 Jul 2013 15:45:12 +0000 (08:45 -0700)]
Merge pull request #3958 from owncloud/fixing-3933-master

adding tipsy to the upload button showing the max upload and restoring c...

11 years agoMerge pull request #3948 from owncloud/fixing-3934-master
Bart Visscher [Fri, 5 Jul 2013 15:21:45 +0000 (08:21 -0700)]
Merge pull request #3948 from owncloud/fixing-3934-master

no anonymous upload on files only folders

11 years agoMerge pull request #3957 from owncloud/config-glob-fail
Thomas Müller [Fri, 5 Jul 2013 14:38:04 +0000 (07:38 -0700)]
Merge pull request #3957 from owncloud/config-glob-fail

OC_Config: handle failure of glob('*.config.php')

11 years agoremove wrong closing bracket
Björn Schießle [Fri, 5 Jul 2013 14:05:05 +0000 (16:05 +0200)]
remove wrong closing bracket

11 years agoadded helper function to escape glob pattern
Björn Schießle [Fri, 5 Jul 2013 12:58:33 +0000 (14:58 +0200)]
added helper function to escape glob pattern

Conflicts:

apps/files_encryption/lib/helper.php

11 years agofix getUidAndFilename() test
Björn Schießle [Tue, 25 Jun 2013 16:03:05 +0000 (18:03 +0200)]
fix getUidAndFilename() test

11 years agoonly check for external mount points if the external storage app is enabled
Björn Schießle [Tue, 25 Jun 2013 15:46:04 +0000 (17:46 +0200)]
only check for external mount points if the external storage app is enabled

11 years agomake trash bin aware of system wide mounts with respect to encryption keys
Björn Schießle [Tue, 25 Jun 2013 15:17:41 +0000 (17:17 +0200)]
make trash bin aware of system wide mounts with respect to encryption keys

11 years agoonly escape glob pattern
Björn Schießle [Tue, 25 Jun 2013 14:50:10 +0000 (16:50 +0200)]
only escape glob pattern

11 years agodel share keys from correct location
Björn Schießle [Tue, 25 Jun 2013 14:41:51 +0000 (16:41 +0200)]
del share keys from correct location

11 years agoalways return normalized path
Björn Schießle [Tue, 25 Jun 2013 14:41:24 +0000 (16:41 +0200)]
always return normalized path

11 years agodelete file keys from the correct location
Björn Schießle [Tue, 25 Jun 2013 14:03:03 +0000 (16:03 +0200)]
delete file keys from the correct location

11 years agohandle rename correctly for system wide mounts
Björn Schießle [Tue, 25 Jun 2013 12:42:49 +0000 (14:42 +0200)]
handle rename correctly for system wide mounts

11 years agomove isSystemWideMountPoint() to util.php
Björn Schießle [Tue, 25 Jun 2013 12:25:00 +0000 (14:25 +0200)]
move isSystemWideMountPoint() to util.php

11 years agosome performance improvements, check for system wide mounts only once while writing...
Björn Schießle [Tue, 25 Jun 2013 12:15:53 +0000 (14:15 +0200)]
some performance improvements, check for system wide mounts only once while writing share keys

11 years agofix path to OC_Mount_Config
Björn Schießle [Tue, 25 Jun 2013 11:36:43 +0000 (13:36 +0200)]
fix path to OC_Mount_Config

11 years agohandle system wide mount points
Björn Schießle [Tue, 25 Jun 2013 10:21:54 +0000 (12:21 +0200)]
handle system wide mount points

11 years agofixing === and ident
Thomas Müller [Fri, 5 Jul 2013 13:27:14 +0000 (15:27 +0200)]
fixing === and ident

11 years agoOC_Config: handle failure of glob('*.config.php')
Robin Appelman [Fri, 5 Jul 2013 13:07:15 +0000 (15:07 +0200)]
OC_Config: handle failure of glob('*.config.php')

11 years agoadding tipsy to the upload button showing the max upload and restoring client side...
Thomas Müller [Fri, 5 Jul 2013 13:07:05 +0000 (15:07 +0200)]
adding tipsy to the upload button showing the max upload and restoring client side upload size validation

11 years agoScanner test: ensure mtime in the cache is the same as on the storage to prevent...
Robin Appelman [Fri, 5 Jul 2013 12:51:22 +0000 (14:51 +0200)]
Scanner test: ensure mtime in the cache is the same as on the storage to prevent random failures

11 years agoMerge branch 'master' into fixing-3934-master
Thomas Müller [Fri, 5 Jul 2013 11:52:33 +0000 (13:52 +0200)]
Merge branch 'master' into fixing-3934-master

Conflicts:
core/js/share.js

11 years agoproper fix for getting the shared item if no user is logged in
Thomas Müller [Fri, 5 Jul 2013 11:45:21 +0000 (13:45 +0200)]
proper fix for getting the shared item if no user is logged in

11 years agophp 5.3 compliant now
Thomas Müller [Fri, 5 Jul 2013 11:22:38 +0000 (13:22 +0200)]
php 5.3 compliant now

11 years agoget the real physical folder name for anonymous upload
Thomas Müller [Fri, 5 Jul 2013 10:15:47 +0000 (12:15 +0200)]
get the real physical folder name for anonymous upload

11 years agoMerge pull request #3950 from owncloud/fixing-3941-master
Jörn Friedrich Dreyer [Fri, 5 Jul 2013 10:01:56 +0000 (03:01 -0700)]
Merge pull request #3950 from owncloud/fixing-3941-master

no anonymous upload on read-only folders

11 years agono anonymous upload on read-only folders
Thomas Müller [Fri, 5 Jul 2013 09:23:08 +0000 (11:23 +0200)]
no anonymous upload on read-only folders

11 years agono anonymous upload on files only folders
Thomas Müller [Fri, 5 Jul 2013 08:53:59 +0000 (10:53 +0200)]
no anonymous upload on files only folders

11 years agoMerge https://github.com/owncloud/core/pull/3900
Björn Schießle [Fri, 5 Jul 2013 08:07:23 +0000 (10:07 +0200)]
Merge https://github.com/owncloud/core/pull/3900

Squashed commit of the following:

commit a34098427720c2d0470367cd9698c184d85b8dfd
Merge: ccf849b 955646c
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Fri Jul 5 09:59:29 2013 +0200

    Merge branch 'master' into theme_aware_mail_footer

commit ccf849bc6f18d80cdb593e851529b87579fe072b
Merge: 8d5fb70 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:03:47 2013 +0200

    Merge branch 'master' into theme_aware_mail_footer

commit 8d5fb70e6dcb2e2e34dcdf2a883680ef034afeea
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 10:38:39 2013 +0200

    switch to non-static defaults.php

commit 88ab2768dcc4ced12c48872c887baa94ad938d62
Merge: e199df8 84c25f9
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 3 16:59:48 2013 +0200

    Merge branch 'theme_aware_mail_footer' of github.com:owncloud/core into theme_aware_mail_footer

    Conflicts:
     core/templates/altmail.php

commit e199df844b5faf80a36d8380a5b0b58025cd425f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 3 16:56:29 2013 +0200

    name and slogan should be in one line

commit 84c25f9853e1bfbe4ae780371b1353aafb6b15c2
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Mon Jul 1 21:15:35 2013 +0200

    no ?> at the end of a file

commit 3bd8d38d011f62ce78bcd0c108eb8cf2ce97eb99
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 12:58:36 2013 +0200

    print url unescaped

commit d304ed18c8b7350e92e24565b9b9ba77b519d74c
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 12:56:05 2013 +0200

    make new mail templates aware of different ownCloud themes

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 5 Jul 2013 00:21:23 +0000 (02:21 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3927 from owncloud/Fix_new_user_empty_group
Raghu Nayyar [Thu, 4 Jul 2013 18:50:19 +0000 (11:50 -0700)]
Merge pull request #3927 from owncloud/Fix_new_user_empty_group

Do not add groups if user has no groups

11 years agoMerge pull request #3932 from owncloud/fix_label_position
Morris Jobke [Thu, 4 Jul 2013 18:03:42 +0000 (11:03 -0700)]
Merge pull request #3932 from owncloud/fix_label_position

fix position of 'user shared the folder foldername with you' label

11 years agoMerge pull request #3899 from owncloud/encryption_check_php_version
VicDeo [Thu, 4 Jul 2013 13:53:17 +0000 (06:53 -0700)]
Merge pull request #3899 from owncloud/encryption_check_php_version

check php version, the encryption app needs php >= 5.3.3

11 years agomore verbose error message
Björn Schießle [Thu, 4 Jul 2013 12:50:07 +0000 (14:50 +0200)]
more verbose error message

11 years agoMerge pull request #3914 from owncloud/wrong-pw_for_share-with-pw
Kondou [Thu, 4 Jul 2013 10:12:51 +0000 (03:12 -0700)]
Merge pull request #3914 from owncloud/wrong-pw_for_share-with-pw

Add a "Wrong password." message, if the password for the public share was wrong.

11 years agorevert changes which where introduced by accident during merge https://github.com...
Björn Schießle [Thu, 4 Jul 2013 10:06:36 +0000 (12:06 +0200)]
revert changes which where introduced by accident during merge https://github.com/owncloud/core/commit/23cc69b816f5df465c7c9d0df5630d00abfaf6d0

11 years agofix position of 'user shared the folder foldername with you' label
Georg Ehrke [Thu, 4 Jul 2013 08:32:26 +0000 (10:32 +0200)]
fix position of 'user shared the folder foldername with you' label

11 years agoeddition string should be empty by default
Björn Schießle [Wed, 3 Jul 2013 15:10:17 +0000 (17:10 +0200)]
eddition string should be empty by default

11 years agoadd public api
Björn Schießle [Wed, 3 Jul 2013 13:18:19 +0000 (15:18 +0200)]
add public api

11 years agomove to non-static OC_Defaults
Björn Schießle [Wed, 3 Jul 2013 12:21:51 +0000 (14:21 +0200)]
move to non-static OC_Defaults

Conflicts:

lib/mail.php

11 years agoAdd init funtion to OC_Defaults to be able to wrap translatable strings
Björn Schießle [Wed, 3 Jul 2013 10:38:20 +0000 (12:38 +0200)]
Add init funtion to OC_Defaults to be able to wrap translatable strings

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 4 Jul 2013 07:33:58 +0000 (09:33 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3888 from owncloud/ocs_api_fixes
Bart Visscher [Wed, 3 Jul 2013 19:33:04 +0000 (12:33 -0700)]
Merge pull request #3888 from owncloud/ocs_api_fixes

Ocs api fixes

11 years agoDo not add groups if user has no groups
Victor Dubiniuk [Wed, 3 Jul 2013 19:06:09 +0000 (22:06 +0300)]
Do not add groups if user has no groups

11 years agoUse better wording.
kondou [Wed, 3 Jul 2013 18:13:10 +0000 (20:13 +0200)]
Use better wording.

11 years agoSuppress warning in setup if config doesn't exist
kondou [Wed, 3 Jul 2013 14:00:23 +0000 (16:00 +0200)]
Suppress warning in setup if config doesn't exist

11 years agoMerge pull request #3911 from owncloud/fixing-unittests-master
Michael Gapczynski [Wed, 3 Jul 2013 13:19:56 +0000 (06:19 -0700)]
Merge pull request #3911 from owncloud/fixing-unittests-master

rename can cause mtime change - invalid assert

11 years agoMerge pull request #3915 from owncloud/summary_as_last_filelist_entry
Morris Jobke [Wed, 3 Jul 2013 11:17:17 +0000 (04:17 -0700)]
Merge pull request #3915 from owncloud/summary_as_last_filelist_entry

Show a summary as the last filelist entry

11 years agodon't run hooks for .part files
Björn Schießle [Mon, 1 Jul 2013 15:00:17 +0000 (17:00 +0200)]
don't run hooks for .part files

11 years agoif a part file gets renamed to a real file, that this was the second step of a write...
Björn Schießle [Mon, 1 Jul 2013 14:21:31 +0000 (16:21 +0200)]
if a part file gets renamed to a real file, that this was the second step of a write operation, hence emit a write signal

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 3 Jul 2013 00:04:16 +0000 (02:04 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3858 from owncloud/more_ssl_error_messages
Björn Schießle [Tue, 2 Jul 2013 14:58:22 +0000 (07:58 -0700)]
Merge pull request #3858 from owncloud/more_ssl_error_messages

add openssl_error_string() output to the owncloud.log

11 years agoMerge pull request #3870 from owncloud/reset_migration_status
Björn Schießle [Tue, 2 Jul 2013 14:26:48 +0000 (07:26 -0700)]
Merge pull request #3870 from owncloud/reset_migration_status

introduce pre-disable-app hook and first usage in files_encryption

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 2 Jul 2013 13:35:55 +0000 (15:35 +0200)]
[tx-robot] updated from transifex

11 years agoMerge branch 'master' into encryption_check_php_version
Björn Schießle [Tue, 2 Jul 2013 11:54:31 +0000 (13:54 +0200)]
Merge branch 'master' into encryption_check_php_version

Conflicts:
apps/files_encryption/files/error.php

11 years agoMerge branch 'encryption_check_php_version' of github.com:owncloud/core into encrypti...
Björn Schießle [Tue, 2 Jul 2013 11:49:49 +0000 (13:49 +0200)]
Merge branch 'encryption_check_php_version' of github.com:owncloud/core into encryption_check_php_version

11 years agoDon't escape filesize (can contain a '<')
kondou [Tue, 2 Jul 2013 11:09:07 +0000 (13:09 +0200)]
Don't escape filesize (can contain a '<')

11 years agoimproved error message
Björn Schießle [Tue, 2 Jul 2013 08:14:33 +0000 (10:14 +0200)]
improved error message

11 years agoimproved error message
Björn Schießle [Tue, 2 Jul 2013 08:11:17 +0000 (10:11 +0200)]
improved error message

11 years agoShow a summary as the last filelist entry
kondou [Tue, 2 Jul 2013 02:28:52 +0000 (04:28 +0200)]
Show a summary as the last filelist entry

Fix #993

11 years agoAdd a "Wrong password." message, if the password
kondou [Tue, 2 Jul 2013 01:16:42 +0000 (03:16 +0200)]
Add a "Wrong password." message, if the password

for the public share was wrong.

Fix #2725

11 years agoMerge pull request #3748 from owncloud/fixing-3740-master
Thomas Müller [Mon, 1 Jul 2013 22:08:08 +0000 (15:08 -0700)]
Merge pull request #3748 from owncloud/fixing-3740-master

in case $_SERVER['HTTP_HOST']) is not set let's return localhost - bette...

11 years agouse $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not set
Thomas Müller [Mon, 1 Jul 2013 21:51:43 +0000 (23:51 +0200)]
use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not set

11 years agoMerge pull request #3775 from owncloud/test_fixes_for_dbschema
Thomas Müller [Mon, 1 Jul 2013 21:38:28 +0000 (14:38 -0700)]
Merge pull request #3775 from owncloud/test_fixes_for_dbschema

use executeAudited, add table name to assert message, skip schema changi...

11 years agoMerge pull request #3793 from owncloud/remove_unnecessary_exception_catch_block
Thomas Müller [Mon, 1 Jul 2013 21:37:09 +0000 (14:37 -0700)]
Merge pull request #3793 from owncloud/remove_unnecessary_exception_catch_block

remove unnecessary try catch blocks

11 years agorename can cause mtime change - invalid assert
Thomas Müller [Mon, 1 Jul 2013 20:02:21 +0000 (22:02 +0200)]
rename can cause mtime change - invalid assert

11 years agoMerge pull request #3903 from owncloud/nonpublic-uploading
Thomas Müller [Mon, 1 Jul 2013 19:35:32 +0000 (12:35 -0700)]
Merge pull request #3903 from owncloud/nonpublic-uploading

Fix upload regressions

11 years agono ?> at the end of a file
Thomas Müller [Mon, 1 Jul 2013 19:13:04 +0000 (21:13 +0200)]
no ?> at the end of a file
missing .

11 years agotypo
Thomas Müller [Mon, 1 Jul 2013 19:12:21 +0000 (21:12 +0200)]
typo

11 years agoMerge pull request #3894 from owncloud/ie8_compatibility_fixes
Thomas Müller [Mon, 1 Jul 2013 18:57:29 +0000 (11:57 -0700)]
Merge pull request #3894 from owncloud/ie8_compatibility_fixes

Ie8 compatibility fixes

11 years agocast result to bool
Björn Schießle [Mon, 1 Jul 2013 15:18:16 +0000 (17:18 +0200)]
cast result to bool

11 years agofix detection of public upload in filelist.js
Robin Appelman [Mon, 1 Jul 2013 13:47:17 +0000 (15:47 +0200)]
fix detection of public upload in filelist.js

11 years agofix uploading when ['dirtoken'] is not set
Robin Appelman [Mon, 1 Jul 2013 13:39:11 +0000 (15:39 +0200)]
fix uploading when ['dirtoken'] is not set

11 years agocode style
Robin Appelman [Mon, 1 Jul 2013 13:37:52 +0000 (15:37 +0200)]
code style

11 years agofix error string
Björn Schießle [Mon, 1 Jul 2013 10:24:21 +0000 (12:24 +0200)]
fix error string

11 years agoadd correct php version
Björn Schießle [Mon, 1 Jul 2013 10:23:26 +0000 (12:23 +0200)]
add correct php version

11 years agocheck php version, the encryption app needs php >= 5.3.3
Björn Schießle [Mon, 1 Jul 2013 10:16:36 +0000 (12:16 +0200)]
check php version, the encryption app needs php >= 5.3.3

11 years agobackport from pull request #3863
Björn Schießle [Mon, 1 Jul 2013 09:12:18 +0000 (11:12 +0200)]
backport from pull request #3863

11 years agoMerge branch 'master' of github.com:owncloud/core
Björn Schießle [Mon, 1 Jul 2013 08:48:58 +0000 (10:48 +0200)]
Merge branch 'master' of github.com:owncloud/core

11 years agoset default logo claim to ''
Björn Schießle [Mon, 1 Jul 2013 08:22:05 +0000 (10:22 +0200)]
set default logo claim to ''

11 years agoadd logo claim to defaults.php
Björn Schießle [Fri, 28 Jun 2013 08:06:57 +0000 (10:06 +0200)]
add logo claim to defaults.php

11 years agologo claim added
Björn Schießle [Thu, 27 Jun 2013 17:53:49 +0000 (19:53 +0200)]
logo claim added

11 years agomake mail footer aware of different themes
Björn Schießle [Thu, 27 Jun 2013 16:28:53 +0000 (18:28 +0200)]
make mail footer aware of different themes

Conflicts:

lib/mail.php

11 years agoremove unneeded if condition
Björn Schießle [Thu, 27 Jun 2013 14:28:45 +0000 (16:28 +0200)]
remove unneeded if condition

11 years agolib/defaults.php should only contain the default strings and read the other strings...
Björn Schießle [Thu, 27 Jun 2013 14:24:03 +0000 (16:24 +0200)]
lib/defaults.php should only contain the default strings and read the other strings directly from the theme

11 years agocheck for updates only in the community edition
Björn Schießle [Wed, 26 Jun 2013 16:05:37 +0000 (18:05 +0200)]
check for updates only in the community edition

11 years agoconstruct the foother in defaults.php so that we use always the same footer
Björn Schießle [Wed, 26 Jun 2013 15:56:19 +0000 (17:56 +0200)]
construct the foother in defaults.php so that we use always the same footer

Conflicts:

settings/templates/admin.php

11 years agoMerge pull request #3857 from owncloud/enable_single_autotest
Morris Jobke [Mon, 1 Jul 2013 08:42:39 +0000 (01:42 -0700)]
Merge pull request #3857 from owncloud/enable_single_autotest

enable testing individual tests