summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-10193-2422/+2616
|
* Merge pull request #8129 from owncloud/core-svgsupportThomas Tanghus2014-04-092-6/+6
|\ | | | | Moved SVGSupport call to use OC.Util.SVGSupport()
| * Moved SVGSupport call to use OC.Util.SVGSupport()Vincent Petry2014-04-092-6/+6
| |
* | Merge pull request #8128 from owncloud/fix/undefined-index-storageJoas Schilling2014-04-091-1/+1
|\ \ | |/ |/| Fix Undefined index: storage in share.php
| * Fix Undefined index: storage in share.phpJoas Schilling2014-04-091-1/+1
|/ | | | | | | There parameter was removed when the code was cleaned up: {"app":"PHP","message":"Undefined index: storage at E:\\ownCloud\\owncloud\\lib\\private\\share\\share.php#1160", "level":0,"time":"2014-04-09T12:56:23+00:00"}
* Merge pull request #8049 from owncloud/filepickersvgMorris Jobke2014-04-096-56/+120
|\ | | | | Fix file picker SVG issues
| * Fix SVG close button of file pickerVincent Petry2014-04-041-0/+5
| |
| * Fix file picker to correctly show SVG file iconsVincent Petry2014-04-041-1/+6
| |
| * Moved code to replace svg with png to OC.UtilVincent Petry2014-04-045-55/+109
| | | | | | | | | | | | | | | | | | - Moved code that replaces the "svg" extension for the given file to core as OC.Util.replaceSVGIcon. - Added unit test for OC.Util.replaceSVGIcon - Moved "replaceSVG" to OC.Util.replaceSVG and deprecated the global "replaceSVG" function. - Added alias for SVGSupport() as OC.Util.hasSVGSupport() (for now)
* | Merge pull request #8126 from owncloud/remove_obsolete_code_in_sharing_jsVincent Petry2014-04-091-5/+0
|\ \ | | | | | | remove obsolete code
| * | remove obsolete codeJörn Friedrich Dreyer2014-04-091-5/+0
| | |
* | | Merge pull request #7837 from owncloud/fix_7530blizzz2014-04-092-7/+237
|\ \ \ | |/ / |/| | LDAP: fix determining objectclasses takes long
| * | add comment to clearify when a skip in the foreach happensArthur Schiwon2014-04-091-0/+1
| | |
| * | define varArthur Schiwon2014-03-211-0/+1
| | |
| * | make tests work on systems without php5_ldapArthur Schiwon2014-03-211-0/+12
| | |
| * | add tests for cumulativeSearchOnAttributeArthur Schiwon2014-03-211-0/+198
| | |
| * | fix potential infinite loop when the DN of the first entry was already read.Arthur Schiwon2014-03-201-1/+1
| | |
| * | Use the LDAP wrapper for checking resources, needs for proper testingArthur Schiwon2014-03-201-1/+1
| | |
| * | Fix wildcard handling and check even less DNs per filter, enough will be ↵Arthur Schiwon2014-03-201-4/+7
| | | | | | | | | | | | looked at anyway
| * | LDAP Wizard: when determining objectclasses, we realy do not need to look at ↵Arthur Schiwon2014-03-201-4/+19
| | | | | | | | | | | | every entry. Fixes #7530
* | | Merge pull request #8122 from owncloud/issue/8048Joas Schilling2014-04-091-3/+1
|\ \ \ | | | | | | | | Always define sendmail_is_available in settings/admin.php
| * | | Always define sendmail_is_availableJoas Schilling2014-04-091-3/+1
|/ / / | | | | | | | | | Fix #8048
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-09365-3687/+6474
| | |
* | | Merge pull request #8117 from owncloud/fix-hard-coded-uman-strThomas Müller2014-04-081-5/+6
|\ \ \ | | | | | | | | Make hardcoded exception messages translatable
| * | | Make hardcoded exception messages translatableVolkan Gezer2014-04-081-5/+6
| | | |
* | | | Merge pull request #7643 from owncloud/chainable_responseThomas Müller2014-04-086-0/+62
|\ \ \ \ | | | | | | | | | | Chainable Response in AppFramework
| * | | | Add @return PHPDocsThomas Tanghus2014-03-103-0/+7
| | | | |
| * | | | Chainable Response in AppFrameworkThomas Tanghus2014-03-096-0/+55
| | | | |
* | | | | Merge pull request #8111 from owncloud/trash-disablesharingVincent Petry2014-04-081-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Disable sharing in trashbin app
| * | | | Disable sharing in trashbin appVincent Petry2014-04-081-0/+1
|/ / / /
* | | | Merge pull request #8110 from owncloud/fix-failing-config-unit-testThomas Müller2014-04-081-1/+1
|\ \ \ \ | | | | | | | | | | class Test_Config is already declared
| * | | | class Test_Config is already declaredThomas Müller2014-04-081-1/+1
|/ / / /
* | | | Merge pull request #8032 from owncloud/fs-backend-registrationThomas Müller2014-04-0810-166/+462
|\ \ \ \ | | | | | | | | | | Files External: allow dynamic backend registration
| * | | | unit tests for dynamic backend registrationThomas Müller2014-04-072-14/+141
| | | | |
| * | | | remove duplicate method checkDependencies()Thomas Müller2014-04-031-12/+0
| | | | |
| * | | | use command -v to detect if smbclient existsThomas Müller2014-04-031-1/+1
| | | | |
| * | | | Merge branch 'master' into fs-backend-registrationThomas Müller2014-04-033-145/+172
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/templates/settings.php
| * | | | | Update backends and their configurationsThomas Müller2014-04-031-19/+72
| | | | | |
| * | | | | Moved dependency checks to end of class filesPhilipp Kapfer2014-04-039-248/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dependency messages now appear below the configuration options instead of above Reworked dependency check method to support consolidated messages for multiple backends Conflicts: apps/files_external/lib/google.php apps/files_external/lib/swift.php apps/files_external/templates/settings.php
| * | | | | Added cURL dependency for Amazon S3, Dropbox and SWIFTPhilipp Kapfer2014-04-034-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/lib/amazons3.php apps/files_external/lib/swift.php
| * | | | | Changed dependency check messages from warnings to notesPhilipp Kapfer2014-04-035-8/+41
| | | | | | | | | | | | | | | | | | | | | | | | Added check for duplicate dependency check messages to display only the first
| * | | | | Added cURL dependency check to Google Drive and WebDAV backendPhilipp Kapfer2014-04-034-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added check for backend's checkDependencies method to OC_Mount_Config::getBackends() when backend is configured to have some instead of blindly calling it and crashing Conflicts: apps/files_external/lib/config.php apps/files_external/lib/google.php
| * | | | | Modified app to dynamically register backends instead of hard-coding themPhilipp Kapfer2014-04-034-158/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved dependency check to the individual backends instead of the config Conflicts: apps/files_external/appinfo/app.php apps/files_external/lib/config.php
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-08248-4684/+13590
| | | | | |
* | | | | | Merge pull request #8102 from owncloud/fix-appconfig-masterThomas Müller2014-04-083-4/+41
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix appconfig master
| * | | | | | using array_key_exists() instead of isset() - required because in case the ↵Thomas Müller2014-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | value is null isset is returning false
| * | | | | | fixing undefined exception classesThomas Müller2014-04-071-3/+3
| | | | | | |
| * | | | | | unit test testSetAppValueIfSetToNull() addedThomas Müller2014-04-071-0/+37
| | | | | | |
* | | | | | | Merge pull request #8089 from bantu/autotest-checkout-pathspecJörn Friedrich Dreyer2014-04-071-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Use git checkout on directory as some files may not be in git resulting ...
| * | | | | | Use git checkout on directory as some files may not be in git resulting in, ↵Andreas Fischer2014-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e.g.: error: pathspec 'tests/data/lorem-copy.txt' did not match any file(s) known to git. error: pathspec 'tests/data/testimage-copy.png' did not match any file(s) known to git.
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 07:12:51 +0000