summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Remove ability to trigger DEBUG mode via cookieLukas Reschke2014-08-151-7/+0
| |/ / / / / /
* | | | | | | Merge pull request #9275 from NormalRa/masterLukas Reschke2014-08-154-0/+71
|\ \ \ \ \ \ \
| * | | | | | | 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 #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 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 fileOliver Gasser2014-08-121-4/+7
* | | | | | | | Merge pull request #10417 from owncloud/update_deprecation_docThomas Müller2014-08-144-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | we need the recipient as a additional parameter to know for which share the n...Bjoern Schiessle2014-08-133-7/+9
* | | | | | | | | | 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 certific...Robin Appelman2014-08-131-11/+17
* | | | | | | | | | | 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 will ...Thomas Müller2014-08-141-4/+0
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #10410 from owncloud/typoVolkan Gezer2014-08-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | ascii typoVolkan Gezer2014-08-141-1/+1
* | | | | | | | | | | Merge pull request #10295 from owncloud/file_actions_error_handlingBjörn Schießle2014-08-144-9/+62
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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 libraryMorris Jobke2014-08-133-0/+3
* | | | | | | | | | | | [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/appinfoMorris Jobke2014-08-132-65/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #10394 from owncloud/close-filehandle-lib-imageThomas Müller2014-08-131-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Close file handle if exception occurs in image classMorris Jobke2014-08-131-0/+4
| |/ / / / / / / / /
* | | | | | | | | | 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 properlyRobin Appelman2014-08-132-2/+3
|/ / / / / / / / /
* | | | | | | | | Merge pull request #10323 from gekmihesg/masterblizzz2014-08-131-0/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Load authentication backends before tryBasicAuthgekmihesg2014-08-101-0/+3
* | | | | | | | | Merge pull request #10387 from owncloud/quick_fix_for_unit_testsThomas Müller2014-08-131-14/+17
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | don't clean up the test environment if a data provider was finishedBjoern Schiessle2014-08-131-14/+17
* | | | | | | | | Merge pull request #9754 from owncloud/enc_support_aes_256Vincent Petry2014-08-1315-167/+501
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | add unit test for aes256/aes128Bjoern Schiessle2014-07-232-0/+192
| * | | | | | | | update existing unit testsBjoern Schiessle2014-07-235-127/+16
| * | | | | | | | support aes 256Bjoern Schiessle2014-07-2311-84/+337
* | | | | | | | | Merge pull request #10333 from owncloud/tar-55Thomas Müller2014-08-132-6/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix Tar support for php >=5.5Robin Appelman2014-08-112-6/+0
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-1358-211/+291
* | | | | | | | | | Merge pull request #10377 from owncloud/git-fixesMorris Jobke2014-08-121-2/+0
|\ \ \ \ \ \ \ \ \ \