summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-21492-1103/+1236
| | | |
* | | | Merge pull request #10562 from Volker-E/masterClark Tomlinson2014-08-202-2/+2
|\ \ \ \ | | | | | | | | | | fixing #10561 & HTML structure
| * | | | Removing `x-webkit-speech` attribute #10561Volker E.2014-08-201-1/+1
| | | | | | | | | | | | | | | Remove obsolete (from Google Chrome 36 on) attribute due to security vulnerability
| * | | | fix HTML structure by rmv. obsolete input end tagVolker E.2014-08-201-1/+1
| | | | |
* | | | | Merge pull request #10518 from owncloud/fix_storage_const_autoloadLukas Reschke2014-08-2012-18/+29
|\ \ \ \ \ | |/ / / / |/| | | | Fix storage const autoload
| * | | | Add doc for \OCP\Files\FileInfo space constantsMorris Jobke2014-08-191-0/+9
| | | | |
| * | | | fix typoMorris Jobke2014-08-191-1/+1
| | | | |
| * | | | move to public namespaceMorris Jobke2014-08-1912-17/+18
| | | | |
| * | | | Use tabs for indentation.Stephan Peijnik2014-08-191-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
| * | | | Fix STORAGE_* constants usage by moving those constants into ↵Stephan Peijnik2014-08-1910-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \OC\Files\Filesystem. As constants not defined within a class cannot be automatically found by the autoloader moving those constants into a class makes them accessible to code which uses them. Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
* | | | | Merge pull request #10557 from owncloud/better-hover-appsMorris Jobke2014-08-201-7/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | full opacity for the hovered/focused app as well for better contrast
| * | | | full opacity for the hovered/focused app as well for better contrastJan-Christoph Borchardt2014-08-201-7/+2
| | |/ / | |/| |
* | | | Merge pull request #10422 from owncloud/dav-disablerangerequestwhennotsupportedVincent Petry2014-08-201-0/+22
|\ \ \ \ | | | | | | | | | | Return whole file if range request cannot be granted due to encryption
| * | | | Return whole file if range request cannot be granted due to encryptionVincent Petry2014-08-141-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenenver range headers are set and encryption is enabled, it is not possible to automatically fseek() to the proper position. To avoid returning corrupt/invalid data or causing a decryption error, the range headers are stripped so that the SabreDAV code in httpGet() returns the whole file.
* | | | | Merge pull request #10546 from owncloud/add-note-about-cheersThomas Müller2014-08-202-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Add note about the term "Cheers" at end of mail
| * | | | | Add note about the term "Cheers" at end of mailMorris Jobke2014-08-202-0/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | * for translators * fixes #8689