summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-11-1918-12/+52
|
* [tx-robot] updated from transifexNextcloud bot2017-11-1810-0/+16
|
* Merge pull request #7121 from nextcloud/fix_7119Roeland Jago Douma2017-11-174-10/+69
|\ | | | | If there is no internet connection don't try to contact appstore
| * Fix testsRoeland Jago Douma2017-11-173-9/+67
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * If there is no internet connection don't try to contact appstoreRoeland Jago Douma2017-11-171-1/+2
|/ | | | | | Fixes #7119 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #7163 from ↵Jan-Christoph Borchardt2017-11-171-0/+2
|\ | | | | | | | | nextcloud/force-breaks-on-extremely-long-words-in-comments Force breaks on extremely long words in comments
| * Force breaks on extremely long wordsDaniel Calviño Sánchez2017-11-171-0/+2
| | | | | | | | | | | | If not broken extremely long words overflow their container. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #7206 from nextcloud/fix-object-storage-touchBjörn Schießle2017-11-171-14/+13
|\ \ | | | | | | touch opertation on object storage, don't create the file cache entry to early
| * | only create the file cache entry after the empty file was created ↵Bjoern Schiessle2017-11-171-14/+13
|/ / | | | | | | | | | | successfully, otherwise file_exists() call on the initial file_put_content() will indicate that the file already exists Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #7152 from ↵Morris Jobke2017-11-171-0/+16
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/adjust_calendarobject_size_after_applying_class remove cached size from shared calendar objects
| * | remove cached size from shared calendar objectsGeorg Ehrke2017-11-121-0/+16
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-11-1730-2/+104
| | |
* | | Merge pull request #7199 from nextcloud/fix-style-of-reset-password-formMorris Jobke2017-11-161-1/+1
|\ \ \ | | | | | | | | Adjust style of new password form to default
| * | | Adjust style of new password form to defaultMorris Jobke2017-11-161-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #7167 from nextcloud/password-button-overflowMorris Jobke2017-11-161-2/+11
|\ \ \ \ | | | | | | | | | | Fix reset password button overflow
| * | | | Fix reset password button overflowJan-Christoph Borchardt2017-11-141-2/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #7193 from nextcloud/bugfix/noid/invitation-email-refinementsMorris Jobke2017-11-161-4/+6
|\ \ \ \ \ | | | | | | | | | | | | refine invitation email
| * | | | | refine invitation emailGeorg Ehrke2017-11-161-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | Merge pull request #6840 from nextcloud/feature/5282/calendar_apiMorris Jobke2017-11-1618-3/+1274
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Calendar API for apps
| * | | | | add option to filter CalendarAPI by componenttypeGeorg Ehrke2017-11-091-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | | update dav autoloaders after adding calendar apiGeorg Ehrke2017-11-092-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | | update autoloader to included added classes and interfaceGeorg Ehrke2017-11-092-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | | integrate Dav app with Calendar APIGeorg Ehrke2017-11-098-3/+693
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | | implement CalendarManagerGeorg Ehrke2017-11-094-0/+373
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | | Public interfaces for calendar APIGeorg Ehrke2017-11-092-0/+192
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | Merge pull request #7194 from nextcloud/fix-broken-svg-3Morris Jobke2017-11-1633-34/+33
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Re-optimize filetype and category icons
| * | | | | Re-optimize filetype and category iconsMarin Treselj2017-11-1633-34/+33
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | | | | Merge pull request #7188 from nextcloud/fix-broken-svg-2Morris Jobke2017-11-1627-39/+24
|\ \ \ \ \ | | | | | | | | | | | | Re-optimize places and files icons
| * | | | | Re-optimize places and files iconsMarin Treselj2017-11-1527-39/+24
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | | | | | Merge pull request #7189 from nextcloud/security-games-iconsMorris Jobke2017-11-162-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added security and games icons
| * | | | | | Clean up and re-optimize games iconMarin Treselj2017-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | | | | Added security and games iconsJohn Molakvoæ (skjnldsv)2017-11-152-0/+9
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-11-1628-4/+154
| | | | | |
* | | | | | Merge pull request #7173 from ↵Morris Jobke2017-11-152-4/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/show_username_in_invitationsemails Show organizer's name in From field of invitation email
| * | | | | | show name of organizer in from name of invitation emailGeorg Ehrke2017-11-142-4/+27
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | Merge pull request #7177 from nextcloud/fix-black-transparent-dialogsJan-Christoph Borchardt2017-11-151-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix linear gradient from black to white in dialogs in Safari
| * | | | | Fix linear gradient from black to white in dialogs in SafariMorris Jobke2017-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-11-15120-228/+242
| | | | | |
* | | | | | Merge pull request #7169 from nextcloud/fix-user-searchMorris Jobke2017-11-142-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix search in user managent when no group is selected
| * | | | | | Fix search in user managent when no group is selectedMorris Jobke2017-11-142-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * also allows to search by displayname Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #7172 from ↵Morris Jobke2017-11-142-2/+22
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | nextcloud/improve-error-handling-on-preview-cleanup check if the user still exists before we try to cleanup the previews
| * | | | | | check if the user still exists before we try to cleanup the previewsBjoern Schiessle2017-11-142-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | Merge pull request #7171 from nextcloud/bump-versionv13.0.0beta1Lukas Reschke2017-11-141-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | v13.0.0 Beta 1
| * | | | | | | v13.0.0 Beta 1Lukas Reschke2017-11-141-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | Merge pull request #7113 from nextcloud/s3-download-stream-fixBjörn Schießle2017-11-142-3/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix s3 download and touch
| * | | | | | Use non empty files for object store touchRobin Appelman2017-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | Fix contructing headers for s3 downloadRobin Appelman2017-11-081-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #7165 from nextcloud/smb-2.0.3Morris Jobke2017-11-1416-47/+126
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | update icewind/smb to 2.0.3
| * | | | | | update icewind/smb to 2.0.3Robin Appelman2017-11-1416-47/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #7130 from nextcloud/fix-broken-svgJan-Christoph Borchardt2017-11-1497-201/+88
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Optimize SVG icons