Commit graph

10195 commits

Author SHA1 Message Date
Clark Tomlinson
294f14a793 Merge pull request #15538 from owncloud/encryption-crypt-tests
add unit test for crypt.php
2015-04-10 10:24:01 -04:00
Thomas Müller
7b2d53603c Merge pull request #15489 from owncloud/dont_hide_exceptions_master
Dont hide exceptions master
2015-04-10 15:49:45 +02:00
Morris Jobke
20a1a110de Merge pull request #15537 from owncloud/master-fixunittestrelatedtoorphanedshares2
Fix master unit test: Clear leftover shares from other tests
2015-04-10 15:42:16 +02:00
Bjoern Schiessle
d1fa3c6b32 add unit test for crypt.php 2015-04-10 15:12:57 +02:00
Vincent Petry
4a225aa12c Clear leftover shares from other tests 2015-04-10 14:53:17 +02:00
Vincent Petry
b51b5b64e6 Fix converting Guzzle error codes in s2s storage 2015-04-10 12:12:05 +02:00
Vincent Petry
73afca6207 Catch more exceptions when connecting to remote DAV server
Added InvalidArgumentException to catch HTML parsing errors when XML was
expected.
Made convertSabreException more generic to be able to handle more
exception cases.
2015-04-10 12:02:06 +02:00
Jörn Friedrich Dreyer
fafecd1c05 fix cherrypicking 2015-04-10 11:08:24 +02:00
Morris Jobke
1427ea78d4 fix typo and comment 2015-04-10 09:12:37 +02:00
Morris Jobke
5626a02d69 throw exception if setup is incomplete 2015-04-10 09:12:37 +02:00
Jörn Friedrich Dreyer
077ab27281 fix_tests
Conflicts:
	apps/user_ldap/tests/user_ldap.php
2015-04-10 09:12:37 +02:00
Jörn Friedrich Dreyer
488405d1ec do not hide exception when ldap server has a hiccup 2015-04-10 09:12:37 +02:00
Morris Jobke
43b503641c Merge pull request #15521 from owncloud/shareinfo-catchguzzle503
Properly catch guzzle 503 when querying share info
2015-04-10 00:23:05 +02:00
Thomas Müller
02614d214e Merge pull request #15437 from owncloud/deleteorphanedfiles
[command] delete orphaned file cache entries
2015-04-10 00:09:56 +02:00
blizzz
c6151053ba Merge pull request #15492 from owncloud/ldap-wizard-overhaul
LDAP Wizard Overhaul
2015-04-09 23:52:53 +02:00
Arthur Schiwon
60bf934e6f change default value of ldap_tls to 0. It will be detected anyway, but starting with 0 will lead to errors and unconfigurability 2015-04-09 21:05:20 +02:00
Arthur Schiwon
a8b831b018 compile user and login filter on the first time automatically, if a suggestion was provided 2015-04-09 21:05:16 +02:00
Lukas Reschke
0bad8f644a Merge pull request #15511 from owncloud/fix-typos
Fix typos and some other adjustments
2015-04-09 19:23:27 +02:00
Vincent Petry
4feb97d8e4 Properly catch guzzle 503 when querying share info 2015-04-09 18:55:28 +02:00
Vincent Petry
2865f09984 Merge pull request #15282 from owncloud/keepsharerelationshipondelete
Keep shares when deleting shared folders
2015-04-09 18:10:17 +02:00
Vincent Petry
5803a1f5f7 Remove trashbin storage wrapper when disabling it for tests 2015-04-09 15:02:24 +02:00
Arthur Schiwon
ca9426308d escape filter for output 2015-04-09 14:49:11 +02:00
Arthur Schiwon
3abc72dad8 fix number and insert position when adding/copying a config 2015-04-09 14:44:40 +02:00
Arthur Schiwon
00c2970547 update back/continue buttons also on tab click 2015-04-09 14:40:00 +02:00
Lukas Reschke
ec69f2838c Fix typos and some other adjustments 2015-04-09 14:09:09 +02:00
Arthur Schiwon
b4c96e6ba0 cleanup 2015-04-09 14:01:39 +02:00
Arthur Schiwon
630e35d8cc newlines at end of file
yes, IDE is now configured accordingly.
2015-04-09 14:00:34 +02:00
Arthur Schiwon
9ed9741d81 doc 2015-04-09 13:56:20 +02:00
Arthur Schiwon
3354881355 move script and style inclusions into template 2015-04-09 13:52:35 +02:00
Lukas Reschke
96e7f607d5 Remove unneeded file 2015-04-09 13:29:51 +02:00
Arthur Schiwon
8e7081d784 run functionality checks also when host field changes 2015-04-09 12:36:53 +02:00
Vincent Petry
08a9d1d2dc Remove unused $toRemove 2015-04-09 12:34:19 +02:00
Jan-Christoph Borchardt
c840c18252 Merge pull request #15499 from owncloud/admin-hints
add admin documentation hints to Federated Cloud Sharing and cron
2015-04-09 12:12:53 +02:00
Jan-Christoph Borchardt
65dc958418 add admin documentation hints to Federated Cloud Sharing and cron 2015-04-09 12:07:05 +02:00
Arthur Schiwon
40edaa5a69 adjust tests 2015-04-09 12:00:11 +02:00
Lukas Reschke
4ca6419475 Fix PHPDoc 2015-04-09 10:54:53 +02:00
Lukas Reschke
3aad47c0f0 Fix code style 2015-04-09 10:46:46 +02:00
Lukas Reschke
d869f8212b Enforce string as passed type 2015-04-09 10:45:50 +02:00
Vincent Petry
461302244e Keep shares when deleting shared folders
The share entries will be linked with the fileid while they are kept in
the trashbin.

In the future a background just will scrape orphaned shares and delete
them.
2015-04-09 10:16:40 +02:00
Arthur Schiwon
5355c285fc LDAP Wizard Overhaul
wizard refactor

reimplement save spinners and cursor

implement Port detector

introduced detector queue, added base dn detector

disable input fields when detectors are running

introduce spinners for fields that are being updated by detector

cache jq element objects

consolidate processing of detector results in generic / abstract base class

display notification if a detector discovered a problem

don't run base dn detector if a base is configured

reset detector queue on configuration switch

implement functionality check and update of status indicator

document ConfigModel

jsdoc for controller and main view

more documentation

implement the user filter tab view

so far the multiselects get initialized (not filled yet) and the mode can be switched.

mode is also restored.

reintroduce filter switch confirmation in admin XP mode

new detector for user object classes. so we also load user object classes if necessary and are able to save and show the setting.

multiselect trigger save actions now on close only

show spinners automatically, when a detector is running

20k limit for object classes preselection test

adjust wordings, fix grammar

add group (for users tab) detector

also includes wording fixes

error presentation moved from detectors to view, where it belongs

add info label to users page

missing wording changes

show effective LDAP filter in Assisted Mode

add user filter detector

implement count button for users and limit all count actions to 1001 for performance reasons

make port field a bit bigger. not perfect though.

do not detect port automatically

implement login filter tab view

only load features in assisted mode and don't enable assisted fields while in raw mode

add tooltips on login filter checkbox options for better understanding

permanently show filter on login tab

and also compile login filter in assisted mode

test/verify button on login attributes tab, with backend changes.

only run wizard requests if your an active tab. also run compile filter requests when switching to assisted mode

underline toggle filter links to stress that they are clickable

unity user and group tab functionality in common abstract class, add group filter tab view. only detectors and template adjustments left to have group tab implementation complete

add object class and group detector for groups as well as filter composer

show ldap filter permanently on groups tab

introduce input element that can deal better with many groups, will be used with > 40

fix disabling complex group chooser while detection is running

hide complex group chooser on config switch

fix few more issues with complex chooser

make complex group chooser available on Users tab as well

detect base dn improvements/changes:

- do not look for Base DN automatically, offer a button instead
- fix for alternative way to detect a base dn (if agent dn is not given)
- do not trigger filter composers on config switch

Changes with configuration chooser controls

- "New" was removed out of the configuration list
- and split into buttons "add" and "copy"
- delete button is also now an icon

add test button for Base DN

reimplement advanced tab. The save button is gone.

reimplement expert tab

remove unused methods

implement mail attribute detector

implement user display name attribute detection

implement member group association detector

replace text input with textarea for raw filter input

finish functionality check

auto-enable good configurations, as it was before

cleanup

move save confirmation handling to base class, reduces code duplication

enable tabs only if no running save processes are left.

move onConfigLoaded to base class, avoids code duplication

simplify, save LOCs

Test Configuration button to be dealt with in main view as it is a cross-tab element

require detectorQueue in constructor

cleanup

put bootstrap into a function and thus make it testable

get rid of old stuff
2015-04-09 09:47:49 +02:00
Morris Jobke
56f1ffe820 Merge pull request #14676 from owncloud/deleteorphanedshares
Delete orphaned shares in a background job
2015-04-09 00:18:53 +02:00
Morris Jobke
9c76d068c3 Merge pull request #15196 from owncloud/limit-file-activities-to-favorites
Limit file activities to favorites
2015-04-09 00:18:31 +02:00
Morris Jobke
62936aa323 Merge pull request #15488 from owncloud/files-navigation-icons
add icons to Files sidebar
2015-04-08 21:06:03 +02:00
Morris Jobke
91a90e25ae fix for IE8 2015-04-08 21:05:31 +02:00
Jan-Christoph Borchardt
84c2fe85b7 add icons to files sidebar, fix shade, fix position of settings icon and text 2015-04-08 19:25:28 +02:00
Clark Tomlinson
fc2711e156 Merge pull request #15472 from owncloud/enc_backward_compatibility
make private key handling backward compatible
2015-04-08 09:38:27 -04:00
Morris Jobke
103d451459 Merge pull request #14987 from rullzer/ocs_password_fix2
OCS Fixes to allow setting of password without removing additional settings
2015-04-08 14:44:17 +02:00
Lukas Reschke
d01a2acbcf Merge pull request #15469 from owncloud/fix/15463
Fix language level incompatibilties
2015-04-08 14:30:56 +02:00
Bjoern Schiessle
4ce5669419 read cipher from key header and always write a key header if a new private key is stored 2015-04-08 14:26:00 +02:00
Vincent Petry
69ba67ec0f Merge pull request #15464 from owncloud/fixmasterunittests
Replace originalStorage in tests with a proper teardown
2015-04-08 14:24:42 +02:00