summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #6098 from owncloud/files-renamediriconfixMorris Jobke2013-11-281-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Fixed directory icon after renameVincent Petry2013-11-281-0/+6
* | | | | | | | Merge pull request #6100 from owncloud/fix_loginnameusageMorris Jobke2013-11-281-4/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | loginname is not necessarily usernameArthur Schiwon2013-11-281-4/+5
| |/ / / / / / /
* / / / / / / / ownCloud 6 RC1v6.0.0RC1Frank Karlitschek2013-11-281-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #6089 from owncloud/files-mimetyperefreshafterrenameFrank Karlitschek2013-11-285-26/+87
|\ \ \ \ \ \ \
| * | | | | | | Fixed unit tests for ajax renameVincent Petry2013-11-271-19/+44
| * | | | | | | Update file list entry on renameVincent Petry2013-11-272-7/+29
| * | | | | | | Redetect mime type whenever extension is renamedVincent Petry2013-11-272-0/+14
* | | | | | | | Merge pull request #6096 from owncloud/files-txtextfornewfilesVincent Petry2013-11-282-5/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Moved new file extension out of the translated stringVincent Petry2013-11-281-1/+1
| * | | | | | | | New file box now has default file name + extensionVincent Petry2013-11-282-5/+15
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #6070 from ganomi/showstarsFrank Karlitschek2013-11-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Show stars as placeholderganomi2013-11-261-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #6072 from owncloud/mssql-fix-schema-migration-oc6Frank Karlitschek2013-11-281-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | on mssql the schema migration sometimes fails due to an already existing tran...Thomas Mueller2013-11-261-0/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #6094 from owncloud/enc_fix_resharesVincent Petry2013-11-281-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | fix path reconstruction for resharesBjoern Schiessle2013-11-271-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6084 from owncloud/fix-app-routingThomas Müller2013-11-281-1/+5
|\ \ \ \ \ \
| * | | | | | Fix getRawPathInfo for the '/' edge caseRobin Appelman2013-11-271-1/+5
| * | | | | | fix custom routes defined by appsRobin Appelman2013-11-271-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #6048 from owncloud/encryption_initial_enc_indicatorMorris Jobke2013-11-276-17/+89
|\ \ \ \ \ \
| * | | | | | improve encryption messageMorris Jobke2013-11-273-2/+6
| * | | | | | some small js fixesBjoern Schiessle2013-11-271-2/+2
| * | | | | | add spinner to the template so that it can be loaded in timeBjoern Schiessle2013-11-272-1/+3
| * | | | | | switch to large spinnerBjoern Schiessle2013-11-273-2/+7
| * | | | | | switch from "name" attribute to "id"Bjoern Schiessle2013-11-272-3/+3
| * | | | | | Merge branch 'master' into encryption_initial_enc_indicatorBjoern Schiessle2013-11-2733-156/+720
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | with the latest changes in master $this-userID is always the correct ID, so w...Bjoern Schiessle2013-11-272-25/+21
| * | | | | | Merge branch 'master' into encryption_initial_enc_indicatorBjoern Schiessle2013-11-26289-1892/+3226
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | added a small version of the dark loading gif, looks nicer on the blue backgr...Bjoern Schiessle2013-11-262-1/+1
| * | | | | | use POST instead of GETBjoern Schiessle2013-11-262-3/+3
| * | | | | | fix typo in var nameBjoern Schiessle2013-11-261-1/+1
| * | | | | | remove debug outputBjoern Schiessle2013-11-251-1/+0
| * | | | | | show a message at the log-in screen if inital encryption take placeBjoern Schiessle2013-11-255-7/+73
* | | | | | | Merge pull request #6088 from owncloud/fix_public_previewsBjörn Schießle2013-11-271-3/+7
|\ \ \ \ \ \ \
| * | | | | | | fix public preview creation if a user ios logged inBjoern Schiessle2013-11-271-3/+7
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trashBjörn Schießle2013-11-274-39/+116
|\ \ \ \ \ \ \
| * | | | | | | Fixed sharing hook to not remove the share before the trashbinVincent Petry2013-11-272-1/+7
| * | | | | | | only create complete share key if we know the exact pathBjoern Schiessle2013-11-261-1/+3
| * | | | | | | move files to owners trashBjoern Schiessle2013-11-252-41/+110
* | | | | | | | Merge pull request #6086 from owncloud/incognito_modeMorris Jobke2013-11-271-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | return false if user is in incognito modeBjoern Schiessle2013-11-271-2/+2
| | |/ / / / / / | |/| | | | | |
* / | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-27274-11244/+15279
|/ / / / / / /
* | | | | | | Merge pull request #5977 from owncloud/encryption_enable_public_uploadVincent Petry2013-11-278-22/+17
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch 'master' into encryption_enable_public_uploadBjoern Schiessle2013-11-27828-13068/+16529
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #5976 from owncloud/encryption_work_with_public_galleryThomas Müller2013-11-277-93/+123
|\ \ \ \ \ \ \
| * | | | | | | typo fixedBjoern Schiessle2013-11-271-1/+1
| * | | | | | | some small changes according to the review commentsBjoern Schiessle2013-11-277-18/+19
| * | | | | | | Merge branch 'encryption_work_with_public_gallery' of github.com:owncloud/cor...Bjoern Schiessle2013-11-25731-11649/+12619
| |\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-13 13:22:58 +0000