summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* use displayname lookup route in files_external settingsJörn Friedrich Dreyer2014-08-251-31/+14
|
* add lookup route for displaynamesJörn Friedrich Dreyer2014-08-252-0/+35
|
* no need to load user display namesJörn Friedrich Dreyer2014-08-251-1/+0
|
* fix deletion of sharesJörn Friedrich Dreyer2014-08-251-21/+22
|
* replace chosen with select2 to provide ajaxified user and group selection ↵Jörn Friedrich Dreyer2014-08-258-62/+188
| | | | | | | | | | | | for files_external, fixes #7499 remove minified select2 js show avatars for users, simpler results remove unneeded users and groups from settings template fix css, escape user and group names
* add select2 to app specific thirdpartyJörn Friedrich Dreyer2014-08-2560-0/+5431
|
* Merge pull request #10591 from owncloud/routes_for_files_externalVincent Petry2014-08-251-0/+17
|\ | | | | explicit routes for files_external
| * explicit routes for files_externalJörn Friedrich Dreyer2014-08-221-0/+17
| |
* | Merge pull request #10595 from owncloud/swift-streamJörn Friedrich Dreyer2014-08-251-5/+4
|\ \ | | | | | | Stream downloads from Swift object stores without downloading it first
| * | Stream downloads from Swift object stores without downloading it firstRobin Appelman2014-08-221-5/+4
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-25477-3418/+3447
| | |
* | | Merge pull request #10528 from owncloud/fix-htaccess-check-errorLukas Reschke2014-08-241-184/+225
|\ \ \ | | | | | | | | Fix htaccess check error
| * | | Throw exception if file cannot be accessed via httpClark Tomlinson2014-08-221-184/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format file Removing calls to deprecated classes and using internal method to get via http Missed a character Fix inverted logic
* | | | Merge pull request #9818 from owncloud/fix-mount-file-configRobin McCorkell2014-08-241-1/+1
|\ \ \ \ | | | | | | | | | | Comment out mount_file config option
| * | | | Comment out mount_file config optionRobin McCorkell2014-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | Prevents sample config issues with external storages. Fixes #9734
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-24525-1121/+1258
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-23617-3328/+5497
| |/ / / |/| | |
* | | | Merge pull request #10584 from owncloud/simple-wizard-trusted-domainsThomas Müller2014-08-227-12/+58
|\ \ \ \ | | | | | | | | | | Add a trusted domain wizard
| * | | | Redirect user after clicking on linkLukas Reschke2014-08-222-4/+6
| | | | | | | | | | | | | | | | | | | | Use DI
| * | | | Expose setSystemValueLukas Reschke2014-08-222-6/+4
| | | | |
| * | | | Add a trusted domain wizardLukas Reschke2014-08-215-6/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a little button to the trusted domain warning, if an admin clicks on the warning he will be redirected to ownCloud and asked whether he want to trust this domain. By far not the cleanest code, or clean at all, but does the job and I don't see a reason to make a lot of changes for this little improvement.
* | | | | Merge pull request #10590 from owncloud/fix-10585Clark Tomlinson2014-08-221-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Add require_once to update.php due to routing
| * | | | | Add require_once to update.php due to routingLukas Reschke2014-08-221-0/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/10585 Partially reverts 52d5429768acdb87b2dc2efedc89eb4ad0d29139
* | | | | Merge pull request #7539 from owncloud/repair-legacystorageidThomas Müller2014-08-227-10/+547
|\ \ \ \ \ | |/ / / / |/| | | | Added repair script to upgrade the legacy home storage ids
| * | | | no statement caching for OracleThomas Müller2014-08-221-0/+5
| | | | |
| * | | | Explicily close the statement cursorsVincent Petry2014-08-201-0/+2
| | | | | | | | | | | | | | | | | | | | Fixes the issue that makes SQLite freeze on later tests.
| * | | | Fix unit test messing up the transaction on OracleVincent Petry2014-08-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the unit test is skipped anyway for Oracle, the dropTable() call should be skipped as well to avoid having a leftover transaction and cause further transactions to be nested and break the next test suites requiring transactions.
| * | | | Added repair step for legacy storagesVincent Petry2014-08-205-10/+535
| | | | |
* | | | | no external files on windows for nowThomas Müller2014-08-221-0/+2
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-22477-1522/+1549
| |/ / / |/| | |
* | | | Merge pull request #10522 from owncloud/removeLoadAppScriptblizzz2014-08-219-42/+86
|\ \ \ \ | |_|_|/ |/| | | Remove loadAppScriptFile
| * | | Add update route to coreLukas Reschke2014-08-192-2/+2
| | | |
| * | | Remove loadAppScriptFile from the default routesLukas Reschke2014-08-191-10/+0
| | | |
| * | | Add routing to user_ldapLukas Reschke2014-08-191-0/+22
| | | |
| * | | Add routing to files_versionsLukas Reschke2014-08-191-0/+5
| | | |
| * | | Add routing to files_trashbinLukas Reschke2014-08-191-0/+9
| | | |
| * | | Add routing to files_encryptionLukas Reschke2014-08-191-0/+13
| | | |
| * | | Add routing to files_sharingLukas Reschke2014-08-191-4/+8
| | | |
| * | | Use proper routes for filesLukas Reschke2014-08-191-0/+27
| | | |
| * | | Remove loadAppScriptFileLukas Reschke2014-08-191-26/+0
| | | |
* | | | Merge pull request #10573 from owncloud/share-dropdownfixwhenlinkdisallowedVincent Petry2014-08-212-11/+17
|\ \ \ \ | | | | | | | | | | Fix share dropdown when links are not allowed
| * | | | Fix share dropdown when links are not allowedVincent Petry2014-08-212-11/+17
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | When links are not allowed, the email field does not exist and autocomplete returns null. This causes Javascript errors. The fix prevents entering the bogus block when links aren't allowed, as it doesn't make sense to enter it in such cases anyway.
* | | | Merge pull request #10548 from owncloud/encryption-app-descriptionMorris Jobke2014-08-211-2/+2
|\ \ \ \ | | | | | | | | | | Better description to prevent people from misunderstanding the use case of encryption app
| * | | | Better description to prevent people from misunderstanding the use caseBernhard Posselt2014-08-211-2/+2
| | | | |
* | | | | no external files on windows for nowThomas Müller2014-08-211-2/+2
| | | | |
* | | | | no external files on windows for nowThomas Müller2014-08-211-0/+2
| | | | |
* | | | | Merge pull request #10458 from owncloud/fix-tar-testsLukas Reschke2014-08-212-115/+140
|\ \ \ \ \ | | | | | | | | | | | | temporarily disable TAR tests on travis
| * | | | | Fix windows tests skippingMorris Jobke2014-08-211-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | * add call to setUp from inherited test class
| * | | | | Add files as string to tar archivesRobin Appelman2014-08-211-6/+2
| | | | | |
| * | | | | reformatRobin Appelman2014-08-211-112/+136
|/ / / / /