]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
10 years agoDo not filemtime() on "." directory. Use empty string instead
Joas Schilling [Mon, 11 Aug 2014 15:05:35 +0000 (17:05 +0200)]
Do not filemtime() on "." directory. Use empty string instead

Fix #9928

10 years agoRemove doubled slash between folder and path
Joas Schilling [Mon, 11 Aug 2014 14:50:52 +0000 (16:50 +0200)]
Remove doubled slash between folder and path

10 years agoMerge pull request #10285 from owncloud/sharing_set_correct_min_date
Morris Jobke [Mon, 11 Aug 2014 07:09:01 +0000 (09:09 +0200)]
Merge pull request #10285 from owncloud/sharing_set_correct_min_date

[sharing] set minDate always to today + one day

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 11 Aug 2014 05:54:32 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 10 Aug 2014 05:55:15 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #10302 from owncloud/remove-logon-rejected
Lukas Reschke [Sat, 9 Aug 2014 17:01:38 +0000 (19:01 +0200)]
Merge pull request #10302 from owncloud/remove-logon-rejected

remove confusing 'automatic logon rejected' message, fix #8591

10 years agoMerge pull request #10293 from owncloud/fix-headers-being-sent
Jan-Christoph Borchardt [Sat, 9 Aug 2014 16:32:44 +0000 (18:32 +0200)]
Merge pull request #10293 from owncloud/fix-headers-being-sent

using flush() here is pointless as we render the layout into a memory bu...

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 9 Aug 2014 05:55:08 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agoremove confusing 'automatic logon rejected' message, fix #8591
Jan-Christoph Borchardt [Fri, 8 Aug 2014 23:35:02 +0000 (01:35 +0200)]
remove confusing 'automatic logon rejected' message, fix #8591

10 years agoMerge pull request #10290 from owncloud/check_quota_on_new_via_web
Thomas Müller [Fri, 8 Aug 2014 15:32:50 +0000 (17:32 +0200)]
Merge pull request #10290 from owncloud/check_quota_on_new_via_web

check quota when trying to download a file via new -> web

10 years agousing flush() here is pointless as we render the layout into a memory buffer and...
Thomas Müller [Fri, 8 Aug 2014 13:44:11 +0000 (15:44 +0200)]
using flush() here is pointless as we render the layout into a memory buffer and actually transmit the data later

10 years agocheck quota when trying to download a file via new -> web
Jörn Friedrich Dreyer [Fri, 8 Aug 2014 12:35:33 +0000 (14:35 +0200)]
check quota when trying to download a file via new -> web

10 years agoMerge pull request #10288 from owncloud/sharing_dont_show_share_dialog
Björn Schießle [Fri, 8 Aug 2014 12:01:55 +0000 (14:01 +0200)]
Merge pull request #10288 from owncloud/sharing_dont_show_share_dialog

don't show share dialog and navigation entry if sharing was disabled for the user

10 years agoupdate unit test, min date should be always today + 1
Bjoern Schiessle [Fri, 8 Aug 2014 11:58:56 +0000 (13:58 +0200)]
update unit test, min date should be always today + 1

10 years agoremove share permissions if user is excluded from sharing
Bjoern Schiessle [Fri, 8 Aug 2014 10:16:54 +0000 (12:16 +0200)]
remove share permissions if user is excluded from sharing

10 years agoonly show "share with others" and "share by link" navigation bar entries if user...
Bjoern Schiessle [Fri, 8 Aug 2014 10:12:20 +0000 (12:12 +0200)]
only show "share with others" and "share by link" navigation bar entries if user is allowed to share files

10 years agoset minDate always to today + one day
Bjoern Schiessle [Fri, 8 Aug 2014 09:09:17 +0000 (11:09 +0200)]
set minDate always to today + one day

10 years agoMerge pull request #10280 from owncloud/lazyloading-earlier
Morris Jobke [Fri, 8 Aug 2014 08:02:43 +0000 (10:02 +0200)]
Merge pull request #10280 from owncloud/lazyloading-earlier

trigger lazy loading earlier, fix #9823

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 8 Aug 2014 05:55:11 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agotrigger lazy loading earlier, fix #9823
Jan-Christoph Borchardt [Thu, 7 Aug 2014 22:27:31 +0000 (00:27 +0200)]
trigger lazy loading earlier, fix #9823

10 years agoMerge pull request #10248 from owncloud/enc_remove_keys_from_session
Morris Jobke [Thu, 7 Aug 2014 21:01:11 +0000 (23:01 +0200)]
Merge pull request #10248 from owncloud/enc_remove_keys_from_session

add logout hook to remove keys from session

10 years agoMerge pull request #9953 from owncloud/fix_text_preview_for_systems_without_ttf
Morris Jobke [Thu, 7 Aug 2014 20:55:06 +0000 (22:55 +0200)]
Merge pull request #9953 from owncloud/fix_text_preview_for_systems_without_ttf

implement a txt preview fallback for the case that ttf is not support

10 years agoMerge pull request #10261 from owncloud/fix-9829
Thomas Müller [Thu, 7 Aug 2014 19:38:12 +0000 (21:38 +0200)]
Merge pull request #10261 from owncloud/fix-9829

ldap_ prefix will be added in invokeLDAPMethod(), having it would lead t...

10 years agoldap_ prefix will be added in invokeLDAPMethod(), having it would lead to a unexistin...
Arthur Schiwon [Thu, 7 Aug 2014 10:41:01 +0000 (12:41 +0200)]
ldap_ prefix will be added in invokeLDAPMethod(), having it would lead to a unexisting function, fixes #9829

10 years agoMerge pull request #10172 from owncloud/fix-8802
Morris Jobke [Thu, 7 Aug 2014 14:14:30 +0000 (16:14 +0200)]
Merge pull request #10172 from owncloud/fix-8802

Use relative, human readable dates in OC.filePickers - Fixes #8802

10 years agoMerge pull request #10079 from owncloud/Improve_scanner_message
Thomas Müller [Thu, 7 Aug 2014 14:09:52 +0000 (16:09 +0200)]
Merge pull request #10079 from owncloud/Improve_scanner_message

Improved scanner error message

10 years agoadd logout hook to remove keys from session
Bjoern Schiessle [Thu, 7 Aug 2014 13:26:09 +0000 (15:26 +0200)]
add logout hook to remove keys from session

10 years agoMerge pull request #10142 from owncloud/fix-#9283-gzip_support
Thomas Müller [Thu, 7 Aug 2014 12:53:31 +0000 (14:53 +0200)]
Merge pull request #10142 from owncloud/fix-#9283-gzip_support

Removed broken tar cutter, added tar and fixed extension switch.

10 years agoUse human readable relative date for oc-dialog-filepickers
Tom Needham [Thu, 7 Aug 2014 12:40:52 +0000 (13:40 +0100)]
Use human readable relative date for oc-dialog-filepickers

10 years agoMerge pull request #10238 from owncloud/fix-public-download-with-encryption-master
Thomas Müller [Thu, 7 Aug 2014 12:29:54 +0000 (14:29 +0200)]
Merge pull request #10238 from owncloud/fix-public-download-with-encryption-master

we can only close the session if encryption is not used

10 years agoMerge pull request #10184 from owncloud/getbyid-node
Robin Appelman [Thu, 7 Aug 2014 11:40:17 +0000 (13:40 +0200)]
Merge pull request #10184 from owncloud/getbyid-node

Fix Folder::getById

10 years agoMerge pull request #10223 from dannosaur/patch-1
Jan-Christoph Borchardt [Thu, 7 Aug 2014 10:36:57 +0000 (12:36 +0200)]
Merge pull request #10223 from dannosaur/patch-1

fix tiny thumbnails in public preview/share mode

10 years agoMerge pull request #10218 from owncloud/pzy-master
Thomas Müller [Thu, 7 Aug 2014 10:14:30 +0000 (12:14 +0200)]
Merge pull request #10218 from owncloud/pzy-master

Adding link tag to enable facebook timeline previews

10 years agoMerge pull request #8915 from owncloud/MorrisJobke-travis
Thomas Müller [Thu, 7 Aug 2014 09:33:13 +0000 (11:33 +0200)]
Merge pull request #8915 from owncloud/MorrisJobke-travis

Travis support for PRs and master, stable5 and stable6

10 years agowe can only close the session if encryption is not used
Thomas Müller [Thu, 7 Aug 2014 09:07:11 +0000 (11:07 +0200)]
we can only close the session if encryption is not used

10 years agoUpdate public.php
pzy [Mon, 19 May 2014 17:53:27 +0000 (19:53 +0200)]
Update public.php

added tag to make facebook load a preview picture

Update public.php

add check ifMimeSupported and put the thumbsize in a variable

generate preview for all supported mimes

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

10 years agoMerge pull request #10224 from owncloud/typo-fix
Morris Jobke [Wed, 6 Aug 2014 23:40:56 +0000 (01:40 +0200)]
Merge pull request #10224 from owncloud/typo-fix

typo fix from transifex suggestion

10 years agotypo fix from transifex suggestion
Volkan Gezer [Wed, 6 Aug 2014 18:48:26 +0000 (20:48 +0200)]
typo fix from transifex suggestion

10 years agofix tiny thumbnails in public preview/share mode
Dan Jones [Wed, 6 Aug 2014 18:32:21 +0000 (19:32 +0100)]
fix tiny thumbnails in public preview/share mode

10 years agotrim leading slash
Robin Appelman [Wed, 6 Aug 2014 12:57:54 +0000 (14:57 +0200)]
trim leading slash

10 years agoFix SharedCache::getPathById
Robin Appelman [Wed, 6 Aug 2014 11:38:14 +0000 (13:38 +0200)]
Fix SharedCache::getPathById

10 years agoreturn null instead of throwing an exception
Robin Appelman [Wed, 6 Aug 2014 10:06:41 +0000 (12:06 +0200)]
return null instead of throwing an exception

10 years agoMerge pull request #10144 from owncloud/issue/9972
Thomas Müller [Wed, 6 Aug 2014 07:53:13 +0000 (09:53 +0200)]
Merge pull request #10144 from owncloud/issue/9972

Issue/9972 Fix issues with group and username `0`

10 years agoMerge pull request #10186 from owncloud/versioning_fix_path
Thomas Müller [Wed, 6 Aug 2014 07:30:28 +0000 (09:30 +0200)]
Merge pull request #10186 from owncloud/versioning_fix_path

[versioning] make sure that getVersions() return the correct path

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 6 Aug 2014 05:54:43 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #10191 from owncloud/sharing_rm_trailing_slash
Morris Jobke [Tue, 5 Aug 2014 21:13:35 +0000 (23:13 +0200)]
Merge pull request #10191 from owncloud/sharing_rm_trailing_slash

[sharing] remove trailing slash

10 years agoremove trailing slash from path
Bjoern Schiessle [Tue, 5 Aug 2014 18:34:32 +0000 (20:34 +0200)]
remove trailing slash from path

10 years agoremove unused variable
Bjoern Schiessle [Tue, 5 Aug 2014 18:34:18 +0000 (20:34 +0200)]
remove unused variable

10 years agoexecute unit test for files external in separate build config
Thomas Müller [Tue, 29 Jul 2014 06:34:55 +0000 (08:34 +0200)]
execute unit test for files external in separate build config

10 years agoDisable encryption migration tests
Morris Jobke [Fri, 25 Jul 2014 07:20:05 +0000 (09:20 +0200)]
Disable encryption migration tests

10 years agomark tests as skipped - TODO travis
Morris Jobke [Sat, 12 Jul 2014 09:20:12 +0000 (11:20 +0200)]
mark tests as skipped - TODO travis

* swift causes some timeouts and test failures

10 years agoMerge pull request #9520 from owncloud/theme_urls
Björn Schießle [Tue, 5 Aug 2014 15:53:18 +0000 (17:53 +0200)]
Merge pull request #9520 from owncloud/theme_urls

Add ability to theme iOS and Android client URLs just like desktop URLs.

10 years agoadd unit test to make sure getVersions returns the correct result
Bjoern Schiessle [Tue, 5 Aug 2014 15:26:23 +0000 (17:26 +0200)]
add unit test to make sure getVersions returns the correct result

10 years agomake sure that the versions array contains the correct path
Bjoern Schiessle [Tue, 5 Aug 2014 15:25:55 +0000 (17:25 +0200)]
make sure that the versions array contains the correct path

10 years agoFix Folder::getById
Robin Appelman [Tue, 5 Aug 2014 14:58:10 +0000 (16:58 +0200)]
Fix Folder::getById

10 years agoMinor fixes
Morris Jobke [Fri, 11 Jul 2014 12:27:43 +0000 (14:27 +0200)]
Minor fixes

* instanceof \OC\Files\View
* fix misplaced paranthesis
* remove misplaced character in comment

10 years agoMake View->shouldEmitHooks more robust
Robin Appelman [Fri, 6 Jun 2014 08:50:58 +0000 (10:50 +0200)]
Make View->shouldEmitHooks more robust

10 years agoDon't rely on the sorting the database gives us for tests
Robin Appelman [Fri, 6 Jun 2014 08:24:28 +0000 (10:24 +0200)]
Don't rely on the sorting the database gives us for tests

10 years agoTravis support
Morris Jobke [Fri, 6 Jun 2014 07:29:01 +0000 (09:29 +0200)]
Travis support

* use PHPUnit 4.x
* force php memory limit on travis to 1024MB
* create script for travis
* whitelist branches master, stable5 and stable6 on travis (and PRs)
* sqlplus64
* conditional JS tests and ocular temporal removal
* enable scrutinizer code coverage
* move oracle to top to decrease overall test duration

10 years agoMerge pull request #10176 from owncloud/fix-install-icon-size
Morris Jobke [Tue, 5 Aug 2014 14:04:30 +0000 (16:04 +0200)]
Merge pull request #10176 from owncloud/fix-install-icon-size

use correct app-icon class for new apps as well, fix icon size

10 years agoMerge pull request #10166 from owncloud/sharing_dont_display_share_permission
Tom Needham [Tue, 5 Aug 2014 13:45:09 +0000 (14:45 +0100)]
Merge pull request #10166 from owncloud/sharing_dont_display_share_permission

[sharing] respect "sharing allowed" setting in the share dialog

10 years agoMerge pull request #10154 from owncloud/uninstall-undefined-appitem
Morris Jobke [Tue, 5 Aug 2014 13:13:15 +0000 (15:13 +0200)]
Merge pull request #10154 from owncloud/uninstall-undefined-appitem

Fix undefined variable when uninstalling an app

10 years agoMerge pull request #10168 from owncloud/parallel-download-on-public-shared-folder...
Morris Jobke [Tue, 5 Aug 2014 12:54:44 +0000 (14:54 +0200)]
Merge pull request #10168 from owncloud/parallel-download-on-public-shared-folder-master

close session right before the download starts - this enables parallel d...

10 years agouse correct app-icon class for new apps as well, fix icon size
Jan-Christoph Borchardt [Tue, 5 Aug 2014 12:23:25 +0000 (14:23 +0200)]
use correct app-icon class for new apps as well, fix icon size

10 years agoremove escaping because it's unneeded
Morris Jobke [Tue, 5 Aug 2014 11:18:38 +0000 (13:18 +0200)]
remove escaping because it's unneeded

10 years agofix uppercase issue
Morris Jobke [Wed, 30 Jul 2014 09:38:17 +0000 (11:38 +0200)]
fix uppercase issue

10 years agoAdded to personal settings page.
scolebrook [Tue, 8 Jul 2014 19:15:22 +0000 (15:15 -0400)]
Added to personal settings page.

10 years agoAdd ability to theme iOS and Android client URLs just like desktop URLs.
scolebrook [Tue, 8 Jul 2014 13:51:05 +0000 (09:51 -0400)]
Add ability to theme iOS and Android client URLs just like desktop URLs.

10 years agoHack to avoid Agent DN + Password being overwritten by some ugly browsers with stored...
Arthur Schiwon [Thu, 10 Jul 2014 17:33:53 +0000 (19:33 +0200)]
Hack to avoid Agent DN + Password being overwritten by some ugly browsers with stored site credentials

Conflicts:
apps/user_ldap/css/settings.css

10 years agoclose session right before the download starts - this enables parallel downloads
Thomas Müller [Tue, 5 Aug 2014 09:21:42 +0000 (11:21 +0200)]
close session right before the download starts - this enables parallel downloads

10 years agodon't display share permission if resharing was disabled by the admin
Bjoern Schiessle [Tue, 5 Aug 2014 08:57:13 +0000 (10:57 +0200)]
don't display share permission if resharing was disabled by the admin

10 years agoMerge pull request #10151 from owncloud/issue/9912
Morris Jobke [Tue, 5 Aug 2014 06:20:57 +0000 (08:20 +0200)]
Merge pull request #10151 from owncloud/issue/9912

Increase word wrap limit for emails to 78 characters

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 5 Aug 2014 06:05:17 +0000 (02:05 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #10143 from owncloud/fix-top-border
Raghu Nayyar [Tue, 5 Aug 2014 05:27:12 +0000 (10:57 +0530)]
Merge pull request #10143 from owncloud/fix-top-border

no top border for first settings item, detail enhancement

10 years agoFix undefined variable when uninstalling an app
Robin Appelman [Mon, 4 Aug 2014 14:35:52 +0000 (16:35 +0200)]
Fix undefined variable when uninstalling an app

10 years agoMerge pull request #10083 from th3fallen/fix-9969-take-two
Joas Schilling [Mon, 4 Aug 2014 15:41:03 +0000 (17:41 +0200)]
Merge pull request #10083 from th3fallen/fix-9969-take-two

Fix 9969

10 years agoMerge pull request #10150 from owncloud/fix-9782
blizzz [Mon, 4 Aug 2014 15:28:34 +0000 (17:28 +0200)]
Merge pull request #10150 from owncloud/fix-9782

Set group usercount to 0, not '', fixes #9782

10 years agoMerge pull request #10138 from owncloud/innodb-repair-non-oc
Thomas Müller [Mon, 4 Aug 2014 14:23:46 +0000 (16:23 +0200)]
Merge pull request #10138 from owncloud/innodb-repair-non-oc

Dont touch non-oc tables when doing the InnoDB repair step

10 years agoIncrease word wrap limit for emails to 78 characters
Joas Schilling [Mon, 4 Aug 2014 14:05:09 +0000 (16:05 +0200)]
Increase word wrap limit for emails to 78 characters

10 years agoSet group usercount to 0, not '', fixes #9782
tomneedham [Mon, 4 Aug 2014 13:55:28 +0000 (13:55 +0000)]
Set group usercount to 0, not '', fixes #9782

10 years agoFix isLoggedIn() check for user '0'
Joas Schilling [Mon, 4 Aug 2014 12:47:14 +0000 (14:47 +0200)]
Fix isLoggedIn() check for user '0'

Fix #9972

10 years agoFix getting group '0' from database backend
Joas Schilling [Mon, 4 Aug 2014 11:46:53 +0000 (13:46 +0200)]
Fix getting group '0' from database backend

Fix #9972

10 years agono top border for first settings item, detail enhancement
Jan-Christoph Borchardt [Mon, 4 Aug 2014 12:42:47 +0000 (14:42 +0200)]
no top border for first settings item, detail enhancement

10 years agoPrevious commit was not based on master, retry. Removed broken tar cutter, double...
Remco Brenninkmeijer [Mon, 4 Aug 2014 12:10:09 +0000 (14:10 +0200)]
Previous commit was not based on master, retry. Removed broken tar cutter, double extensions are not possible in temp files. Added tar support. Fixed extension switch.

10 years agoDont touch non-oc tables when doing the InnoDB repair step
Robin Appelman [Mon, 4 Aug 2014 11:14:12 +0000 (13:14 +0200)]
Dont touch non-oc tables when doing the InnoDB repair step

10 years agoMerge pull request #10025 from owncloud/l10n-typo
Thomas Müller [Mon, 4 Aug 2014 09:03:50 +0000 (11:03 +0200)]
Merge pull request #10025 from owncloud/l10n-typo

typo fix from transifex suggestion

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 4 Aug 2014 05:54:39 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 3 Aug 2014 05:54:25 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 2 Aug 2014 05:54:33 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoexpire -> expiration
Volkan Gezer [Sat, 2 Aug 2014 02:02:39 +0000 (04:02 +0200)]
expire -> expiration

10 years agoMerge pull request #10097 from owncloud/background-fix
Jan-Christoph Borchardt [Fri, 1 Aug 2014 17:39:13 +0000 (19:39 +0200)]
Merge pull request #10097 from owncloud/background-fix

Remove old color of body

10 years agoMerge pull request #10098 from owncloud/fix-10094-master
Thomas Müller [Fri, 1 Aug 2014 13:51:11 +0000 (15:51 +0200)]
Merge pull request #10098 from owncloud/fix-10094-master

prevent PHP errors and enhance logging

10 years agoadd white as background-color
Morris Jobke [Fri, 1 Aug 2014 13:37:36 +0000 (15:37 +0200)]
add white as background-color

10 years agoMerge pull request #9529 from helmutschneider/fix-8326
Robin Appelman [Fri, 1 Aug 2014 12:04:21 +0000 (14:04 +0200)]
Merge pull request #9529 from helmutschneider/fix-8326

Fixes #8326: deletion of directories on S3

10 years agofix return documentation
Jörn Friedrich Dreyer [Fri, 1 Aug 2014 11:42:35 +0000 (13:42 +0200)]
fix return documentation

10 years agoprevent PHP errors and enhance logging
Thomas Müller [Fri, 1 Aug 2014 07:54:32 +0000 (09:54 +0200)]
prevent PHP errors and enhance logging

10 years agoRemove old color of body
Morris Jobke [Fri, 1 Aug 2014 07:33:32 +0000 (09:33 +0200)]
Remove old color of body

* only visible in public view as ugly grey pane behind the footer

10 years agoMerge pull request #10067 from owncloud/fix-#9119
Morris Jobke [Fri, 1 Aug 2014 07:25:15 +0000 (09:25 +0200)]
Merge pull request #10067 from owncloud/fix-#9119

Quick fix for #9119. Increase preview to keep empty message more centered

10 years agoMerge pull request #10085 from owncloud/fixes-for-filepicker
Morris Jobke [Fri, 1 Aug 2014 06:36:20 +0000 (08:36 +0200)]
Merge pull request #10085 from owncloud/fixes-for-filepicker

Fixes for filepicker