summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* handle duplicate slashes in case of reverse proxy configurationThomas Müller2013-11-252-1/+24
* Merge pull request #5960 from owncloud/enc_small_visual_improvementsVincent Petry2013-11-251-5/+5
|\
| * - show a spinner while decrypting files if the encryption app was disabledBjoern Schiessle2013-11-201-5/+5
* | Merge pull request #6025 from owncloud/typoVincent Petry2013-11-251-1/+1
|\ \
| * | fix typoBjoern Schiessle2013-11-251-1/+1
|/ /
* | Merge pull request #5991 from owncloud/extstorage-mountpointvalidationMorris Jobke2013-11-252-0/+56
|\ \
| * | Now also preventing the user of "Shared" as mountpointVincent Petry2013-11-222-2/+4
| * | Added unit test for root mount point validationVincent Petry2013-11-211-0/+49
| * | Prevent using root as mount point for external storageVincent Petry2013-11-211-0/+5
* | | Merge pull request #5998 from owncloud/navigation-fixThomas Müller2013-11-241-5/+6
|\ \ \
| * | | fix navigation scrollbarMorris Jobke2013-11-221-5/+6
| * | | Doesn't Cut the top arrow from navigationraghunayyar2013-11-221-3/+3
* | | | Merge pull request #6021 from owncloud/show_buildThomas Müller2013-11-244-2/+16
|\ \ \ \
| * | | | remove logic from template and fix syntax errorThomas Mueller2013-11-242-2/+2
| * | | | add new function to generate the human readable version string based on versi...Thomas Mueller2013-11-241-0/+13
| * | | | replace echo with pFrank Karlitschek2013-11-242-2/+2
| * | | | show the build number if on the daily build update channelFrank Karlitschek2013-11-242-2/+2
| * | | | send the build number too to push the next daily build. This is needed for th...Frank Karlitschek2013-11-241-0/+1
* | | | | Merge pull request #5874 from owncloud/fix-5845Thomas Müller2013-11-242-2/+2
|\ \ \ \ \
| * | | | | Compare dirname() results to DIRECTORY_SEPARATOR, not '/'ringmaster2013-11-141-1/+1
| * | | | | Alias the aggregate columns so SQL Server doesn't combine them.ringmaster2013-11-141-1/+1
* | | | | | Merge pull request #6018 from owncloud/fix_overwritehostThomas Müller2013-11-242-1/+28
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | adding simple unit test to test scriptName() under overwrite conditionThomas Mueller2013-11-241-0/+26
| * | | | | update PHPDocThomas Mueller2013-11-241-0/+1
| * | | | | fix overwrite host support and make the code a bit more readableFrank Karlitschek2013-11-241-1/+1
|/ / / / /
* | | | | Merge pull request #5995 from owncloud/extstorage-isreadablefixVincent Petry2013-11-248-52/+13
|\ \ \ \ \
| * | | | | Moved default isReadable/isUpdatable impl into Common classVincent Petry2013-11-228-57/+13
| * | | | | Return plausible isReadable() default impl for ext storageVincent Petry2013-11-221-2/+7
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-24124-310/+393
|/ / / / /
* | | | | Revert "use relative paths to create images from a file. This way it also wor...Bjoern Schiessle2013-11-221-16/+15
* | | | | Merge pull request #6003 from owncloud/incognito_modeVincent Petry2013-11-222-1/+14
|\ \ \ \ \
| * | | | | set incognito mode for public.php calls. Because in this case ownCloud should...Bjoern Schiessle2013-11-221-0/+1
| * | | | | add incognito mode, allows to hide my user ID. For example, this is useful to...Bjoern Schiessle2013-11-221-1/+13
* | | | | | fixed documentationThomas Müller2013-11-221-1/+1
* | | | | | Merge pull request #5882 from owncloud/preview-movie-5sThomas Müller2013-11-221-4/+6
|\ \ \ \ \ \
| * | | | | | we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB.Thomas Müller2013-11-221-1/+3
| * | | | | | Working on a chunked video can result in a broken frame index the option -vsy...Thomas Müller2013-11-221-1/+1
| * | | | | | Movie preview - use frame after 5 secondsMorris Jobke2013-11-151-2/+2
* | | | | | | Merge pull request #6000 from owncloud/use_relative_path_to_create_imagesRaghu Nayyar2013-11-221-15/+16
|\ \ \ \ \ \ \
| * | | | | | | use relative paths to create images from a file. This way it also works ifBjoern Schiessle2013-11-221-15/+16
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #5040 from owncloud/public_api_avatar_masterblizzz2013-11-227-3/+125
|\ \ \ \ \ \ \
| * | | | | | | fixing PHPDoc comments and syntaxThomas Müller2013-11-223-4/+6
| * | | | | | | Add missing Avatar InterfaceArthur Schiwon2013-11-221-0/+38
| * | | | | | | Round out Avatar Public APIArthur Schiwon2013-11-215-76/+47
| * | | | | | | Fix a regression (Tags→TagManager)kondou2013-11-071-1/+1
| * | | | | | | Remove duplicate getAvatarManager()kondou2013-11-071-9/+0
| * | | | | | | Add public API for \OC\Avatarkondou2013-11-075-2/+122
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-21159-3216/+4017
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge pull request #5970 from owncloud/extstorage-webdavdotdirfixVincent Petry2013-11-211-5/+3
|\ \ \ \ \ \ \
| * | | | | | | Fixed path normalization to prevent dot dirsVincent Petry2013-11-211-5/+3