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

7379 Commits

Author SHA1 Message Date
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
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
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
icewind1991 9b9b2255b6 Merge pull request #7355 from owncloud/new-menu-svg 
Use SVG icons in New file menu
 2014-02-21 16:18:43 +01:00
Robin Appelman 59ec61dc03 Merge branch 'master' into GuillaumeAmat-patch-1 2014-02-21 16:04:31 +01:00
Robin Appelman f1475671ab Merge branch 'master' into extstorage-configclass 2014-02-21 15:51:41 +01:00
Jan-Christoph Borchardt 6f56fd99a6 fix too much distance between text and icon 2014-02-21 14:10:13 +01:00
Jan-Christoph Borchardt 877cfb963a use SVG icons from icons.css for New file menu 2014-02-21 14:07:25 +01:00
Robin Appelman 4715fb12c8 Add url parameter to control whether previews should return 404 when the mimetype is unsupported 2014-02-21 14:06:15 +01:00
Robin Appelman 3f52eb073d Merge branch 'master' into mimeicons-svg 2014-02-21 14:00:17 +01:00
Bjoern Schiessle 0c0e4fced5 fix test so that it doesn't depend on the array order 2014-02-21 13:37:47 +01:00
Bjoern Schiessle 6ca4d3bfde fix usersPath and add unit tests 2014-02-21 13:37:46 +01:00
Jan-Christoph Borchardt b22d82f941 code style: else on same line 2014-02-21 09:42:19 +01:00
Thomas Müller fe24aafe7d Merge pull request #7312 from owncloud/ldap_fix_add_test 
LDAP: fix and extend tests
 2014-02-21 00:42:43 +01:00
Lukas Reschke 6cb64a4fce Fix code to search for mount.json in custom data folders 2014-02-20 18:34:27 +01:00
Robin Appelman f710205ee7 Make unit tests expect the svg icons 2014-02-20 16:56:09 +01:00
Robin Appelman 0624476aa1 Merge branch 'master' into mimeicons-svg 2014-02-20 16:55:18 +01:00
icewind1991 d1b1ad0813 Merge pull request #7290 from owncloud/issue/5463 
Correctly redirect to settings page when not selecting cert file for upload
 2014-02-20 16:24:31 +01:00
blizzz 984ea7b3ff Merge pull request #7205 from owncloud/fix_7153 
LDAP: prevent other configuration from being deleted when deleting the f...
 2014-02-20 16:22:43 +01:00
Morris Jobke 658758c3f7 fix intendation 2014-02-20 15:36:52 +01:00
Vincent Petry 44441b56d6 Fixed trashbin title 2014-02-20 15:16:45 +01:00
Lukas Reschke c869e0116b Merge pull request #6999 from kofemann/mount-config 
mount: make location of mount.json configurable
 2014-02-20 15:15:00 +01:00
Vincent Petry 476444ab1a Fixed title format 2014-02-20 14:56:28 +01:00
Vincent Petry 6cf83de60e Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-patch-1 2014-02-20 14:49:54 +01:00
Arthur Schiwon d5690a174e LDAP: fix and extend tests 2014-02-20 14:05:45 +01:00
Lukas Reschke 719f1111b6 Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix 
Added extra checks for invalid file chars in newfile.php and newfolder.php
 2014-02-20 11:53:58 +01:00
Vincent Petry b060a17b59 Added extra checks for ext storage class 2014-02-20 10:40:10 +01:00