]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
10 years agoUse PHPUnit's expectOutputString() instead of performing output buffering.
Andreas Fischer [Thu, 24 Apr 2014 13:45:07 +0000 (15:45 +0200)]
Use PHPUnit's expectOutputString() instead of performing output buffering.

10 years agoSplit testP() tests into multiple methods.
Andreas Fischer [Thu, 24 Apr 2014 13:36:02 +0000 (15:36 +0200)]
Split testP() tests into multiple methods.

10 years agoRemove redundant test case for non-HTML string.
Andreas Fischer [Thu, 24 Apr 2014 13:34:09 +0000 (15:34 +0200)]
Remove redundant test case for non-HTML string.

10 years agoMerge pull request #8304 from owncloud/add-xss-tests
Andreas Fischer [Thu, 24 Apr 2014 13:09:36 +0000 (15:09 +0200)]
Merge pull request #8304 from owncloud/add-xss-tests

Add unit tests for arrays and quotationmark

* owncloud/add-xss-tests:
  Remove uneeded newline
  Fix indentation
  Add unit tests for arrays and "

10 years agoMerge pull request #8335 from owncloud/sharing_set_default_expire_date
Andreas Fischer [Thu, 24 Apr 2014 12:03:41 +0000 (14:03 +0200)]
Merge pull request #8335 from owncloud/sharing_set_default_expire_date

[sharing] allow admin to set default expire date

* owncloud/sharing_set_default_expire_date:
  add setting to set default expire date

10 years agoadd setting to set default expire date
Bjoern Schiessle [Wed, 23 Apr 2014 10:50:24 +0000 (12:50 +0200)]
add setting to set default expire date

10 years agoMerge pull request #8332 from owncloud/l10n-access-untrusted
Thomas Müller [Thu, 24 Apr 2014 08:06:37 +0000 (10:06 +0200)]
Merge pull request #8332 from owncloud/l10n-access-untrusted

This adds one more missing untranslated text from lib/share

10 years agoMerge pull request #8334 from owncloud/protect-co
Thomas Müller [Thu, 24 Apr 2014 07:25:32 +0000 (09:25 +0200)]
Merge pull request #8334 from owncloud/protect-co

Preventing access to the config folder

10 years agoPreventing access to the config folder
Lukas Reschke [Thu, 24 Apr 2014 06:33:58 +0000 (08:33 +0200)]
Preventing access to the config folder

It isn't uncommon that admins create a backup file of the config (i.e. `config.php.bak`) before performing any changes. This would allow everybody to read the backup of the configuration file which contain several secret and critical values.

I don't believe this is worth a backport or getting added to the installer. It's just a nice to have. People that create public readable backups of their configuration are the one to blame, not us :-)

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 24 Apr 2014 05:55:33 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agoThis adds one more missing untranslated text from lib/share
Volkan Gezer [Wed, 23 Apr 2014 23:42:18 +0000 (01:42 +0200)]
This adds one more missing untranslated text from lib/share

Also displays the untrusted domain warning in English

10 years agoMerge pull request #6297 from leo-b/fix_ldap_errors
blizzz [Wed, 23 Apr 2014 14:26:43 +0000 (16:26 +0200)]
Merge pull request #6297 from leo-b/fix_ldap_errors

only check ldap_errno if an ldap_* function actually fails

10 years agoMerge pull request #8233 from owncloud/fix-newdialog-ie
Thomas Müller [Wed, 23 Apr 2014 14:17:24 +0000 (16:17 +0200)]
Merge pull request #8233 from owncloud/fix-newdialog-ie

fix shift of icons in 'New' menu in IE8/9, fix #7987

10 years agoMerge pull request #8284 from owncloud/fix_8280
Thomas Müller [Wed, 23 Apr 2014 14:06:50 +0000 (16:06 +0200)]
Merge pull request #8284 from owncloud/fix_8280

Adjust renaming of directories with a dot in name

10 years agoAdjust renaming of directories, fixes #8280
Robin McCorkell [Mon, 21 Apr 2014 08:35:15 +0000 (09:35 +0100)]
Adjust renaming of directories, fixes #8280

Directories will not be considered to have an extension, even if a dot is
found.

Stop Scrutinizer being annoyed

But the spaced version looked good!

Stop jsHint being annoyed

These code quality tools are really pestering

10 years agoMerge pull request #8324 from owncloud/expired-link-error
icewind1991 [Wed, 23 Apr 2014 12:13:44 +0000 (14:13 +0200)]
Merge pull request #8324 from owncloud/expired-link-error

Fix error when viewing expired link

10 years agoFix error when viewing expired link
Robin Appelman [Wed, 23 Apr 2014 10:54:18 +0000 (12:54 +0200)]
Fix error when viewing expired link

10 years agoMerge pull request #8009 from owncloud/feature/add-sharing-target
Joas Schilling [Wed, 23 Apr 2014 10:49:06 +0000 (12:49 +0200)]
Merge pull request #8009 from owncloud/feature/add-sharing-target

Add option to getUsersSharingFile() to get the paths for the shared users

10 years agoMerge pull request #7617 from nishiki/cache_user
Thomas Müller [Wed, 23 Apr 2014 10:32:30 +0000 (12:32 +0200)]
Merge pull request #7617 from nishiki/cache_user

Cache user

10 years agoMerge pull request #8164 from owncloud/fix-6651
blizzz [Wed, 23 Apr 2014 09:09:35 +0000 (11:09 +0200)]
Merge pull request #8164 from owncloud/fix-6651

LDAP: fix random resets of filter

10 years agoMerge pull request #8213 from cbojar/master
Thomas Müller [Wed, 23 Apr 2014 09:05:00 +0000 (11:05 +0200)]
Merge pull request #8213 from cbojar/master

Clean up js.js along suggestions from scrutinizer-ci, fixes #8204.

10 years agofixing some JSHint warnings
Thomas Müller [Wed, 23 Apr 2014 08:08:14 +0000 (10:08 +0200)]
fixing some JSHint warnings

10 years agoMerge pull request #8068 from wakeup/fix-share.php-string-extraction
Thomas Müller [Wed, 23 Apr 2014 07:58:10 +0000 (09:58 +0200)]
Merge pull request #8068 from wakeup/fix-share.php-string-extraction

Make lib/** share.php strings extractable for translation

10 years agoMerge pull request #8315 from owncloud/fix-8294
Thomas Müller [Wed, 23 Apr 2014 07:28:44 +0000 (09:28 +0200)]
Merge pull request #8315 from owncloud/fix-8294

add uncompressed jquery files - fixes #8294

10 years agoMerge pull request #8316 from owncloud/add-new-jquery-to-scrutinizer-ignore
Thomas Müller [Wed, 23 Apr 2014 07:15:28 +0000 (09:15 +0200)]
Merge pull request #8316 from owncloud/add-new-jquery-to-scrutinizer-ignore

Add new jquery files to exclude list

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 23 Apr 2014 05:56:35 +0000 (01:56 -0400)]
[tx-robot] updated from transifex

10 years agoAdd new jquery files to exclude list
Volkan Gezer [Tue, 22 Apr 2014 23:13:09 +0000 (01:13 +0200)]
Add new jquery files to exclude list

10 years agoadd uncompressed jquery files - fixes #8294
Volkan Gezer [Tue, 22 Apr 2014 22:07:00 +0000 (00:07 +0200)]
add uncompressed jquery files - fixes #8294

10 years agoRemove uneeded newline
Lukas Reschke [Tue, 22 Apr 2014 18:11:34 +0000 (20:11 +0200)]
Remove uneeded newline

10 years agoFix indentation
Lukas Reschke [Tue, 22 Apr 2014 18:10:46 +0000 (20:10 +0200)]
Fix indentation

10 years agoAdd unit tests for arrays and "
Lukas Reschke [Tue, 22 Apr 2014 18:09:55 +0000 (20:09 +0200)]
Add unit tests for arrays and "

OC_Util::sanitizeHTML() also supports array but we actually had no unit test for it. Additionally this commit introduces a test for escaping " into "

10 years agoadd additional comments, PHPdoc and check whether it's really applicable
Arthur Schiwon [Wed, 16 Apr 2014 15:16:51 +0000 (17:16 +0200)]
add additional comments, PHPdoc and check whether it's really applicable

10 years agoLDAP: cache display names immediately on retrieval, saves tens of unecessary queries...
Arthur Schiwon [Wed, 16 Apr 2014 10:56:08 +0000 (12:56 +0200)]
LDAP: cache display names immediately on retrieval, saves tens of unecessary queries to LDAP server in the share dialog for example

10 years agoMake lib/** share.php strings extractable for translation
Volkan Gezer [Sat, 5 Apr 2014 17:23:12 +0000 (19:23 +0200)]
Make lib/** share.php strings extractable for translation

They were not ready for translation as they had no placeholders
and/nor wrapper function to be translated

This should fix: #8011

10 years agoMerge pull request #8297 from owncloud/fix-text-master
Volkan Gezer [Tue, 22 Apr 2014 12:37:40 +0000 (14:37 +0200)]
Merge pull request #8297 from owncloud/fix-text-master

fix spelling 'Allow user ...' -> 'Allow users ...'

10 years agoMerge pull request #8263 from LEDfan/add-key-to-contacts
Thomas Müller [Tue, 22 Apr 2014 12:20:53 +0000 (14:20 +0200)]
Merge pull request #8263 from LEDfan/add-key-to-contacts

Add key to every contact

10 years agoChange key to addressbook-key
Tobia De Koninck [Tue, 22 Apr 2014 10:46:09 +0000 (12:46 +0200)]
Change key to addressbook-key

10 years agoMerge pull request #8255 from owncloud/fix-public-download-button
Raghu Nayyar [Tue, 22 Apr 2014 10:14:29 +0000 (15:44 +0530)]
Merge pull request #8255 from owncloud/fix-public-download-button

keep long file names in one line to not overflow download button on mobile

10 years agoMerge pull request #8286 from owncloud/use-proper-jsdoc
Thomas Müller [Tue, 22 Apr 2014 10:00:25 +0000 (12:00 +0200)]
Merge pull request #8286 from owncloud/use-proper-jsdoc

Use proper JSDoc documentation instead of inconsistent documentation styles

10 years agoMerge pull request #8247 from owncloud/l10n-files_trasbin-fix
Thomas Müller [Tue, 22 Apr 2014 09:34:49 +0000 (11:34 +0200)]
Merge pull request #8247 from owncloud/l10n-files_trasbin-fix

Fix localization issues of files_trashbin

10 years agoMerge pull request #8239 from owncloud/directlink-overflow
Thomas Müller [Tue, 22 Apr 2014 09:23:10 +0000 (11:23 +0200)]
Merge pull request #8239 from owncloud/directlink-overflow

add max-width to directLink input to prevent overflow

10 years agoFix typo
Lukas Reschke [Tue, 22 Apr 2014 08:43:35 +0000 (10:43 +0200)]
Fix typo

to => too

10 years agoMerge pull request #8283 from owncloud/translatable-max-in-upload
Jörn Friedrich Dreyer [Tue, 22 Apr 2014 08:23:08 +0000 (10:23 +0200)]
Merge pull request #8283 from owncloud/translatable-max-in-upload

make max. text translatable

10 years agofixing typos
Thomas Müller [Tue, 22 Apr 2014 07:54:25 +0000 (09:54 +0200)]
fixing typos

10 years agofixing typo
Thomas Müller [Tue, 22 Apr 2014 07:43:29 +0000 (09:43 +0200)]
fixing typo

10 years agofix spelling 'Allow user ...' -> 'Allow users ...'
Thomas Müller [Tue, 22 Apr 2014 07:34:08 +0000 (09:34 +0200)]
fix spelling 'Allow user ...' -> 'Allow users ...'

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 22 Apr 2014 05:54:58 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #8281 from owncloud/public-responses
Morris Jobke [Mon, 21 Apr 2014 22:08:04 +0000 (00:08 +0200)]
Merge pull request #8281 from owncloud/public-responses

make download and redirectresponse public

10 years agoMerge pull request #8287 from owncloud/phpdoc-base
Frank Karlitschek [Mon, 21 Apr 2014 18:13:45 +0000 (20:13 +0200)]
Merge pull request #8287 from owncloud/phpdoc-base

Some more PHPDoc fixes

10 years agoSome more PHPDoc fixes
Lukas Reschke [Mon, 21 Apr 2014 13:44:54 +0000 (15:44 +0200)]
Some more PHPDoc fixes

10 years agoFix JSDoc
Lukas Reschke [Mon, 21 Apr 2014 12:42:50 +0000 (14:42 +0200)]
Fix JSDoc

10 years agoReuse selector
Lukas Reschke [Mon, 21 Apr 2014 12:28:54 +0000 (14:28 +0200)]
Reuse selector

10 years agoUse proper JSDoc documentation
Lukas Reschke [Mon, 21 Apr 2014 11:46:33 +0000 (13:46 +0200)]
Use proper JSDoc documentation

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 21 Apr 2014 05:56:06 +0000 (01:56 -0400)]
[tx-robot] updated from transifex

10 years agomake max. text translatable
Volkan Gezer [Mon, 21 Apr 2014 00:28:34 +0000 (02:28 +0200)]
make max. text translatable

10 years agoMerge pull request #7988 from owncloud/routing-cache-webroot
Andreas Fischer [Sun, 20 Apr 2014 16:27:23 +0000 (18:27 +0200)]
Merge pull request #7988 from owncloud/routing-cache-webroot

Keep cached urls with different hostnames or baseurls seperate

* owncloud/routing-cache-webroot:
  Sort parameters and cast to int
  add delimiter between host and baseurl
  Keep cached urls with different hostnames or baseurls seperate

10 years agomake download and redirectresponse public
Bernhard Posselt [Sun, 20 Apr 2014 14:12:46 +0000 (16:12 +0200)]
make download and redirectresponse public

10 years agoMerge pull request #8203 from owncloud/correct-link
Andreas Fischer [Sun, 20 Apr 2014 13:58:53 +0000 (15:58 +0200)]
Merge pull request #8203 from owncloud/correct-link

Use direct link instead of JS

* owncloud/correct-link:
  Link to previous directory
  Use direct link instead of JS

10 years agoMerge pull request #8169 from owncloud/change-to-show
Andreas Fischer [Sun, 20 Apr 2014 13:53:33 +0000 (15:53 +0200)]
Merge pull request #8169 from owncloud/change-to-show

Change from showHTML to show

* owncloud/change-to-show:
  Change from showHTML to show

10 years agoMerge pull request #8277 from owncloud/add-type-hints
Andreas Fischer [Sun, 20 Apr 2014 13:40:26 +0000 (15:40 +0200)]
Merge pull request #8277 from owncloud/add-type-hints

Add type hinting

* owncloud/add-type-hints:
  Add type hinting

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 20 Apr 2014 05:56:03 +0000 (01:56 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #8229 from owncloud/menutoggle-mobile
Lukas Reschke [Sat, 19 Apr 2014 23:13:24 +0000 (01:13 +0200)]
Merge pull request #8229 from owncloud/menutoggle-mobile

do not show menu toggle on public share links as there is no menu

10 years agoAdd type hinting
Lukas Reschke [Sat, 19 Apr 2014 22:55:01 +0000 (00:55 +0200)]
Add type hinting

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 19 Apr 2014 05:56:06 +0000 (01:56 -0400)]
[tx-robot] updated from transifex

10 years agoAdd key to every contact
LEDfan [Fri, 18 Apr 2014 12:30:44 +0000 (14:30 +0200)]
Add key to every contact

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 18 Apr 2014 05:56:04 +0000 (01:56 -0400)]
[tx-robot] updated from transifex

10 years agoFix localization issues of files_trashbin
Volkan Gezer [Thu, 17 Apr 2014 00:35:43 +0000 (02:35 +0200)]
Fix localization issues of files_trashbin

10 years agoMerge pull request #8220 from owncloud/type-hinting-ldap
blizzz [Thu, 17 Apr 2014 16:15:40 +0000 (18:15 +0200)]
Merge pull request #8220 from owncloud/type-hinting-ldap

Fix PHPdoc in user_ldap

10 years agoMerge pull request #8249 from owncloud/correct-m
Morris Jobke [Thu, 17 Apr 2014 15:14:34 +0000 (17:14 +0200)]
Merge pull request #8249 from owncloud/correct-m

Use JS as content-type due to mimesniffing

10 years agokeep long file names in one line to not overflow download button on mobile
Jan-Christoph Borchardt [Thu, 17 Apr 2014 14:58:57 +0000 (16:58 +0200)]
keep long file names in one line to not overflow download button on mobile

10 years agoMerge pull request #8205 from owncloud/fix-8202
Morris Jobke [Thu, 17 Apr 2014 14:10:33 +0000 (16:10 +0200)]
Merge pull request #8205 from owncloud/fix-8202

Add one more LOWER.

10 years agoMerge pull request #8222 from owncloud/type-hinting
Morris Jobke [Thu, 17 Apr 2014 14:08:15 +0000 (16:08 +0200)]
Merge pull request #8222 from owncloud/type-hinting

Type hinting fixes

10 years agoMerge pull request #8246 from Gared/master
Morris Jobke [Thu, 17 Apr 2014 13:37:35 +0000 (15:37 +0200)]
Merge pull request #8246 from Gared/master

Fix javascript error in calendar app

10 years agoMerge pull request #8236 from owncloud/header-right-fix
Morris Jobke [Thu, 17 Apr 2014 13:18:40 +0000 (15:18 +0200)]
Merge pull request #8236 from owncloud/header-right-fix

remove duplication of header and 'header-right' element, also ellipsize when too wide

10 years agoMerge pull request #8189 from Xenopathic/misc_fixes
Robin McCorkell [Thu, 17 Apr 2014 10:56:51 +0000 (11:56 +0100)]
Merge pull request #8189 from Xenopathic/misc_fixes

Various fixes

10 years agoMerge pull request #8240 from owncloud/thumbnail-on-short-videos-master
Jörn Friedrich Dreyer [Thu, 17 Apr 2014 09:15:05 +0000 (11:15 +0200)]
Merge pull request #8240 from owncloud/thumbnail-on-short-videos-master

videos which are shorter then 5 seconds will now get a proper thumbnail ...

10 years agoUse JS as content-type due to mimesniffing
Lukas Reschke [Thu, 17 Apr 2014 08:40:19 +0000 (10:40 +0200)]
Use JS as content-type due to mimesniffing

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 17 Apr 2014 05:56:06 +0000 (01:56 -0400)]
[tx-robot] updated from transifex

10 years agoClean up js.js along suggestions from scrutinizer-ci, fixes #8204.
cbojar [Tue, 15 Apr 2014 02:44:24 +0000 (22:44 -0400)]
Clean up js.js along suggestions from scrutinizer-ci, fixes #8204.

Also used JSHint.com to find a few other issues.

-Strict comparisons (===)
-Fixed regex escaping errors
-Refactored OC.buildQueryString to use jQuery.map
-Missing semicolons
-Braces around if block

Left some of the mixed spaces/tabs as they are for alignment in comments.

10 years agoMerge pull request #8183 from owncloud/move-security-headers
Morris Jobke [Wed, 16 Apr 2014 21:46:20 +0000 (23:46 +0200)]
Merge pull request #8183 from owncloud/move-security-headers

Move security headers

10 years agoMerge pull request #7994 from owncloud/fix-login-fields
Morris Jobke [Wed, 16 Apr 2014 21:17:49 +0000 (23:17 +0200)]
Merge pull request #7994 from owncloud/fix-login-fields

Fix login fields

10 years agoFix javascript error in calendar app
Stefan [Wed, 16 Apr 2014 20:41:57 +0000 (22:41 +0200)]
Fix javascript error in calendar app

Fix owncloud/calendar#409
If you haven't allowed to share items per email the element "email" will never appear and you will get a null exception.

License: WTFPL

10 years agoMerge pull request #8235 from owncloud/fix-error-mobile
Jan-Christoph Borchardt [Wed, 16 Apr 2014 19:35:43 +0000 (21:35 +0200)]
Merge pull request #8235 from owncloud/fix-error-mobile

fix error display on smaller screens, fix #8090

10 years agoLink to previous directory
Lukas Reschke [Wed, 16 Apr 2014 19:10:14 +0000 (21:10 +0200)]
Link to previous directory

10 years agoescape $second + update PHPDoc
Thomas Müller [Wed, 16 Apr 2014 17:45:55 +0000 (19:45 +0200)]
escape $second + update PHPDoc

10 years agoAdd missing param hint
Bart Visscher [Wed, 16 Apr 2014 15:54:10 +0000 (17:54 +0200)]
Add missing param hint

10 years agofix overlapping infield labels
Jan-Christoph Borchardt [Wed, 16 Apr 2014 15:44:38 +0000 (17:44 +0200)]
fix overlapping infield labels

10 years agofix database infield label indentation
Jan-Christoph Borchardt [Wed, 16 Apr 2014 15:44:05 +0000 (17:44 +0200)]
fix database infield label indentation

10 years agofix sizing for fields when password is shown
Jan-Christoph Borchardt [Wed, 16 Apr 2014 15:43:15 +0000 (17:43 +0200)]
fix sizing for fields when password is shown

10 years agovideos which are shorter then 5 seconds will now get a proper thumbnail at 1 second
Thomas Müller [Wed, 16 Apr 2014 15:16:03 +0000 (17:16 +0200)]
videos which are shorter then 5 seconds will now get a proper thumbnail at 1 second

10 years agoMerge pull request #8157 from owncloud/share-expiration-smooth-hide
Jan-Christoph Borchardt [Wed, 16 Apr 2014 15:10:14 +0000 (17:10 +0200)]
Merge pull request #8157 from owncloud/share-expiration-smooth-hide

Expiration date is hidden smoothly

10 years agoadd max-width to directLink input to prevent overflow
Jan-Christoph Borchardt [Wed, 16 Apr 2014 14:43:35 +0000 (16:43 +0200)]
add max-width to directLink input to prevent overflow

10 years agofix header code duplication, code style fixes
Jan-Christoph Borchardt [Wed, 16 Apr 2014 14:26:41 +0000 (16:26 +0200)]
fix header code duplication, code style fixes

10 years agoremove duplication of 'header-right' element, also make it overflow when too wide
Jan-Christoph Borchardt [Wed, 16 Apr 2014 13:53:38 +0000 (15:53 +0200)]
remove duplication of 'header-right' element, also make it overflow when too wide

10 years agofix error display on smaller screens, fix #8090
Jan-Christoph Borchardt [Wed, 16 Apr 2014 13:31:15 +0000 (15:31 +0200)]
fix error display on smaller screens, fix #8090

10 years agofix shift of icons in 'New' menu in IE8/9, fix #7987
Jan-Christoph Borchardt [Wed, 16 Apr 2014 12:58:27 +0000 (14:58 +0200)]
fix shift of icons in 'New' menu in IE8/9, fix #7987

10 years agodo not show menu toggle on public share links as there is no menu
Jan-Christoph Borchardt [Wed, 16 Apr 2014 08:49:16 +0000 (10:49 +0200)]
do not show menu toggle on public share links as there is no menu

10 years agoMerge pull request #7815 from owncloud/ldap_fix_usercount_master
blizzz [Wed, 16 Apr 2014 08:36:19 +0000 (10:36 +0200)]
Merge pull request #7815 from owncloud/ldap_fix_usercount_master

correct LDAP user count on setup with many users (occ user:report)

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 16 Apr 2014 05:57:34 +0000 (01:57 -0400)]
[tx-robot] updated from transifex

10 years agoFix PHPdoc in lib/public
Bart Visscher [Tue, 15 Apr 2014 16:00:38 +0000 (18:00 +0200)]
Fix PHPdoc in lib/public

using scrutinizer patch