mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,534 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

7411 Commits

Author SHA1 Message Date
Thomas Müller 32b29c9d73 Merge branch 'master' into fix-7307 
Conflicts:
	core/js/router.js
	settings/js/admin.js
 2014-03-06 00:15:08 +01:00
Vincent Petry 1785c0c9b9 Merge pull request #7575 from owncloud/issue/7571 
Do not set #dir when on public.php
 2014-03-05 19:57:25 +01:00
Lukas Reschke e3156fa5ad Merge pull request #7354 from pschmitt/master 
Use 'command -v' to detect whether and where software is installed (instead of 'which')
 2014-03-05 19:25:09 +01:00
Joas Schilling 1ab10cb4f7 Do not set #dir when on public.php 
Fix #7571
 2014-03-05 18:46:55 +01:00
Björn Schießle 9111af0478 Merge pull request #7531 from owncloud/dont_create_shared_folder 
don't allow to create a file or folder named 'Shared' in the root folder
 2014-03-05 18:13:31 +01:00
Jan-Christoph Borchardt 7ad7f94797 fix some spaces to tabs issues reported by Scrutinizer 2014-03-05 15:47:12 +01:00
Jan-Christoph Borchardt bd86642747 Merge pull request #7261 from owncloud/issue/6793 
Allow admins to disable certain external storages for users
 2014-03-05 14:41:36 +01:00
Vincent Petry 36d7c0b6a7 Merge pull request #7556 from owncloud/enc_dont_create_files_folder 
[enc] don't create users files folder
 2014-03-05 13:30:11 +01:00
Bjoern Schiessle 2e73c957e5 don't allow to create a file or folder named 'Shared' in the root folder, also exclude all combinations of lower and upper case letters 2014-03-05 13:16:25 +01:00
Bjoern Schiessle fbd8c00a89 don't create files folder, let ownCloud core handle it 2014-03-05 12:44:02 +01:00
Vincent Petry 2cfd875e61 Merge pull request #7012 from owncloud/display-share-owner-master 
adding share owner information to the file list
 2014-03-05 12:43:10 +01:00
Vincent Petry 1da90fab84 Merge pull request #7508 from owncloud/ldap-configkeycasing 
Fixed configkey casing for PostgreSQL
 2014-03-04 17:08:29 +01:00
Thomas Müller f42b6f1a4e Merge pull request #7525 from owncloud/fix_S3string 
fix https://github.com/owncloud/core/issues/6825
 2014-03-04 14:30:30 +01:00
Frank Karlitschek 0bca969e99 fix https://github.com/owncloud/core/issues/6825 2014-03-04 12:38:56 +01:00
Vincent Petry fd5dec0298 Fixed configkey casing for PostgreSQL 2014-03-03 16:15:23 +01:00
Arthur Schiwon b968eed27b remove remaining testing artefact 2014-03-03 10:20:37 +01:00
Arthur Schiwon c7751c0795 intendetion. where did the whitespaces come from? 2014-03-03 10:20:31 +01:00
Arthur Schiwon a8883f4ed2 LDAP: let proxy for multiple server access methods from Access 2014-03-03 10:20:25 +01:00
Thomas Müller 9f087a2070 fixing download url in files app 2014-03-02 23:41:14 +01:00
Thomas Müller 1291303c5a Replace OC.Router.generate() with OC.generateUrl() 2014-03-02 22:30:24 +01:00
Thomas Müller 15d1df055b Merge branch 'master' into display-share-owner-master 
Conflicts:
	apps/files_sharing/lib/cache.php
 2014-02-28 14:54:10 +01:00
icewind1991 8a93a2e7d5 Merge pull request #7455 from owncloud/rawlist-fileinfo 
Update rawlist to work with new fileinfo object
 2014-02-28 12:36:56 +01:00
Björn Schießle 61bc76fdd6 Merge pull request #7454 from owncloud/enc_remember_fopen_mode 
[enc] remember original fopen access type in pre-proxy
 2014-02-28 09:57:58 +01:00
Vincent Petry fefd724858 Fixed wrong field name 
This re-fixes an issue where the unencrypted size isn't updated
correctly when saving a text file in the UI multiple times.

Fixes #7467
 2014-02-27 23:53:29 +01:00
Bjoern Schiessle 4ace1a273d remember original fopen access type in pre-proxy because sometimes they change 
during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
 2014-02-27 14:16:03 +01:00
Robin Appelman 7c92e2e3ad Update rawlist to work with new fileinfo object 2014-02-27 14:04:19 +01:00
Thomas Müller ba4b593f84 Merge pull request #7446 from owncloud/etag_assert_fixes 
use assertSame and assertNotSame for etag checks
 2014-02-27 13:51:14 +01:00
Vincent Petry 577e47e207 Merge pull request #7432 from owncloud/enc_cleanup_session_after_decrypt_all 
close encryption session after decryption was finished
 2014-02-27 11:10:45 +01:00
Jörn Friedrich Dreyer 39f2f564a9 use assertSame and assertNotSame for etag checks 2014-02-27 09:39:34 +01:00
Thomas Müller 9e59e64c79 Merge pull request #7421 from owncloud/password-input 
disable autocomplete for shared link password input, fix #7419
 2014-02-26 22:21:00 +01:00
Bjoern Schiessle 86b3cdc132 close encryption session after decryption was finished 2014-02-26 17:18:38 +01:00
Björn Schießle b7385986ae Merge pull request #7393 from owncloud/fix_path_in_sharing_results 
fix path in sharing results if it is a file in the Shared folder
 2014-02-26 15:19:30 +01:00
Joas Schilling 932c4ee927 Allow admins to disable certain external storages for users 
Fix issue #6793
 2014-02-26 15:02:41 +01:00
Jan-Christoph Borchardt 6c5cc46380 disable autocomplete for shared link password input, fix #7419 2014-02-26 14:48:15 +01:00
Thomas Müller 4b8717df9d Merge pull request #7416 from owncloud/share_api_7311 
[share api] only add "received_from" field if a share was found
 2014-02-26 14:42:31 +01:00
Jan-Christoph Borchardt d9a153dbe9 Merge pull request #7174 from owncloud/issue/7166 
Add option to change email settings in admin section
 2014-02-26 14:41:07 +01:00
Bjoern Schiessle 3be5e48b0c only add "received_from" if a share was found 2014-02-26 12:52:35 +01:00
Jan-Christoph Borchardt 2b423e5a44 coding style fixes, cut long lines, comments not on same lines, curly braces 2014-02-26 10:16:54 +01:00
Bjoern Schiessle e3f676e009 fix path in sharing results if it is a file in the Shared folder 2014-02-25 17:27:23 +01:00
Vincent Petry 7f7d674c2a Merge pull request #7335 from owncloud/fix-7333 
Fix code to search for mount.json in custom data folders
 2014-02-25 15:27:47 +01:00
VicDeo ec9fe3f57f Merge pull request #6299 from leo-b/ldap_nested_groups 
Add LDAP nested groups
 2014-02-25 15:41:10 +02:00
Björn Schießle e10ca7c2e9 Merge pull request #7374 from owncloud/enc_dont_overwrite_keys 
[encryption] don't overwrite keys if rename was done by a stream copy
 2014-02-25 12:34:49 +01:00
Bjoern Schiessle d3a24e945b add test case if a file gets moved out from the shared folder 2014-02-24 17:56:00 +01:00
Bjoern Schiessle ebd73aee8f don't overwrite keys if rename was done by a stream copy 2014-02-24 17:24:43 +01:00
Morris Jobke 5fb1374b0f Merge pull request #7285 from owncloud/mimeicons-svg 
Show svg mime icons when no preview is available
 2014-02-24 14:12:10 +01:00
Morris Jobke 8d17f6d675 Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1 
Update page title when navigating through directories (local)
 2014-02-24 13:34:07 +01:00
Robin Appelman 7c4f81bd78 rename url parameter 2014-02-24 13:24:10 +01:00
Vincent Petry 539ea0882b Fixed mount config path 2014-02-24 10:35:24 +01:00
Lukas Reschke 11ca014034 Merge pull request #7305 from owncloud/extstorage-configclass 
Added extra checks for ext storage class
 2014-02-22 08:10:31 +01:00
root 300b1131b4 replace spaces with tabs 
use true instead of 1
 2014-02-21 17:09:36 +01:00