summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10413 from owncloud/adding-handlebarsLukas Reschke2014-08-151-0/+2746
|\ | | | | Adding handlebars.js
| * Adding handlebars.jsThomas Müller2014-08-141-0/+2746
| |
* | Merge pull request #10449 from owncloud/share-clientsidesortnoservercallLukas Reschke2014-08-152-5/+23
|\ \ | | | | | | Client side sort for sharing overview
| * | Client side sort for sharing overviewVincent Petry2014-08-152-5/+23
| | | | | | | | | | | | | | | Since the server doesn't support sorting, use client side sort directly instead of calling reload() first.
* | | Merge pull request #10452 from owncloud/bettersslThomas Müller2014-08-151-1/+1
|\ \ \ | | | | | | | | We'd better use SSL in capital
| * | | ssl capitalVolkan Gezer2014-08-151-1/+1
|/ / /
* | | Merge pull request #10442 from owncloud/move-failed-loginsLukas Reschke2014-08-153-10/+5
|\ \ \ | |/ / |/| | Move authentication failed logging to checkPassword
| * | Fix unit testLukas Reschke2014-08-151-1/+4
| | |
| * | Move authentication failed logging to checkPasswordLukas Reschke2014-08-153-10/+2
| | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/10366
* | | Merge pull request #10440 from owncloud/enforce-debugClark Tomlinson2014-08-151-7/+0
|\ \ \ | | | | | | | | Remove ability to trigger DEBUG mode via cookie
| * | | Remove ability to trigger DEBUG mode via cookieLukas Reschke2014-08-151-7/+0
| |/ / | | | | | | | | | | | | Users should not be able to enable debug mode on their own by setting a cookie. Using debug mode might leak too much information about the environment or have other unexpected behaviour. We should backport this.
* | | Merge pull request #9275 from NormalRa/masterLukas Reschke2014-08-154-0/+71
|\ \ \ | | | | | | | | Add .apk mimetype.
| * | | Add APK mimetype tests.Normal Ra2014-08-131-0/+27
| | | |
| * | | Remove stray tab characters.Normal Ra2014-08-131-1/+1
| | | |
| * | | APK mimetype icon to be a generic package icon.Normal Ra2014-08-121-0/+1
| | | |
| * | | Add APK mimetype repair scenario.Normal Ra2014-08-121-0/+42
| | | |
| * | | Add .apk mimetype.Normal Ra2014-06-281-0/+1
| | | |
* | | | Merge pull request #10439 from owncloud/design-fix-contrastMorris Jobke2014-08-151-3/+2
|\ \ \ \ | |_|/ / |/| | | change error text color to white for better contrast, fix #10424
| * | | change error text color to white for better contrast, fix #10424Jan-Christoph Borchardt2014-08-151-3/+2
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-15375-4081/+5098
| | |
* | | Merge pull request #10434 from owncloud/update_deprecation_docMorris Jobke2014-08-159-2/+22
|\ \ \ | | | | | | | | add missing @deprecated annotation to legacy classes
| * | | add missing @deprecated annotation to legacy classesJörn Friedrich Dreyer2014-08-149-2/+22
| | | |
* | | | Merge pull request #10374 from ogasser/compare_upload_limit_against_biggest_fileJan-Christoph Borchardt2014-08-141-4/+7
|\ \ \ \ | |/ / / |/| | | Compare upload limit against biggest file
| * | | Compare upload limit against biggest fileOliver Gasser2014-08-121-4/+7
| | | | | | | | | | | | | | | | | | | | When uploading multiple files from the web interface, compare the PHP upload limit against the largest file, not against the sum of all files.
* | | | Merge pull request #10417 from owncloud/update_deprecation_docThomas Müller2014-08-144-4/+4
|\ \ \ \ | | | | | | | | | | update deprecation docs
| * | | | update deprecation docsJörn Friedrich Dreyer2014-08-144-4/+4
| | | | |
* | | | | Merge pull request #10399 from owncloud/fix_setSendMailStatusBjörn Schießle2014-08-143-7/+9
|\ \ \ \ \ | | | | | | | | | | | | [sharing] fix mail notification
| * | | | | we need the recipient as a additional parameter to know for which share the ↵Bjoern Schiessle2014-08-133-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | notification was send
* | | | | | Merge pull request #10398 from owncloud/external-share-ssl-warnRobin Appelman2014-08-141-11/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | Give a better error message for external shares with self-signed ssl certificates
| * | | | | | Give a better error message for external shares with self-signed ssl ↵Robin Appelman2014-08-131-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | certificates
* | | | | | | Merge pull request #10414 from owncloud/relax-code-checkerClark Tomlinson2014-08-141-4/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | in order to prevent false-positives on the code checker - exec and eval ...
| * | | | | | | in order to prevent false-positives on the code checker - exec and eval will ↵Thomas Müller2014-08-141-4/+0
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | not longer be grepped for
* | | | | | | Merge pull request #10410 from owncloud/typoVolkan Gezer2014-08-141-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | ascii typo
| * | | | | | ascii typoVolkan Gezer2014-08-141-1/+1
| | | | | | |
* | | | | | | Merge pull request #10295 from owncloud/file_actions_error_handlingBjörn Schießle2014-08-144-9/+62
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | file actions improved error handling
| * | | | | | | new unit test addedBjoern Schiessle2014-08-111-4/+42
| | | | | | | |
| * | | | | | | no error if we try to delete a file which no longer existsBjoern Schiessle2014-08-111-1/+2
| | | | | | | |
| * | | | | | | no special action for folder named 'Shared' neededBjoern Schiessle2014-08-111-1/+1
| | | | | | | |
| * | | | | | | add error message if user wants to rename a file which no longer existsBjoern Schiessle2014-08-112-4/+18
| | | | | | | |
* | | | | | | | Merge pull request #10395 from owncloud/close-filehandle-lib-filesMorris Jobke2014-08-143-0/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Close open file handles in files library
| * | | | | | | Close open file handles in files libraryMorris Jobke2014-08-133-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref #10392
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-14305-1338/+1352
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #10396 from owncloud/kill-filesyncThomas Müller2014-08-132-65/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Kill filesync.php in files/appinfo
| * | | | | | | Kill filesync.php in files/appinfoMorris Jobke2014-08-132-65/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * ref comment: https://github.com/owncloud/core/issues/10392#issuecomment-52050567
* | | | | | | Merge pull request #10394 from owncloud/close-filehandle-lib-imageThomas Müller2014-08-131-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Close file handle if exception occurs in image class
| * | | | | | | Close file handle if exception occurs in image classMorris Jobke2014-08-131-0/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | ref #10392
* | | | | | | Merge pull request #10403 from owncloud/getid-cast-intLukas Reschke2014-08-132-2/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Cast file id's to int so we can compare them properly
| * | | | | | Cast file id's to int so we can compare them properlyRobin Appelman2014-08-132-2/+3
|/ / / / / /
* | | | | | Merge pull request #10323 from gekmihesg/masterblizzz2014-08-131-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Load authentication backends before tryBasicAuth
| * | | | | Load authentication backends before tryBasicAuthgekmihesg2014-08-101-0/+3
| | | | | |