]>
source.dussan.org Git - nextcloud-server.git/log
Vincent Petry [Wed, 13 Aug 2014 10:34:21 +0000 (12:34 +0200)]
Merge pull request #9754 from owncloud/enc_support_aes_256
[encryption] support aes 256
Thomas Müller [Wed, 13 Aug 2014 09:10:18 +0000 (11:10 +0200)]
Merge pull request #10333 from owncloud/tar-55
Fix Tar support for php >=5.5
Jenkins for ownCloud [Wed, 13 Aug 2014 05:54:44 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Tue, 12 Aug 2014 21:15:09 +0000 (23:15 +0200)]
Merge pull request #10377 from owncloud/git-fixes
fixes from git push force
Morris Jobke [Tue, 12 Aug 2014 19:29:05 +0000 (21:29 +0200)]
fixes from git push force
Bjoern Schiessle [Tue, 12 Aug 2014 13:16:16 +0000 (15:16 +0200)]
fix broken variable name, recoveryPasswordSupported is now recoveryEnabledForUser
Bjoern Schiessle [Tue, 5 Aug 2014 13:55:28 +0000 (15:55 +0200)]
add unit tests
Bjoern Schiessle [Tue, 5 Aug 2014 13:25:52 +0000 (15:25 +0200)]
fix detection of system wide mount points
Robin Appelman [Tue, 12 Aug 2014 12:29:17 +0000 (14:29 +0200)]
Merge pull request #9762 from owncloud/owner-public
Return the proper owner for home storages
Volkan Gezer [Tue, 12 Aug 2014 11:56:33 +0000 (13:56 +0200)]
Merge pull request #10357 from owncloud/l10n-alert-fix
Fix alert text
Jenkins for ownCloud [Tue, 12 Aug 2014 05:56:16 +0000 (01:56 -0400)]
[tx-robot] updated from transifex
Volkan Gezer [Mon, 11 Aug 2014 23:13:30 +0000 (01:13 +0200)]
Fix alert text
Volkan Gezer [Mon, 11 Aug 2014 21:35:05 +0000 (23:35 +0200)]
Merge pull request #10347 from owncloud/fix-grammar
Transifex suggestion by mnestis
Clark Tomlinson [Mon, 11 Aug 2014 20:16:18 +0000 (16:16 -0400)]
Merge pull request #10335 from owncloud/fix-emptyapplist
Fix issue when no apps are enabled
Thomas Müller [Mon, 11 Aug 2014 20:11:11 +0000 (22:11 +0200)]
Merge pull request #9890 from owncloud/check-php-charset-master
setting and checking default_charset in php.ini to be UTF-8
Volkan Gezer [Mon, 11 Aug 2014 19:31:15 +0000 (21:31 +0200)]
Transifex suggestion by mnestis
Vincent Petry [Mon, 11 Aug 2014 13:32:56 +0000 (15:32 +0200)]
Fix issue when no apps are enabled
Properly initialize $apps array
Clark Tomlinson [Mon, 11 Aug 2014 16:15:36 +0000 (12:15 -0400)]
Removing ini charset override due to shared hosting issues
Björn Schießle [Mon, 11 Aug 2014 15:39:04 +0000 (17:39 +0200)]
Merge pull request #10336 from owncloud/fix_share_drop_down
remove 'no people found' entry in share dialog
blizzz [Mon, 11 Aug 2014 14:58:30 +0000 (16:58 +0200)]
Merge pull request #9848 from dupondje/master
Fix memberOf detection. Fixes: #9835
Robin Appelman [Mon, 11 Aug 2014 12:20:57 +0000 (14:20 +0200)]
Fix Tar support for php >=5.5
Clark Tomlinson [Mon, 11 Aug 2014 14:44:47 +0000 (10:44 -0400)]
Merge pull request #10066 from marc0s/issues/10065-fix-null-check
Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOT
Bjoern Schiessle [Mon, 11 Aug 2014 14:03:47 +0000 (16:03 +0200)]
remove 'no people found' entry
Thomas Müller [Mon, 11 Aug 2014 12:40:47 +0000 (14:40 +0200)]
Merge pull request #10251 from owncloud/fix-dav-attributes-master
shared files/folders are not mounted
Jean-Louis Dupond [Mon, 11 Aug 2014 11:50:13 +0000 (13:50 +0200)]
Fix initializing in #9848
Vincent Petry [Mon, 11 Aug 2014 11:33:39 +0000 (13:33 +0200)]
Merge pull request #10301 from owncloud/fix-internal-mail-share-links
Don't use /Shared as a base for links in share email
Jörn Friedrich Dreyer [Mon, 11 Aug 2014 11:32:16 +0000 (13:32 +0200)]
Merge pull request #10096 from owncloud/fix-6971-master
in case $_POST['itemSourceName'] does not exist we simply default it to ...
Robin Appelman [Mon, 11 Aug 2014 11:10:45 +0000 (13:10 +0200)]
Merge pull request #10303 from owncloud/sharing-breadcrumb-folder-name
use OC_Util::basename
Thomas Müller [Mon, 11 Aug 2014 11:02:01 +0000 (13:02 +0200)]
Merge pull request #10249 from mroi/patch-1
file size on non-(Linux/BSD/Windows)-installations
Thomas Müller [Mon, 11 Aug 2014 10:55:39 +0000 (12:55 +0200)]
Merge pull request #10312 from owncloud/fix-old-japanese
fix old Japanese language code redirection
Jean-Louis Dupond [Mon, 11 Aug 2014 07:15:56 +0000 (09:15 +0200)]
Fix remarks in #9848
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
Jenkins for ownCloud [Mon, 11 Aug 2014 05:54:32 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 10 Aug 2014 05:55:15 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
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
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...
Volkan Gezer [Sat, 9 Aug 2014 14:52:08 +0000 (16:52 +0200)]
fix old Japanese language code redirection
ja_JP has not been updated since March and the reference
to this language should be removed. It also exists as *ja*
on Transifex
Jenkins for ownCloud [Sat, 9 Aug 2014 05:55:08 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Jan-Christoph Borchardt [Fri, 8 Aug 2014 23:35:02 +0000 (01:35 +0200)]
remove confusing 'automatic logon rejected' message, fix #8591
Tom Needham [Fri, 8 Aug 2014 23:21:29 +0000 (00:21 +0100)]
Add scrollto to the url if sharing a file for long file lists
Tom Needham [Fri, 8 Aug 2014 23:08:45 +0000 (00:08 +0100)]
Fix link to files and folders in internal share emails
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
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
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
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
Bjoern Schiessle [Fri, 8 Aug 2014 11:58:56 +0000 (13:58 +0200)]
update unit test, min date should be always today + 1
Bjoern Schiessle [Fri, 8 Aug 2014 10:16:54 +0000 (12:16 +0200)]
remove share permissions if user is excluded from sharing
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
Bjoern Schiessle [Fri, 8 Aug 2014 09:09:17 +0000 (11:09 +0200)]
set minDate always to today + one day
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
Jenkins for ownCloud [Fri, 8 Aug 2014 05:55:11 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Jan-Christoph Borchardt [Thu, 7 Aug 2014 22:27:31 +0000 (00:27 +0200)]
trigger lazy loading earlier, fix #9823
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
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
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...
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
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
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
Thomas Müller [Thu, 7 Aug 2014 14:01:13 +0000 (16:01 +0200)]
shared files/folders are not mounted
Michael Roitzsch [Thu, 7 Aug 2014 13:41:58 +0000 (15:41 +0200)]
file size on non-(Linux/BSD/Windows)-installations
Determining the file size using the exec() method is implemented for Linux, BSD, and Windows. However, on systems matching neither platform name (like SunOS), the fall-through path will return a file size result constituting a zero size instead of an invalid null return value.
Bjoern Schiessle [Thu, 7 Aug 2014 13:26:09 +0000 (15:26 +0200)]
add logout hook to remove keys from session
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.
Tom Needham [Thu, 7 Aug 2014 12:40:52 +0000 (13:40 +0100)]
Use human readable relative date for oc-dialog-filepickers
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
Robin Appelman [Thu, 7 Aug 2014 11:40:17 +0000 (13:40 +0200)]
Merge pull request #10184 from owncloud/getbyid-node
Fix Folder::getById
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
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
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
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
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
Jenkins for ownCloud [Thu, 7 Aug 2014 05:55:10 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
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
Volkan Gezer [Wed, 6 Aug 2014 18:48:26 +0000 (20:48 +0200)]
typo fix from transifex suggestion
Dan Jones [Wed, 6 Aug 2014 18:32:21 +0000 (19:32 +0100)]
fix tiny thumbnails in public preview/share mode
Robin Appelman [Wed, 6 Aug 2014 12:57:54 +0000 (14:57 +0200)]
trim leading slash
Robin Appelman [Wed, 6 Aug 2014 11:38:14 +0000 (13:38 +0200)]
Fix SharedCache::getPathById
Robin Appelman [Wed, 6 Aug 2014 10:06:41 +0000 (12:06 +0200)]
return null instead of throwing an exception
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`
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
Jenkins for ownCloud [Wed, 6 Aug 2014 05:54:43 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
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
Bjoern Schiessle [Tue, 5 Aug 2014 18:34:32 +0000 (20:34 +0200)]
remove trailing slash from path
Bjoern Schiessle [Tue, 5 Aug 2014 18:34:18 +0000 (20:34 +0200)]
remove unused variable
Thomas Müller [Tue, 29 Jul 2014 06:34:55 +0000 (08:34 +0200)]
execute unit test for files external in separate build config
Morris Jobke [Fri, 25 Jul 2014 07:20:05 +0000 (09:20 +0200)]
Disable encryption migration tests
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
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.
Bjoern Schiessle [Tue, 5 Aug 2014 15:26:23 +0000 (17:26 +0200)]
add unit test to make sure getVersions returns the correct result
Bjoern Schiessle [Tue, 5 Aug 2014 15:25:55 +0000 (17:25 +0200)]
make sure that the versions array contains the correct path
Robin Appelman [Tue, 5 Aug 2014 14:58:10 +0000 (16:58 +0200)]
Fix Folder::getById
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
Robin Appelman [Fri, 6 Jun 2014 08:50:58 +0000 (10:50 +0200)]
Make View->shouldEmitHooks more robust
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
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
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
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
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
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...
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
Morris Jobke [Tue, 5 Aug 2014 11:18:38 +0000 (13:18 +0200)]
remove escaping because it's unneeded