wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12167 commits 157 branches 562 tags 714 MiB
Commit graph

5820 commits

Author SHA1 Message Date
Björn Schießle
d10ad0d603 Squashed commit of the following: 
commit 1345201c9da99a82f198e41fba24da6b0d7ae59a
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 16:27:46 2013 +0200

    add l10n support

commit bf2c79c8de8710e839a4a55642a91874c374fa1c
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 16:19:10 2013 +0200

    only init session if openssl extension is loaded

commit cbd52af6afbaa310bb1a534db64ff5e476dfd5d7
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:25:40 2013 +0200

    first disable app and than show error page

commit 55baf593179c433642de59552592e6b0f1932880
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:17:34 2013 +0200

    typo fixed

commit 1d9bef0b058e7cc3d511b81ae12d5a07660c75b2
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:15:40 2013 +0200

    move dependency check to the encryption app

commit c186e95da526f0470e20f014f1bd9513db5518ff
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 11:13:11 2013 +0200

    make sure that openssl is installed and loaded
 2013-06-21 10:37:51 +02:00
Jenkins for ownCloud
8c923a85de [tx-robot] updated from transifex 2013-06-21 08:53:57 +02:00
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
Jan-Christoph Borchardt
2a57763542 use history icon in Deleted Files template as well 2013-06-17 13:30:57 +02:00
Jan-Christoph Borchardt
d9dcba9a39 remove unused loading spinners, just have one 2013-06-17 12:35:25 +02:00
Jan-Christoph Borchardt
257ebc2830 use consistent icon for 'restore'/versions/history, also SVG 2013-06-17 12:18:45 +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
Morris Jobke
e0547a25ab if rename of file fails, the rename is undone in the view - #fix 2820 
Changes:
 * OC.dialog -> OC.Notification
 * Added test
 * Fixed OC.Notification.show() issue for queued items
 * Highlight failed item and show notification
 2013-06-15 09:58:27 +02: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
Björn Schießle
db06b906e5 Merge pull request #3610 from owncloud/encryption_recovery_for_ldap 
recover encryption keys if ownCloud can't change the log-in password
 2013-06-10 02:03:56 -07:00
Jörn Friedrich Dreyer
b6f8d2b859 raise failed tests from first commit to size @medium 2013-06-10 10:17:47 +02:00
Jörn Friedrich Dreyer
124f34422c add missing backticks all over the place 2013-06-10 09:53:29 +02:00
Jörn Friedrich Dreyer
73fb722a9e add timeouts 3/30/90 to phpunit tests 2013-06-10 09:31:22 +02:00
Jenkins for ownCloud
3c79d89492 [tx-robot] updated from transifex 2013-06-08 02:13:41 +02:00
Jenkins for ownCloud
67c085417c [tx-robot] updated from transifex 2013-06-07 02:17:50 +02:00
Thomas Mueller
058c15a9f4 Read configuratons for external filesystem test from a private place. 
This will help not to accidentially push private data and enable testing on our ci server.
 2013-06-07 00:04:46 +02:00
Björn Schießle
d7a9852f7b use pre_setPassword hook to update the encryption keys if the back-end doesn't support password change; improved output to let the admin know what happened 2013-06-06 13:32:02 +02:00
Jenkins for ownCloud
81b6cab94f [tx-robot] updated from transifex 2013-06-06 02:21:31 +02:00
Björn Schießle
7fc5151d95 add a hint that the admin can recover your files; Don't let the user change the recovery settings if no private key is set 2013-06-05 18:53:02 +02:00
Björn Schießle
036732c249 allow to press enter to update the password 2013-06-05 14:51:51 +02:00
Björn Schießle
be324fad1c tell the user what he can do to regain access to his files 2013-06-05 14:19:26 +02:00
Björn Schießle
57bda411d1 only show personal settings if the recovery feature is enabled or if no private key is set 2013-06-05 13:51:28 +02:00
Jenkins for ownCloud
666a5c1cc7 [tx-robot] updated from transifex 2013-06-05 02:01:42 +02:00
Florin Peter
055c901091 improved error msg and removed duplicate string 2013-06-04 22:31:36 +02:00
Björn Schießle
7bbd85b6e5 improved label for the password recovery feature 2013-06-04 21:19:42 +02:00
Björn Schießle
4ee7a428ae link directly to the encryption settings 2013-06-04 10:49:58 +02:00
Arthur Schiwon
4976f2e0d3 LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600 2013-06-04 10:32:54 +02:00
Florin Peter
14ac4fab05 better handling for http post 2013-06-04 00:41:47 +02:00
Florin Peter
ef97481a0d changed redirect handling 2013-06-03 23:41:57 +02:00
Florin Peter
b46e7323ec fixed typo 2013-06-03 19:10:55 +02:00
Florin Peter
dc8bcf0688 reformat code 2013-06-03 18:42:13 +02:00
Björn Schießle
1e601cd6f1 use generated private key fro m setUp() 2013-06-03 17:43:06 +02:00
Björn Schießle
35c91ff901 added test for decryptPrivateKey() 2013-06-03 17:34:43 +02:00
icewind1991
8c991d97aa Merge pull request #3561 from owncloud/user 
Refactor of user management
 2013-06-03 08:13:40 -07:00
Björn Schießle
b5820af3cc let user update private key password in case it was changed from outside, e.g. external auth back-ends 2013-06-03 15:27:31 +02:00
Björn Schießle
b02f4dc62c $session->setPrivateKey expects only one parameter 2013-06-03 15:26:58 +02:00
Björn Schießle
42f66af5a3 control files are no longer needed, remove them from the tests 2013-06-03 14:21:30 +02:00
Björn Schießle
471d2b732c introduce decryptPrivateKey() method which also checks if the result is a valid private key to avoid additional checks on various places 2013-06-03 14:19:31 +02:00
icewind1991
2a81813e44 Merge pull request #3051 from owncloud/backgroundjob 
Reworked background job system.
 2013-06-02 14:29:59 -07:00
Frank Karlitschek
9392d2d58e Merge pull request #3567 from owncloud/fixing-3466 
In cases where smb4php returns false of an empty array stat/( has to ret...
 2013-06-02 14:04:55 -07:00
Robin Appelman
e1b5598f00 Files: use public api to register backgroundjob 2013-06-02 21:21:39 +02:00
Robin Appelman
251527c6e6 merge master into backgroundjob 2013-06-02 20:12:44 +02:00
Jenkins for ownCloud
cf71a54f5d [tx-robot] updated from transifex 2013-06-02 02:07:21 +02:00
Jenkins for ownCloud
3013c02767 [tx-robot] updated from transifex 2013-06-01 02:03:53 +02:00
Thomas Mueller
1d7d5d2894 In cases where smb4php returns false of an empty array stat/( has to return false. 
Fixes #3466 because the test method of external filesystems uses stat() to detect if the given parameters are okay.

Changes to 3rdparty are necessary as well:
https://github.com/owncloud/3rdparty/pull/33
 2013-06-01 00:06:23 +02:00
Florin Peter
46e5e9bd73 cleanup unused method legacyKeyRecryptKeyfile 2013-05-31 22:49:32 +02:00
blizzz
1656cc2e7c Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_js 
Fix ldap sqlite n js
 2013-05-31 12:17:46 -07:00
Florin Peter
d85a10ebc5 fix broken tests 2013-05-31 20:55:05 +02:00
Florin Peter
8761242f52 Merge branch 'master' into files_encryption_upgrade_fix 
Conflicts:
	apps/files_encryption/appinfo/app.php
 2013-05-31 20:34:43 +02:00
blizzz
eafb241068 Merge pull request #3562 from owncloud/fix_ldap_offline_host_handling 
Fix ldap offline host handling
 2013-05-31 11:10:33 -07:00
Arthur Schiwon
2ff9677cd1 LDAP: sqlite compatibility for emptyiing tables 2013-05-31 20:07:13 +02:00
Arthur Schiwon
c49ee4d3e3 LDAP: fix setting value of checkbox after loading configuration 2013-05-31 20:06:40 +02:00
Florin Peter
a134ffcf2c code optimized and cleaned up unused vars 2013-05-31 16:52:33 +02:00
Florin Peter
e9d1ea712c allow the user to login but do not allow upload and show error message on the web 2013-05-31 15:57:18 +02:00
Florin Peter
2e3bfdb12c check if the decrypted private key is valid on login and on read/write files 2013-05-31 13:58:58 +02:00
Florin Peter
1bfe975938 Merge branch 'master' into files_encryption_upgrade_fix 
Conflicts:
	apps/files_encryption/lib/util.php
 2013-05-31 12:58:12 +02:00
Florin Peter
1c4c89418b also fix login errors while filesystem is not loaded in app.php 2013-05-31 12:56:08 +02:00
Florin Peter
88d74c33af Merge branch 'master' into files_encryption_fs_loaded_fix 2013-05-31 12:49:46 +02:00
FlorinPeter
d636e168a6 Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes 
File encryption external storage fixes
 2013-05-31 03:21:46 -07:00
Florin Peter
4a0e69f941 fix login errors while filesystem is not loaded 2013-05-31 11:55:40 +02:00
Jenkins for ownCloud
a730a72dcb [tx-robot] updated from transifex 2013-05-31 02:04:40 +02:00
Florin Peter
96ef926161 normalize path to prevent following split to fail 2013-05-31 01:57:32 +02:00
Florin Peter
ccdfb59426 fix legacy key in until test 2013-05-31 01:55:48 +02:00
Florin Peter
8e324aad38 fix re-encrypt legacy files 2013-05-31 01:36:49 +02:00
Florin Peter
986e9dd362 use legacyDecrypt to decrypt key file like the previous files_encryption 2013-05-31 01:35:48 +02:00
Florin Peter
4f9cbadfa4 fix for autoloader while user logged in and system is in maintenance 2013-05-31 01:34:31 +02:00
Florin Peter
eaa4f92275 added our own file extension .part will not work here if we use file_get_contents so we used our own extension '.etmp' 2013-05-30 22:07:36 +02:00
Florin Peter
b3834b49c3 prevent files_versions from calling file proxy which calls files_encryption and do unnecessary load and file operations 2013-05-30 22:05:52 +02:00
Arthur Schiwon
bd7771867b LDAP: fix generation of alternate internal name on conflicts. Use also smaller number for better user experience on e.g. *DAV links 2013-05-30 16:55:21 +02:00
icewind1991
aa1c5a5d63 Merge pull request #3529 from owncloud/folder-permissions 
Cache: provide a function to get the permissions of all files in a folder with one query
 2013-05-30 05:54:29 -07:00
Jenkins for ownCloud
8e1d9261aa [tx-robot] updated from transifex 2013-05-30 02:34:14 +02:00
Florin Peter
6d94b393bf fix share and un-share for single file 2013-05-30 01:38:11 +02:00
Florin Peter
8c17f26226 fixed problems with file_get_contents and file_put_contents this problem was related to text editor with big text files 2013-05-30 01:13:22 +02:00
Florin Peter
313631edf6 Merge branch 'master' into file_encryption_external_storage_fixes 
Conflicts:
	apps/files_encryption/hooks/hooks.php
 2013-05-30 00:45:29 +02:00
Michael Gapczynski
5a47054505 Implement getDirectoryPermissions() in Shared Permissions, fixes #2846 2013-05-29 18:22:54 -04:00
Florin Peter
d59ae569ba reformat code 2013-05-29 23:13:45 +02:00
Florin Peter
838fd1a20a changed " to ' 2013-05-29 23:11:30 +02:00
Florin Peter
ee7c4c4c93 changed l10n to full sentences 2013-05-29 20:27:12 +02:00
Florin Peter
df41a60c50 fixed typo 2013-05-29 20:11:53 +02:00
Florin Peter
1202ab9995 Merge branch 'master' into file_encryption_external_storage_fixes 2013-05-29 19:19:40 +02:00
Florin Peter
d265264542 fix for share folder on external storage 2013-05-29 19:11:39 +02:00
Björn Schießle
b44192f366 check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages 2013-05-29 13:10:26 +02:00
Florin Peter
5dd865a57f changes l10n after review 2013-05-29 12:47:50 +02:00
Florin Peter
efd629462e changes after review 2013-05-29 12:23:33 +02:00
Florin Peter
c398fc59ad Merge branch 'master' into remove_unused_vars 
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/lib/session.php
	apps/files_encryption/lib/stream.php
 2013-05-29 09:21:00 +02:00
Jenkins for ownCloud
7c0c6bd779 [tx-robot] updated from transifex 2013-05-29 02:10:54 +02:00
Florin Peter
71a532fc4d fixed if fopen returns false typically on external storage 2013-05-28 20:50:14 +02:00
Florin Peter
4b4b447e2a fixed missing convert to new session handler 2013-05-28 17:06:37 +02:00
Florin Peter
6ae7bde788 fixed encryption session namespace to avoid problems 2013-05-28 17:04:35 +02:00
Robin Appelman
cc0cf93136 merge master into sessionclass 2013-05-28 14:55:42 +02:00
Florin Peter
09b54ccb2b Merge branch 'master' into remove_unused_vars 
Conflicts:
	apps/files_encryption/lib/session.php
	apps/files_encryption/lib/util.php
 2013-05-28 11:00:49 +02:00
Björn Schießle
3a76c22372 $_POST["adminEnableRecovery"] is a string 2013-05-28 10:51:12 +02:00
Florin Peter
0041711fe3 fix for undefined index 2013-05-28 09:36:14 +02:00
Florin Peter
6f9e425939 fix for losing private key while being logged in and accessing a public link 2013-05-28 09:27:04 +02:00
Jenkins for ownCloud
3420d853ab [tx-robot] updated from transifex 2013-05-28 02:07:51 +02:00
Robin Appelman
9c99048429 fix syntax error 2013-05-28 01:31:26 +02:00
Robin Appelman
44f9af5a7f Use the new session wrapper 2013-05-28 01:04:09 +02:00
Florin Peter
e1e1c58969 changed to public log api 2013-05-27 20:51:52 +02:00
Florin Peter
7224fc98b2 replace == with === and replace != with !== 2013-05-27 20:44:38 +02:00
Florin Peter
6075aff687 changed basic auth to test user 2013-05-27 20:32:59 +02:00
Björn Schießle
2c3c60c1af Merge branch 'master' into remove_unused_vars 
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/proxy.php
 2013-05-27 18:09:35 +02:00
Björn Schießle
c81e34ef89 replace == with === 2013-05-27 18:03:29 +02:00
Björn Schießle
4c05259ccf legacyBlockDecryprt() needs to be public 2013-05-27 17:35:38 +02:00