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

15618 Commits

Author SHA1 Message Date
Morris Jobke 9c4bbf9ad7 Revert "Revert "Fix user's displayName being overwritten by (old) cookie"" 
This reverts commit eba35d28cd.
 2013-12-05 20:53:11 +01:00
pdessauw f12363d90b Merge pull request #6210 from owncloud/fix-5865 
#5865 Multiselect animation is too slow patch
 2013-12-05 11:19:06 -08:00
unknown fd3aae6691 Changed duration of slideDown, slideUp and fadeOut to 200ms 2013-12-05 13:15:52 -05:00
ringmaster e7748613ef Link to enable-javascript.com 2013-12-05 12:06:20 -05:00
Bjoern Schiessle 3f7aac1a79 add a optional parameter to skip check for expired files, this is necessary to find out to whom a file was shared after it was expired. 2013-12-05 17:29:15 +01:00
Bjoern Schiessle ace1d40ed6 get owner from share item, if we expire a share while the user updates his /Shared folder than the owner is different from the currently logged in user 2013-12-05 17:25:01 +01:00
Morris Jobke eba35d28cd Revert "Fix user's displayName being overwritten by (old) cookie" 
This reverts commit 2a7380cc21.
 2013-12-05 16:12:46 +01:00
ringmaster 1687ec0cd2 Make noscript message translatable 2013-12-05 09:52:13 -05:00
ringmaster 38745e4bd1 Move message up 10% 2013-12-05 09:48:20 -05:00
Morris Jobke cec17fd3e2 Merge pull request #6199 from nicokaiser/fix-5306-master 
Fix user's displayName being overwritten by (old) cookie. #3694
 2013-12-05 06:32:20 -08:00
Morris Jobke f2f44bd092 Merge pull request #6196 from owncloud/installation-error-css 
fix appearance of error message - .errors is outdated
 2013-12-05 06:25:48 -08:00
Robin Appelman 01ab15a2b0 reuse etags when doing a background scan 2013-12-05 15:23:34 +01:00
ringmaster bdab0409c4 Add overlay noscript message to fix #6032 2013-12-05 09:19:46 -05:00
Nico Kaiser 2a7380cc21 Fix user's displayName being overwritten by (old) cookie 2013-12-05 14:18:32 +01:00
Robin Appelman 2ff1bdaba3 add test case for removing background jobs that are throwing exceptions 2013-12-05 13:29:35 +01:00
Morris Jobke 1620015531 fix appearance of error message - .errors is outdated 2013-12-05 11:23:30 +01:00
Frank Karlitschek 125dff8997 master is ownCloud 7 pre alpha now 2013-12-05 10:35:19 +01:00
Jenkins for ownCloud 7e702f294f [tx-robot] updated from transifex 2013-12-04 18:14:17 -05:00
Arthur Schiwon 3480766a78 LDAP Wizard: don't generate filter when not allowed 2013-12-04 18:59:30 +01:00
Arthur Schiwon 60b1191c88 some equals are more equal than other equals 2013-12-04 18:59:12 +01:00
Arthur Schiwon 01af3bdb05 LDAP Wizard: return correct var 2013-12-04 18:58:52 +01:00
Arthur Schiwon 06577f1fe2 LDAP Wizard: make sure auto-detected suggestions are really applied initially. Also make initial filter compilation and user counting robust against race conditions. 2013-12-04 18:58:29 +01:00
Arthur Schiwon cc725674e0 LDAP: on testing configuration, set active property to true, otherwise inactive connections cannot be tested properly 2013-12-04 18:58:09 +01:00
Arthur Schiwon a10d1977b5 LDAP: set default value for login filter to empty, otherwise the wizard signals completed configuration too early when it might be not correct, i.e. login won't work 2013-12-04 18:57:54 +01:00
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