summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2375 from Morlinest/patch-1Lukas Reschke2016-11-281-0/+1
|\
| * Mark all content in search fieldMorlinest2016-11-281-0/+1
* | Merge pull request #2380 from nextcloud/make-it-beta-2Lukas Reschke2016-11-281-2/+2
|\ \
| * | Increase version to Beta 2Lukas Reschke2016-11-281-2/+2
* | | Merge pull request #2378 from nextcloud/fix-preview-image_srcMorris Jobke2016-11-281-1/+1
|\ \ \ | |/ / |/| |
| * | Fix image_src linkLukas Reschke2016-11-281-1/+1
| |/
* | Merge pull request #2335 from nextcloud/grouping-for-activitiesMorris Jobke2016-11-285-109/+412
|\ \ | |/ |/|
| * Add an event merger and use it for the files activitiesJoas Schilling2016-11-255-1/+344
| * Working towards groupsJoas Schilling2016-11-251-108/+68
* | Merge pull request #2342 from nextcloud/filepicker-shadowLukas Reschke2016-11-284-44/+30
|\ \
| * | move more sizing logic to cssRobin Appelman2016-11-284-22/+15
| * | fix dialog to window using cssRobin Appelman2016-11-282-12/+4
| * | center dialog using cssRobin Appelman2016-11-282-2/+3
| * | limit filepicker height to screenRobin Appelman2016-11-251-8/+1
| * | fix styling of filepicker dialogRobin Appelman2016-11-253-8/+15
| |/
* | Merge pull request #2367 from nextcloud/issue-2349-keep-filemtime-for-zip-dow...Joas Schilling2016-11-282-5/+15
|\ \
| * | Add doc block for $timeJoas Schilling2016-11-281-0/+1
| * | Keep the filemtime for files when downloading them in a zip/tarJoas Schilling2016-11-282-5/+14
* | | Merge pull request #2351 from nextcloud/remember-session-defaultLukas Reschke2016-11-282-4/+44
|\ \ \
| * | | fix parameter orderChristoph Wurst2016-11-281-1/+1
| * | | do not remember session tokens by defaultChristoph Wurst2016-11-272-4/+44
* | | | Merge pull request #2353 from nextcloud/renew-session-token-rememberLukas Reschke2016-11-282-1/+12
|\ \ \ \
| * | | | copy remember-me value when renewing a session tokenChristoph Wurst2016-11-272-1/+12
| |/ / /
* | | | Merge pull request #2341 from nextcloud/filepicker-public-shareLukas Reschke2016-11-281-1/+1
|\ \ \ \
| * | | | use public share fileclient when availableRobin Appelman2016-11-251-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #2363 from nextcloud/fix-2329Morris Jobke2016-11-281-3/+7
|\ \ \ \
| * | | | open popup menu in share dialog only for one sharee on renderArthur Schiwon2016-11-281-3/+7
* | | | | Merge pull request #2365 from nextcloud/resize-the-controls-after-the-sidebar...Lukas Reschke2016-11-281-1/+1
|\ \ \ \ \
| * | | | | Make sure the controls is resized after the sidebar disappearedJoas Schilling2016-11-281-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2336 from nextcloud/fix-share-by-mail-permissionsBjörn Schießle2016-11-282-8/+7
|\ \ \ \ \
| * | | | | bring back permissions for mail sharesBjoern Schiessle2016-11-282-8/+7
* | | | | | Merge pull request #2366 from nextcloud/phpdoc-hintexceptionBjörn Schießle2016-11-281-0/+32
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | add missing phpdoc to HintExceptionArthur Schiwon2016-11-281-0/+32
|/ / / / /
* | | | | Merge pull request #2312 from nextcloud/move-sharebymail-to-new-apiBjörn Schießle2016-11-284-258/+181
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Correctly match the subjects to the parametersJoas Schilling2016-11-251-2/+2
| * | | | Remove old testJoas Schilling2016-11-251-68/+0
| * | | | Get user name from contacts if availableJoas Schilling2016-11-251-2/+34
| * | | | Move ShareByMail activities to new APIJoas Schilling2016-11-243-195/+154
* | | | | [tx-robot] updated from transifexNextcloud bot2016-11-284-4/+4
* | | | | [tx-robot] updated from transifexNextcloud bot2016-11-282-2/+2
| |/ / / |/| | |
* | | | Merge pull request #2361 from nextcloud/2fa-backup-codes-undefined-indexMorris Jobke2016-11-281-0/+3
|\ \ \ \
| * | | | fix undefined index error when the backup codes provider is not activeChristoph Wurst2016-11-281-0/+3
* | | | | Merge pull request #2327 from nextcloud/exclude-pre-releasesChristoph Wurst2016-11-282-23/+45
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Exclude pre-release versions as per SemVerLukas Reschke2016-11-252-23/+45
* | | | | [tx-robot] updated from transifexNextcloud bot2016-11-2832-4/+144
| |_|_|/ |/| | |
* | | | Merge pull request #2343 from nextcloud/fix-exteranl-storage-redirectJoas Schilling2016-11-271-1/+1
|\ \ \ \
| * | | | Fix link to external storage settings on error notificationFelix A. Epp2016-11-261-1/+1
* | | | | [tx-robot] updated from transifexNextcloud bot2016-11-2750-34/+314
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2016-11-26234-960/+2294
* | | | Merge pull request #2340 from nextcloud/autocomplete-max-width-to-inputMorris Jobke2016-11-253-0/+10
|\ \ \ \ | |_|_|/ |/| | |