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

15796 Commits

Author SHA1 Message Date
Arthur Schiwon 9808dee149 LDAP Wizard: don't send ldap_tls change back to the interface as the element was removed, for it is detected fully automatically. Resolves an JS error and thus an ever-spinning spinner 2013-12-04 18:57:32 +01:00
Alexander Bergolth 301d469813 Symfonys addCollection() with multiple arguments is deprecated, fix deprecation warning 2013-12-04 18:01:51 +01:00
Arthur Schiwon 430f85cc59 LDAP Wizard: avoid a manually deactivated LDAP configuration is enabled by just opening the admin page 2013-12-04 17:57:47 +01:00
Arthur Schiwon 1c6568cf68 LDAP: make unsetting checkboxes from Advanced tab work again, fixes #6143 2013-12-04 17:57:40 +01:00
Bjoern Schiessle b919a65432 enable more tests 2013-12-04 17:43:38 +01:00
Björn Schießle 737b9a990f Merge pull request #6181 from owncloud/auto_expire_trash 
config switch to disable auto expire for the trash bin
 2013-12-04 07:44:02 -08:00
Robin Appelman 3fa11bd426 Dont use exceptions for the backgroundjob test cases 2013-12-04 16:28:27 +01:00
Bjoern Schiessle 6b7fdda4f5 config switch to disable auto expire for the trash bin 2013-12-04 16:11:40 +01:00
Morris Jobke 36bc6b871f Revert "Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)." 
This reverts commit efbf18652c.
 2013-12-04 13:27:38 +01:00
Morris Jobke d73875b2b4 Merge pull request #6169 from owncloud/php_version_warning 
PHP version warning
 2013-12-04 01:49:54 -08:00
Frank Karlitschek 61296ed7bb lower required php version to 5.3.3 2013-12-04 10:25:22 +01:00
Frank Karlitschek 8fdbb98899 Merge pull request #6168 from owncloud/extstorage-testtestmethod 
Added unit test for the test() method of ext storage
 2013-12-03 11:00:49 -08:00
Thomas Müller 16eb7c15d2 Merge pull request #6076 from owncloud/fix-6073-master 
Correct property name. It's just 'tableprefix', without the 'db' prefix.
 2013-12-03 08:21:45 -08:00
Vincent Petry 72f80c972f Merge pull request #5946 from owncloud/public-page-details 
Public page details
 2013-12-03 07:26:00 -08:00
Thomas Müller ab21e1b16e Merge pull request #5931 from owncloud/fix-time-field-properly 
fix time input field properly, details
 2013-12-03 07:23:04 -08:00
Vincent Petry 7f4436eafe Merge pull request #6153 from owncloud/extstorage-s3 
Fixed Amazon S3 ext storage config UI
 2013-12-03 06:51:25 -08:00
zombiehugs 519f63ee97 Revert "[fix] Center Share Dropdown & Versions Dropdown" 
This reverts commit 1dbbfcf3dc.
 2013-12-03 08:23:13 -06:00
zombiehugs 1dbbfcf3dc [fix] Center Share Dropdown & Versions Dropdown 
Center Share Dropdown & Versions Dropdown
 2013-12-03 08:14:06 -06:00
Frank Karlitschek 4430eded81 request a bit more data for bug reports 2013-12-03 15:06:36 +01:00
Vincent Petry 6cf9844e9c Added unit test for the test() method 
This is to make sure that method isn't broken
 2013-12-03 14:35:53 +01:00
Morris Jobke b3a96c081b fix public page - gallery view issues 2013-12-03 13:46:58 +01:00
Vincent Petry 3b7905364f Fixed test function for S3 
Fixes #5752
 2013-12-03 12:26:08 +01:00
Vincent Petry 76b1fcbf27 Fixed Amazon S3 ext storage config UI 
Optional parameters are now really optional

Fixes #5861
 2013-12-03 12:26:08 +01:00
Vincent Petry d6121464a0 Fixed placeholder after page reload 
The placeholder somehow had too many characters stripping from it...
 2013-12-03 12:26:08 +01:00
Morris Jobke 62827376b8 fix trashbin and pbulic page controls 2013-12-03 10:59:22 +01:00
Morris Jobke a6f10a59fc fix and cleanup CSS for public page 2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt 5e9ac2f20f change different shades of grey for public share page to white 2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt 7867604e22 remove app specific code 2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt d673dd066a fix details for buttons in header and controls bar 2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt c44f534c2b account for shift of controls bar due to app navigation, do not shift on public page 2013-12-03 10:54:16 +01:00
Frank Karlitschek b83e891456 Merge pull request #5929 from owncloud/code_check_on 
switch code checker on by default. apps are not allowed to access
 2013-12-03 01:14:35 -08:00
Thomas Müller a999350f69 Merge pull request #6158 from owncloud/rmdir-check 
check if a directory exists before we try to remove it
 2013-12-02 15:14:41 -08:00
Jenkins for ownCloud 83ec234f53 [tx-robot] updated from transifex 2013-12-02 17:28:29 -05:00
Robin Appelman 64bfcbee0a check if a directory exists before we try to remove it 2013-12-02 22:44:28 +01:00
Björn Schießle 9d100b5f94 Merge pull request #6151 from owncloud/trash_fix_select 
trash, make it possible to select folders
 2013-12-02 13:22:28 -08:00
Bjoern Schiessle ee66db447f make it possible to select folders 2013-12-02 16:30:03 +01:00
Robin Appelman 4f4ad72460 remove background jobs if they are failing 2013-12-02 13:43:26 +01:00
Robin Appelman 35bb6f7e3a Catch exceptions from background jobs and log them 2013-12-02 13:41:47 +01:00
Vincent Petry a81d4175ba Merge pull request #6148 from owncloud/fix_trash_restore 
Fix restore anbd delete operations in trash bin
 2013-12-02 04:33:37 -08:00
Bjoern Schiessle fac2f2a626 check explicitely all possible dir values 2013-12-02 12:13:32 +01:00
Bjoern Schiessle edc4447d6a set delete all to true if a complete folder was deleted 2013-12-02 11:59:09 +01:00
Bjoern Schiessle 8ce3ea3e2c fix delete files from trash bin 2013-12-02 11:50:55 +01:00
Thomas Mueller 87e795a693 fixing PHPDoc and spelling 2013-12-02 08:42:28 +01:00
Frank Karlitschek c2e83e635d ownCloud 6 RC2 2013-12-02 00:10:28 +01:00
Thomas Müller 832be7c908 Merge pull request #6052 from owncloud/datetime-doctrine 
Get rid of date strings for DB. Completely use Doctrine and DateTime.
 2013-12-01 01:29:35 -08:00
Thomas Müller c2b11cae83 Merge pull request #6132 from owncloud/encryption-version-bump 
Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)
 2013-11-29 15:20:54 -08:00
Andreas Fischer efbf18652c Adjust files_encryption requirements to the new core requirement (PHP 5.3.8). 2013-11-29 20:34:57 +01:00
Vincent Petry baa587fd3c Merge pull request #6123 from owncloud/extstorage-deletedirs2 
Fixed FTP and SMB to use rmdir() when deleting folders
 2013-11-29 11:23:02 -08:00
Thomas Müller 338a55e36c Merge pull request #6128 from owncloud/fix-6126-master 
Also merge autoconfig variables into $_REQUEST.
 2013-11-29 11:22:44 -08:00
Jenkins for ownCloud 1b18c5a047 [tx-robot] updated from transifex 2013-11-29 14:10:40 -05:00