]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
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 #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 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 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 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 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

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

10 years agosuggestions by deepdiver
Volkan Gezer [Thu, 31 Jul 2014 23:39:52 +0000 (01:39 +0200)]
suggestions by deepdiver

10 years agoMerge pull request #10048 from owncloud/fix_search_in_shared_files
Jörn Friedrich Dreyer [Thu, 31 Jul 2014 16:27:47 +0000 (18:27 +0200)]
Merge pull request #10048 from owncloud/fix_search_in_shared_files

traverse folders in php to search in shared files

10 years agoalso fix filepicker for smaller screen sizes
Jan-Christoph Borchardt [Thu, 31 Jul 2014 15:35:32 +0000 (17:35 +0200)]
also fix filepicker for smaller screen sizes

10 years agofix date display in filepicker
Jan-Christoph Borchardt [Thu, 31 Jul 2014 14:57:44 +0000 (16:57 +0200)]
fix date display in filepicker

10 years agofix long filename display in filepicker
Jan-Christoph Borchardt [Thu, 31 Jul 2014 14:56:19 +0000 (16:56 +0200)]
fix long filename display in filepicker

10 years agoMerge branch 'fix-9969-take-two' of https://github.com/th3fallen/core into fix-9969...
Clark Tomlinson [Thu, 31 Jul 2014 13:34:42 +0000 (09:34 -0400)]
Merge branch 'fix-9969-take-two' of https://github.com/th3fallen/core into fix-9969-take-two

10 years agoRemoving unnecessary switch statements in fopen methods.
Clark Tomlinson [Thu, 31 Jul 2014 12:53:42 +0000 (08:53 -0400)]
Removing unnecessary switch statements in fopen methods.

10 years agoadd test for search() in shared cache
Jörn Friedrich Dreyer [Thu, 31 Jul 2014 10:06:13 +0000 (12:06 +0200)]
add test for search() in shared cache

10 years agoResolving 9969 resubmitting to fix rebase issue.
Clark Tomlinson [Thu, 31 Jul 2014 12:53:42 +0000 (08:53 -0400)]
Resolving 9969 resubmitting to fix rebase issue.

10 years agotraverse folders in php to search in shared files
Jörn Friedrich Dreyer [Wed, 30 Jul 2014 11:46:02 +0000 (13:46 +0200)]
traverse folders in php to search in shared files

10 years agoMerge pull request #10051 from owncloud/preview-empty-text
Thomas Müller [Thu, 31 Jul 2014 09:38:29 +0000 (11:38 +0200)]
Merge pull request #10051 from owncloud/preview-empty-text

Use svg mimeicons for empty text files

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

10 years agoQuick fix for #9119. Increase preview to keep empty message more centered and push...
Remco Brenninkmeijer [Wed, 30 Jul 2014 20:41:17 +0000 (22:41 +0200)]
Quick fix for #9119. Increase preview to keep empty message more centered and push footer down.

10 years agoMerge pull request #10055 from owncloud/notification-fix
Sander [Wed, 30 Jul 2014 19:16:30 +0000 (21:16 +0200)]
Merge pull request #10055 from owncloud/notification-fix

Fix notification preventing top bar clickability

10 years agoMerge pull request #10054 from owncloud/dont_preload_videos
Jan-Christoph Borchardt [Wed, 30 Jul 2014 19:10:57 +0000 (21:10 +0200)]
Merge pull request #10054 from owncloud/dont_preload_videos

don't preload videos on public sharing, fixes #10042

10 years agoMerge pull request #10044 from owncloud/transparency_fix
Jan-Christoph Borchardt [Wed, 30 Jul 2014 16:36:51 +0000 (18:36 +0200)]
Merge pull request #10044 from owncloud/transparency_fix

extract transparency fix from #8050

10 years agoMerge pull request #10029 from owncloud/fix-thirdparty
Morris Jobke [Wed, 30 Jul 2014 16:34:55 +0000 (18:34 +0200)]
Merge pull request #10029 from owncloud/fix-thirdparty

Fix silent crash if 3rdparty dir is not available

10 years agoset max width for notifications so they won't overlap the whole header
Jan-Christoph Borchardt [Wed, 30 Jul 2014 16:16:32 +0000 (18:16 +0200)]
set max width for notifications so they won't overlap the whole header

10 years agofix yellow notification style
Jan-Christoph Borchardt [Wed, 30 Jul 2014 16:02:53 +0000 (18:02 +0200)]
fix yellow notification style

10 years agofix notification preventing top bar clickability, fix #9680
Jan-Christoph Borchardt [Wed, 30 Jul 2014 16:00:46 +0000 (18:00 +0200)]
fix notification preventing top bar clickability, fix #9680

10 years agoFixed wrong brackets in apps settings
Der-Jan [Fri, 25 Jul 2014 14:19:35 +0000 (16:19 +0200)]
Fixed wrong brackets in apps settings

10 years agoMerge pull request #10024 from owncloud/preview-restrict-height
Morris Jobke [Wed, 30 Jul 2014 15:22:20 +0000 (17:22 +0200)]
Merge pull request #10024 from owncloud/preview-restrict-height

Also keep maxY into account when scaling a preview while preserving aspect ratio

10 years agoMerge pull request #9897 from owncloud/support_webdav_copy
Björn Schießle [Wed, 30 Jul 2014 15:21:32 +0000 (17:21 +0200)]
Merge pull request #9897 from owncloud/support_webdav_copy

add support for webdav copy to the encryption and versions app

10 years agodon't preload videos on public sharing, fixes #10042
Georg Ehrke [Wed, 30 Jul 2014 15:06:41 +0000 (17:06 +0200)]
don't preload videos on public sharing, fixes #10042

10 years agoMerge pull request #10000 from owncloud/fix-lowlat-cache-autoload
Jörn Friedrich Dreyer [Wed, 30 Jul 2014 14:56:45 +0000 (16:56 +0200)]
Merge pull request #10000 from owncloud/fix-lowlat-cache-autoload

Cache factory needs to use globalPrefix in createLowLatency()

10 years agoUse svg mimeicons for empty text files
Robin Appelman [Wed, 30 Jul 2014 14:29:18 +0000 (16:29 +0200)]
Use svg mimeicons for empty text files

10 years agoextract transparency fix from #8050
Georg Ehrke [Wed, 30 Jul 2014 10:16:03 +0000 (12:16 +0200)]
extract transparency fix from #8050

10 years agoadd unit test for rename and copy operation
Bjoern Schiessle [Thu, 24 Jul 2014 14:49:38 +0000 (16:49 +0200)]
add unit test for rename and copy operation

10 years agomake sure that we always find all versions
Bjoern Schiessle [Thu, 24 Jul 2014 16:54:12 +0000 (18:54 +0200)]
make sure that we always find all versions

10 years agomake the versions and encryption app aware of the copy operation
Bjoern Schiessle [Thu, 24 Jul 2014 13:30:00 +0000 (15:30 +0200)]
make the versions and encryption app aware of the copy operation

10 years agoMerge pull request #9970 from owncloud/sharing_set_expire_date
Morris Jobke [Wed, 30 Jul 2014 12:37:16 +0000 (14:37 +0200)]
Merge pull request #9970 from owncloud/sharing_set_expire_date

Sharing set expire date

10 years agotypo fix from transifex suggestion
Volkan Gezer [Tue, 29 Jul 2014 15:47:42 +0000 (17:47 +0200)]
typo fix from transifex suggestion

10 years agoReplace exit with return
Victor Dubiniuk [Tue, 29 Jul 2014 19:45:24 +0000 (22:45 +0300)]
Replace exit with return

10 years agoFix silent crash if 3rdparty dir is not available
Victor Dubiniuk [Tue, 29 Jul 2014 19:07:12 +0000 (22:07 +0300)]
Fix silent crash if 3rdparty dir is not available

10 years agoAlso keep maxY into account when scaling a preview while preserving aspect ratio
Robin Appelman [Tue, 29 Jul 2014 15:23:44 +0000 (17:23 +0200)]
Also keep maxY into account when scaling a preview while preserving aspect ratio

10 years agoMerge pull request #10032 from owncloud/kill-swift-tests
Morris Jobke [Wed, 30 Jul 2014 11:47:03 +0000 (13:47 +0200)]
Merge pull request #10032 from owncloud/kill-swift-tests

only if the environment variable RUN_OBJECTSTORE_TESTS is set the object...

10 years agoMerge pull request #10041 from owncloud/design-link-folder-icon
Morris Jobke [Wed, 30 Jul 2014 11:19:42 +0000 (13:19 +0200)]
Merge pull request #10041 from owncloud/design-link-folder-icon

also use link icon for the folders ..

10 years agoMerge pull request #9888 from owncloud/mysql-tinyint-master
Thomas Müller [Wed, 30 Jul 2014 09:48:10 +0000 (11:48 +0200)]
Merge pull request #9888 from owncloud/mysql-tinyint-master

migration test for sqlite - adding type mapping for 'tinyint unsigned'

10 years agoalso use link icon for the folders ..
Jan-Christoph Borchardt [Wed, 30 Jul 2014 09:07:16 +0000 (11:07 +0200)]
also use link icon for the folders ..

10 years agoMerge pull request #9914 from owncloud/fix-appframework-blank-template
Thomas Müller [Wed, 30 Jul 2014 08:31:15 +0000 (10:31 +0200)]
Merge pull request #9914 from owncloud/fix-appframework-blank-template

Fix template rendering for 'blank' templates

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 30 Jul 2014 05:55:32 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agoonly if the environment variable RUN_OBJECTSTORE_TESTS is set the object store unit...
Thomas Müller [Tue, 29 Jul 2014 19:51:21 +0000 (21:51 +0200)]
only if the environment variable RUN_OBJECTSTORE_TESTS is set the object store unit test will be executed

10 years agoMerge pull request #10022 from owncloud/fix-exec-admin-master
Thomas Müller [Tue, 29 Jul 2014 19:28:52 +0000 (21:28 +0200)]
Merge pull request #10022 from owncloud/fix-exec-admin-master

only call exec() if allowed to

10 years agoMerge pull request #10020 from owncloud/design-link-icon
Jan-Christoph Borchardt [Tue, 29 Jul 2014 18:18:27 +0000 (20:18 +0200)]
Merge pull request #10020 from owncloud/design-link-icon

use more understandable 'link' icon for public links (instead of hard to recognize globe)

10 years agoonly call exec() if allowed to
Thomas Müller [Tue, 29 Jul 2014 14:59:40 +0000 (16:59 +0200)]
only call exec() if allowed to

10 years agoFix template rendering for 'blank' templates
Morris Jobke [Fri, 25 Jul 2014 22:04:49 +0000 (00:04 +0200)]
Fix template rendering for 'blank' templates

10 years agoMerge pull request #9721 from owncloud/enc_define_type_in_pre_hook
Björn Schießle [Tue, 29 Jul 2014 14:29:28 +0000 (16:29 +0200)]
Merge pull request #9721 from owncloud/enc_define_type_in_pre_hook

[encryption] define type in pre hook

10 years agoMerge pull request #9951 from owncloud/enc_inproved_error_messages
Björn Schießle [Tue, 29 Jul 2014 14:27:24 +0000 (16:27 +0200)]
Merge pull request #9951 from owncloud/enc_inproved_error_messages

show a warning in the personal settings and admin settins if the encyption keys are not initialized

10 years agouse more understandable 'link' icon for public links (instead of hard to recognize...
Jan-Christoph Borchardt [Tue, 29 Jul 2014 12:53:43 +0000 (14:53 +0200)]
use more understandable 'link' icon for public links (instead of hard to recognize globe), fix #9707

10 years agoMerge pull request #9988 from owncloud/sharing_remove_share_permission
Björn Schießle [Tue, 29 Jul 2014 12:05:13 +0000 (14:05 +0200)]
Merge pull request #9988 from owncloud/sharing_remove_share_permission

remove share permission if user is excluded from sharing

10 years agoMerge pull request #9983 from owncloud/sharing_add_unshare_to_overview
Björn Schießle [Tue, 29 Jul 2014 12:00:57 +0000 (14:00 +0200)]
Merge pull request #9983 from owncloud/sharing_add_unshare_to_overview

update attributes for share-with-user view

10 years agoAdd registerAutoloaderCache().
Andreas Fischer [Tue, 29 Jul 2014 09:18:40 +0000 (11:18 +0200)]
Add registerAutoloaderCache().

10 years agoMemcache\Factory: Remove static, use globalPrefix.
Andreas Fischer [Tue, 29 Jul 2014 09:14:36 +0000 (11:14 +0200)]
Memcache\Factory: Remove static, use globalPrefix.

10 years agoInstanceId is properly injected into factory. Remove comment.
Andreas Fischer [Tue, 29 Jul 2014 09:03:10 +0000 (11:03 +0200)]
InstanceId is properly injected into factory. Remove comment.

10 years agoremove share permission if user is excluded from sharing
Bjoern Schiessle [Mon, 28 Jul 2014 20:35:11 +0000 (22:35 +0200)]
remove share permission if user is excluded from sharing

10 years agomigration test for sqlite - adding type mapping for 'tinyint unsigned'
Thomas Müller [Fri, 25 Jul 2014 06:46:43 +0000 (08:46 +0200)]
migration test for sqlite - adding type mapping for 'tinyint unsigned'

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 29 Jul 2014 05:55:45 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #9989 from owncloud/fix-failing-unit-test-master
Thomas Müller [Tue, 29 Jul 2014 05:44:23 +0000 (07:44 +0200)]
Merge pull request #9989 from owncloud/fix-failing-unit-test-master

function declaration did not match

10 years agofunction declaration did not match
Thomas Müller [Mon, 28 Jul 2014 20:38:56 +0000 (22:38 +0200)]
function declaration did not match

10 years agoadd unit test
Bjoern Schiessle [Mon, 28 Jul 2014 15:19:19 +0000 (17:19 +0200)]
add unit test

10 years agomake sure that we set the expire date if a date is adefault date is set
Bjoern Schiessle [Mon, 28 Jul 2014 15:13:17 +0000 (17:13 +0200)]
make sure that we set the expire date if a date is adefault date is set

10 years agoMerge pull request #9945 from owncloud/remove-mssql-bundle-master
Thomas Müller [Mon, 28 Jul 2014 20:44:40 +0000 (22:44 +0200)]
Merge pull request #9945 from owncloud/remove-mssql-bundle-master

remove MssqlBundle

10 years agoremove MssqlBundle
Thomas Müller [Mon, 28 Jul 2014 07:47:08 +0000 (09:47 +0200)]
remove MssqlBundle

10 years agoupdate attributes for share with user list, file should always have delete permission...
Bjoern Schiessle [Mon, 28 Jul 2014 20:04:13 +0000 (22:04 +0200)]
update attributes for share with user list, file should always have delete permissions, this means unshare in this context, and the overview page is always a root view

10 years agoMerge pull request #9758 from owncloud/share-expdatefix
Björn Schießle [Mon, 28 Jul 2014 15:58:26 +0000 (17:58 +0200)]
Merge pull request #9758 from owncloud/share-expdatefix

Fix enforced share expiration date to be based on share time

10 years agoMerge pull request #9798 from owncloud/ocs_share_api_add_expire_date
Björn Schießle [Mon, 28 Jul 2014 15:28:32 +0000 (17:28 +0200)]
Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date

[share api] add OCS api call to set expire date for link shares

10 years agoMerge pull request #9949 from owncloud/fixing-sqlite-migration-shared-hoster
Morris Jobke [Mon, 28 Jul 2014 14:54:52 +0000 (16:54 +0200)]
Merge pull request #9949 from owncloud/fixing-sqlite-migration-shared-hoster

generate copy of sqlite database file in data directory

10 years agoMerge pull request #9924 from owncloud/eventsource-nginx-buffering
Robin Appelman [Mon, 28 Jul 2014 14:17:35 +0000 (16:17 +0200)]
Merge pull request #9924 from owncloud/eventsource-nginx-buffering

Prevent nginx from buffering event source events