summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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.
* | | | | Merge pull request #8065 from owncloud/avatar-highdpiThomas Müller2014-04-071-3/+3
|\ \ \ \ \ | | | | | | | | | | | | use high resolution avatars on highdpi screens
| * | | | | use high resolution avatars on highdpi screensRobin Appelman2014-04-041-3/+3
| | | | | |
* | | | | | Merge pull request #8091 from owncloud/jshint-globals-oc-t-nJörn Friedrich Dreyer2014-04-072-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | adding ownCloud globals to jshintrc: OC, t, n
| * | | | | | ignore underscore.js in scrutinizer.ymlThomas Müller2014-04-071-0/+1
| | | | | | |
| * | | | | | Merge branch 'master' into jshint-globals-oc-t-nThomas Müller2014-04-079-69/+1424
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Conflicts: .jshintrc
* | | | | | | Merge pull request #8088 from owncloud/fix-personal.jsThomas Müller2014-04-075-52/+1396
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | reduce code duplication, fix parse error, prevent page reload on hitting...
| * | | | | | | adding underscore.jsThomas Müller2014-04-071-0/+1344
| | | | | | | |
| * | | | | | | reduce code duplication, fix parse error, prevent page reload on hitting ↵Thomas Müller2014-04-074-52/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enter while changing the display name - refs #8085
* | | | | | | | Merge pull request #7599 from owncloud/public-pathinfoicewind19912014-04-071-6/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Allow using pathinfo based public.php paths
| * | | | | | | | Allow using pathinfo based public.php pathsRobin Appelman2014-03-061-6/+14
| | | | | | | | |
* | | | | | | | | Merge pull request #8083 from owncloud/fix-link-to-syncThomas Müller2014-04-071-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove wrong whitespace from URL and use HTTPS
| * | | | | | | | | Switch to HTTPSLukas Reschke2014-04-061-1/+1
| | | | | | | | | |
| * | | | | | | | | Remove wrong whitespace from URL and use HTTPSLukas Reschke2014-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The whitespace caused the generated links to begin with a whitespace (e.g. `<a href=" http://owncloud.org/sync-clients/" target="_blank">`) Additionally I switched the link to HTTPS.
* | | | | | | | | | Merge pull request #8086 from owncloud/fix_copy_conflict_translations_in_jsThomas Müller2014-04-072-10/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | Fix copy conflict dialog translation
| * | | | | | | | | translations for oc-dialogs reside in codeJörn Friedrich Dreyer2014-04-071-10/+10
| | | | | | | | | |
| * | | | | | | | | Fix copy conflict dialog translationJörn Friedrich Dreyer2014-04-072-2/+5
| | |_|/ / / / / / | |/| | | | | | |
| | | | * | | | | adding ownCloud globals to jshintrc: OC, t, nThomas Müller2014-04-071-1/+4
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #6221 from leo-b/ldap_get_all_groupsblizzz2014-04-073-3/+49
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | fix updateGroups background job for ldap servers with > 1000 groups
| * | | | | | | adapt description of paging size configurationAlexander Bergolth2014-03-281-1/+1
| | | | | | | |
| * | | | | | | change default ldap paging size to 500Alexander Bergolth2014-03-281-1/+1
| | | | | | | |
| * | | | | | | make getGroupsChunk() protected instead of privateAlexander Bergolth2014-03-131-1/+1
| | | | | | | |
| * | | | | | | adapt coding styleAlexander Bergolth2014-03-131-15/+15
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-31 06:50:05 +0000