Commit Graph

5712 Commits

Author SHA1 Message Date
Björn Schießle c4aa3fac7e Merge pull request #3788 from owncloud/more_error_messages
add some more error messages, in case something went wrong
2013-06-20 02:12:01 -07:00
Thomas Müller 5aaf807366 Merge pull request #3784 from owncloud/rescan-all
Give admins the ability to rescan the filesystem for multiple users at once
2013-06-20 01:41:49 -07:00
Jenkins for ownCloud 01ab79d460 [tx-robot] updated from transifex 2013-06-20 02:43:39 +02:00
Björn Schießle fe61230cc1 always have a defined return value 2013-06-19 16:55:31 +02:00
Björn Schießle e2e370f199 some more error messages 2013-06-19 15:58:34 +02:00
Björn Schießle 83d98e2d8b add some more error messages, in case something went wrong 2013-06-19 15:52:33 +02:00
Robin Appelman 6778a45d45 use json to encode user list 2013-06-19 15:02:18 +02:00
icewind1991 cb41b88520 Merge pull request #3764 from owncloud/scanfolder-existing
Improve re-using existing data in the filescanner
2013-06-19 04:30:55 -07:00
Robin Appelman 85585ede02 allow scanning files for multiple users 2013-06-19 01:26:08 +02:00
Jenkins for ownCloud d991a9372b [tx-robot] updated from transifex 2013-06-18 02:11:10 +02:00
Björn Schießle 99c62dfd76 Merge branch 'master' into fix_glob_escaping
Conflicts:
	apps/files_trashbin/lib/trash.php
2013-06-17 14:51:08 +02:00
Björn Schießle efb026c664 don't normalize absolute local path 2013-06-17 14:42:18 +02:00
Jenkins for ownCloud 6156d71832 [tx-robot] updated from transifex 2013-06-17 02:08:11 +02:00
Jenkins for ownCloud 8243d19050 [tx-robot] updated from transifex 2013-06-16 02:07:45 +02:00
Morris Jobke c99e7e97a3 Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folder
Fix inexisting trashbin's sub-folders
2013-06-15 01:31:32 -07:00
Jenkins for ownCloud ab411d2700 [tx-robot] updated from transifex 2013-06-15 02:07:18 +02:00
Thomas Müller 126a0cac8d Merge pull request #3473 from opensaucesystems/master
Small update to user_webdavauth
2013-06-14 11:31:23 -07:00
Robin Appelman 398fe8bf32 reuse etag when doing a forced rescan 2013-06-14 17:05:52 +02:00
Björn Schießle c3371812a0 fix indention 2013-06-14 15:14:23 +02:00
Björn Schießle f91b02e9b6 only escape glob pattern 2013-06-14 15:07:06 +02:00
Björn Schießle a8a60d761b Merge pull request #3715 from owncloud/fixes_for_3641_3620
files_encryption: bug fixes for reported problems.
2013-06-14 01:38:15 -07:00
Jenkins for ownCloud 6c534c8165 [tx-robot] updated from transifex 2013-06-14 02:52:34 +02:00
Florin Peter 8566881758 fix for path_hash not unique as reported at #3641 2013-06-13 20:52:34 +02:00
Florin Peter 35da408222 fix memory problems as reported at #3620 2013-06-13 20:51:22 +02:00
Björn Schießle 7889f2ef5c Merge pull request #3687 from owncloud/template_updates
Make templates aware of different owncloud editions
2013-06-13 07:32:41 -07:00
Björn Schießle 15eda53215 improved footer 2013-06-13 16:10:33 +02:00
Björn Schießle 7cfb0dc406 Merge branch 'master' into files_encryption_check_private_key
Conflicts:
	apps/files_encryption/appinfo/app.php
	apps/files_encryption/lib/util.php
2013-06-13 13:17:35 +02:00
Björn Schießle bc2862fcb9 Merge branch 'master' into files_encryption_upgrade_fix 2013-06-13 12:53:29 +02:00
Björn Schießle 2b179ccff0 Merge pull request #3668 from owncloud/encryption_migrate_only_once
make sure that only one process can enter the migration mode
2013-06-13 03:31:31 -07:00
Björn Schießle 2f1005f05f LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed 2013-06-13 10:44:05 +02:00
Björn Schießle 6394fedb33 add comment to explain the helper function 2013-06-13 10:35:30 +02:00
Björn Schießle 77944cf7b8 fix typo in var name 2013-06-13 10:11:23 +02:00
Björn Schießle 27fcdb3af5 Merge branch 'master' into files_encryption_upgrade_fix
Conflicts:
	apps/files_encryption/tests/crypt.php
2013-06-12 20:53:45 +02:00
Roland Hager 2df8468b2f Revert "FIX: Download of files named "true" or "false" impossible"
This reverts commit d2d71c8797.
which was accidentally commited
2013-06-12 18:30:28 +02:00
Roland Hager d2d71c8797 FIX: Download of files named "true" or "false" impossible
It was not possible to download a file called "true" or "false" (caseinsensitive) when clicking the link "download" due to the result of json_decode().
Both cases are now implicitly checked.

Hotfix provided by Herbert Pophal
2013-06-12 17:25:21 +02:00
Björn Schießle 7273f38af6 make pub link share footer aware of different owncloud editions 2013-06-12 16:28:47 +02:00
Björn Schießle df78085171 adapt test to the code changes 2013-06-12 14:00:53 +02:00
Björn Schießle c78a90fd54 use number of manipulated rows as idicator if it was possible to enter the migration mode 2013-06-12 12:21:11 +02:00
Björn Schießle 519508736d disable proxys during ssl root cert upload to avoid encryption 2013-06-12 10:37:09 +02:00
Björn Schießle 506c9de5cd backport of 1fa76e53dc 2013-06-12 10:30:54 +02:00
Björn Schießle 20ddd6e1c7 Merge branch 'master' into files_encryption_check_private_key
Conflicts:
	apps/files_encryption/tests/crypt.php
2013-06-11 15:19:02 +02:00
Jan-Christoph Borchardt 5d4ff0e537 better contrast for files list, darker greys for selection and hover 2013-06-11 14:49:34 +02:00
Jan-Christoph Borchardt 0872f641dd darker low threshold color for file size and age fading, better contrast 2013-06-11 14:30:13 +02:00
Björn Schießle 3ec6b19cdf use constants for different migration status 2013-06-11 13:07:39 +02:00
Björn Schießle 5fafd55108 make sure that only one process can enter the migration mode 2013-06-11 12:03:50 +02:00
Thomas Müller 74b1f7d448 Merge pull request #3646 from owncloud/introduce_phpunit_timeouts
add timeouts 3/30/90 to phpunit tests
2013-06-11 01:52:10 -07:00
Jenkins for ownCloud 4f0f537b42 [tx-robot] updated from transifex 2013-06-11 02:02:44 +02:00
Jörn Friedrich Dreyer c70a0f791d allow 30 sec for testDeleteFile 2013-06-10 14:45:39 +02:00
Morris Jobke 1da112750e Merge pull request #3647 from owncloud/missing_backticks
add missing backticks all over the place
2013-06-10 05:15:07 -07:00
Björn Schießle 13017ce9e1 Merge branch 'master' into files_encryption_check_private_key
Conflicts:
	settings/ajax/changepassword.php
2013-06-10 12:12:07 +02:00