summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15598 from owncloud/fix-enc-file-size-masterBjörn Schießle2015-04-143-21/+1
|\ | | | | Fix file size of encrypted files
| * remove calculateUnencryptedSize() - not neededThomas Müller2015-04-142-20/+0
| |
| * fix reading of private keyThomas Müller2015-04-141-1/+1
| |
* | Merge pull request #13360 from owncloud/cross-storage-moveMorris Jobke2015-04-143-10/+103
|\ \ | |/ |/| Proper copy/move between multiple local storages
| * a bit more phpdocRobin Appelman2015-04-141-0/+6
| |
| * add missing return for sharedRobin Appelman2015-04-131-2/+2
| |
| * properly return false if we cant delete the source fileRobin Appelman2015-04-131-4/+5
| |
| * Fix testRobin Appelman2015-04-131-2/+8
| |
| * Implement move/copyFromStorage for shared storageRobin Appelman2015-04-132-6/+86
| |
* | Merge pull request #15566 from owncloud/fix-filepickerThomas Müller2015-04-142-4/+27
|\ \ | | | | | | fix filepicker
| * | fix filepickerMorris Jobke2015-04-132-4/+27
| | | | | | | | | | | | | | | | | | * add ability to filter for mimetype * fixes #15526 * fixes #11563
* | | Fix cross storage move with shared storagesRobin Appelman2015-04-132-11/+11
| | |
* | | check that we know the parentRobin Appelman2015-04-131-3/+5
| | |
* | | check for source cacheRobin Appelman2015-04-131-1/+3
| |/ |/|
* | Merge pull request #15570 from owncloud/shares-properlyformatmountpointMorris Jobke2015-04-131-3/+9
|\ \ | | | | | | Properly add trailing slash to mount point
| * | Properly add trailing slash to mount pointVincent Petry2015-04-131-3/+9
| |/ | | | | | | | | Fixes resolving mount points when shared mount point's target name has the same prefix as the source name
* / Do not try to make user subadmin of group twiceRoeland Jago Douma2015-04-132-0/+29
|/ | | | | | | If the provisioning api is used to make a user subadmin of a group that user is already a subadmin just return success. Added unit test to ensure things keep working.
* Merge pull request #15535 from owncloud/smb-1.0.0Morris Jobke2015-04-107-16/+38
|\ | | | | update icewind/smb to 1.0.0
| * update icewind/smb to 1.0.0Robin Appelman2015-04-107-16/+38
| |
* | Merge pull request #15538 from owncloud/encryption-crypt-testsClark Tomlinson2015-04-102-29/+283
|\ \ | | | | | | add unit test for crypt.php
| * | add unit test for crypt.phpBjoern Schiessle2015-04-102-29/+283
| | |
* | | Merge pull request #15489 from owncloud/dont_hide_exceptions_masterThomas Müller2015-04-104-68/+218
|\ \ \ | | | | | | | | Dont hide exceptions master
| * | | fix cherrypickingJörn Friedrich Dreyer2015-04-103-15/+18
| | | |
| * | | fix typo and commentMorris Jobke2015-04-102-3/+3
| | | |
| * | | throw exception if setup is incompleteMorris Jobke2015-04-101-1/+3
| | | |
| * | | fix_testsJörn Friedrich Dreyer2015-04-103-49/+201
| | | | | | | | | | | | | | | | | | | | Conflicts: apps/user_ldap/tests/user_ldap.php
| * | | do not hide exception when ldap server has a hiccupJörn Friedrich Dreyer2015-04-103-17/+10
| |/ /
* | | Merge pull request #15537 from ↵Morris Jobke2015-04-101-1/+3
|\ \ \ | |_|/ |/| | | | | | | | owncloud/master-fixunittestrelatedtoorphanedshares2 Fix master unit test: Clear leftover shares from other tests
| * | Clear leftover shares from other testsVincent Petry2015-04-101-1/+3
| |/
* | Fix converting Guzzle error codes in s2s storageVincent Petry2015-04-101-10/+13
| |
* | Catch more exceptions when connecting to remote DAV serverVincent Petry2015-04-101-0/+2
|/ | | | | | | Added InvalidArgumentException to catch HTML parsing errors when XML was expected. Made convertSabreException more generic to be able to handle more exception cases.
* Merge pull request #15521 from owncloud/shareinfo-catchguzzle503Morris Jobke2015-04-101-0/+5
|\ | | | | Properly catch guzzle 503 when querying share info
| * Properly catch guzzle 503 when querying share infoVincent Petry2015-04-091-0/+5
| |
* | Merge pull request #15437 from owncloud/deleteorphanedfilesThomas Müller2015-04-103-0/+180
|\ \ | | | | | | [command] delete orphaned file cache entries
| * | [command] delete orphaned file cache entriesMorris Jobke2015-04-083-0/+180
| | | | | | | | | | | | | | | * ./occ files:cleanup * delete file cache entries without an existing storage
* | | Merge pull request #15492 from owncloud/ldap-wizard-overhaulblizzz2015-04-0961-1630/+5143
|\ \ \ | | | | | | | | LDAP Wizard Overhaul
| * | | change default value of ldap_tls to 0. It will be detected anyway, but ↵Arthur Schiwon2015-04-092-1/+4
| | | | | | | | | | | | | | | | starting with 0 will lead to errors and unconfigurability
| * | | compile user and login filter on the first time automatically, if a ↵Arthur Schiwon2015-04-094-0/+10
| | | | | | | | | | | | | | | | suggestion was provided
| * | | escape filter for outputArthur Schiwon2015-04-091-1/+1
| | | |
| * | | fix number and insert position when adding/copying a configArthur Schiwon2015-04-091-2/+2
| | | |
| * | | update back/continue buttons also on tab clickArthur Schiwon2015-04-093-3/+8
| | | |
| * | | cleanupArthur Schiwon2015-04-091-2/+0
| | | |
| * | | newlines at end of fileArthur Schiwon2015-04-0912-14/+11
| | | | | | | | | | | | | | | | yes, IDE is now configured accordingly.
| * | | docArthur Schiwon2015-04-091-2/+2
| | | |
| * | | move script and style inclusions into templateArthur Schiwon2015-04-092-46/+53
| | | |
| * | | run functionality checks also when host field changesArthur Schiwon2015-04-091-1/+1
| | | |
| * | | adjust testsArthur Schiwon2015-04-091-6/+9
| | | |
| * | | LDAP Wizard OverhaulArthur Schiwon2015-04-0961-1620/+5110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge pull request #15511 from owncloud/fix-typosLukas Reschke2015-04-093-9/+12
|\ \ \ \ | |_|_|/ |/| | | Fix typos and some other adjustments
| * | | Fix typos and some other adjustmentsLukas Reschke2015-04-093-9/+12
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-05 04:44:09 +0000