summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix testsMorris Jobke2016-11-291-1/+2
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Use displaynameJohn Molakvoæ2016-11-291-2/+3
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* [tx-robot] updated from transifexNextcloud bot2016-11-29144-1550/+1648
|
* Merge pull request #2386 from nextcloud/fix-iphone-and-ipadChristoph Wurst2016-11-291-2/+4
|\ | | | | Fix Regex for iPhone and add iPad
| * Fix Regex for iPhone and add iPadLukas Reschke2016-11-281-2/+4
| | | | | | | | | | | | | | | | The previous Regex worked for an iPhone with version "10.0" but not with "10.0.1" which was wrong. I modified the Regex to also match for those situations. I also added a Regex for the iPad Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #2383 from nextcloud/add-icon-for-remote-share-notificationsRoeland Jago Douma2016-11-282-5/+9
|\ \ | |/ |/| Add an icon to the federated sharing notification
| * Add an icon to the federated sharing notificationJoas Schilling2016-11-282-5/+9
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2237 from ↵blizzz2016-11-283-32/+107
|\ \ | | | | | | | | | | | | nextcloud/rich-strings-and-icons-for-mention-notifications Rich strings and icons for mention notifications
| * | Adjust testsJoas Schilling2016-11-231-18/+56
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Use the comment icon for the notificationsJoas Schilling2016-11-232-1/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Set the rich object string for comment notificationsJoas Schilling2016-11-231-13/+49
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #2375 from Morlinest/patch-1Lukas Reschke2016-11-281-0/+1
|\ \ \ | | | | | | | | Mark all content in search field
| * | | Mark all content in search fieldMorlinest2016-11-281-0/+1
| | | | | | | | | | | | To resolve issue #2310
* | | | Merge pull request #2380 from nextcloud/make-it-beta-2Lukas Reschke2016-11-281-2/+2
|\ \ \ \ | | | | | | | | | | Increase version to Beta 2
| * | | | Increase version to Beta 2Lukas Reschke2016-11-281-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Just as a precaution already so we can easily ship this via the updater to the beta channel properly to Beta 1 users Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #2378 from nextcloud/fix-preview-image_srcMorris Jobke2016-11-281-1/+1
|\ \ \ \ | |/ / / |/| | | Fix image_src link
| * | | Fix image_src linkLukas Reschke2016-11-281-1/+1
| |/ / | | | | | | | | | | | | | | | The link in the image_src link (used for previews on Social Media such as Facebook) was still using the old route. This changes it to use the new route. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #2335 from nextcloud/grouping-for-activitiesMorris Jobke2016-11-285-109/+412
|\ \ \ | |/ / |/| | Bring back grouping for activities
| * | Add an event merger and use it for the files activitiesJoas Schilling2016-11-255-1/+344
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Working towards groupsJoas Schilling2016-11-251-108/+68
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #2342 from nextcloud/filepicker-shadowLukas Reschke2016-11-284-44/+30
|\ \ \ | | | | | | | | Fix filepicker styling
| * | | move more sizing logic to cssRobin Appelman2016-11-284-22/+15
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | fix dialog to window using cssRobin Appelman2016-11-282-12/+4
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | center dialog using cssRobin Appelman2016-11-282-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | limit filepicker height to screenRobin Appelman2016-11-251-8/+1
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | fix styling of filepicker dialogRobin Appelman2016-11-253-8/+15
| |/ / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #2367 from ↵Joas Schilling2016-11-282-5/+15
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/issue-2349-keep-filemtime-for-zip-downloads Keep the filemtime for files when downloading them in a zip/tar
| * | | Add doc block for $timeJoas Schilling2016-11-281-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Keep the filemtime for files when downloading them in a zip/tarJoas Schilling2016-11-282-5/+14
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #2351 from nextcloud/remember-session-defaultLukas Reschke2016-11-282-4/+44
|\ \ \ \ | | | | | | | | | | do not remember session tokens by default
| * | | | fix parameter orderChristoph Wurst2016-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | do not remember session tokens by defaultChristoph Wurst2016-11-272-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to respect the value of the remember-me checkbox. Due to an error in the source code the default value for the session token was to remember it. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #2353 from nextcloud/renew-session-token-rememberLukas Reschke2016-11-282-1/+12
|\ \ \ \ \ | | | | | | | | | | | | copy remember-me value when renewing a session token
| * | | | | copy remember-me value when renewing a session tokenChristoph Wurst2016-11-272-1/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On renew, a session token is duplicated. For some reason we did not copy over the remember-me attribute value. Hence, the new token was deleted too early in the background job and remember-me did not work properly. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #2341 from nextcloud/filepicker-public-shareLukas Reschke2016-11-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | use public share fileclient when available
| * | | | | use public share fileclient when availableRobin Appelman2016-11-251-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #2363 from nextcloud/fix-2329Morris Jobke2016-11-281-3/+7
|\ \ \ \ \ | | | | | | | | | | | | open popup menu in share dialog only for one sharee on render
| * | | | | open popup menu in share dialog only for one sharee on renderArthur Schiwon2016-11-281-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #2365 from ↵Lukas Reschke2016-11-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/resize-the-controls-after-the-sidebar-slided-in Make sure the controls is resized after the sidebar disappeared
| * | | | | | Make sure the controls is resized after the sidebar disappearedJoas Schilling2016-11-281-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #2336 from nextcloud/fix-share-by-mail-permissionsBjörn Schießle2016-11-282-8/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | bring back permissions for mail shares
| * | | | | | bring back permissions for mail sharesBjoern Schiessle2016-11-282-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | Merge pull request #2366 from nextcloud/phpdoc-hintexceptionBjörn Schießle2016-11-281-0/+32
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | add missing phpdoc to HintException
| * | | | | | add missing phpdoc to HintExceptionArthur Schiwon2016-11-281-0/+32
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #2312 from nextcloud/move-sharebymail-to-new-apiBjörn Schießle2016-11-284-258/+181
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Move ShareByMail activities to new API
| * | | | | Correctly match the subjects to the parametersJoas Schilling2016-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Remove old testJoas Schilling2016-11-251-68/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Get user name from contacts if availableJoas Schilling2016-11-251-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Move ShareByMail activities to new APIJoas Schilling2016-11-243-195/+154
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2016-11-284-4/+4
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-10 05:29:33 +0000