summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \
| * | | | | fixes from git push forceMorris Jobke2014-08-121-2/+0
|/ / / / /
* | | | | fix broken variable name, recoveryPasswordSupported is now recoveryEnabledFor...Bjoern Schiessle2014-08-121-3/+3
* | | | | add unit testsBjoern Schiessle2014-08-121-0/+49
* | | | | fix detection of system wide mount pointsBjoern Schiessle2014-08-121-8/+33
* | | | | Merge pull request #9762 from owncloud/owner-publicRobin Appelman2014-08-122-0/+16
|\ \ \ \ \
| * | | | | Add test for homestorage getOwnerRobin Appelman2014-07-221-0/+6
| * | | | | Return the proper owner for home storagesRobin Appelman2014-07-211-0/+10
* | | | | | Merge pull request #10357 from owncloud/l10n-alert-fixVolkan Gezer2014-08-121-1/+1
|\ \ \ \ \ \
| * | | | | | Fix alert textVolkan Gezer2014-08-121-1/+1
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-12449-11284/+11486
|/ / / / / /
* | | | | | Merge pull request #10347 from owncloud/fix-grammarVolkan Gezer2014-08-111-1/+1
|\ \ \ \ \ \
| * | | | | | Transifex suggestion by mnestisVolkan Gezer2014-08-111-1/+1
* | | | | | | Merge pull request #10335 from owncloud/fix-emptyapplistClark Tomlinson2014-08-111-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix issue when no apps are enabledVincent Petry2014-08-111-0/+1
| |/ / / / / /