summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4798 from nextcloud/multibucket-root-fsMorris Jobke2017-05-102-2/+47
|\ | | | | Setup root FS for multibucket object storage
| * Use distributed cache for SCSS dependencies as wellMorris Jobke2017-05-101-1/+1
| | | | | | | | | | | | | | * followup to #3978 because with the proper setup of appdata we now are using the same data on all nodes Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Setup root FS for multibucket object storageMorris Jobke2017-05-101-1/+46
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #4762 from nextcloud/add-unsafe-global-eval-fnMorris Jobke2017-05-101-0/+7
|\ | | | | Add fallback to jQuery.fn.globalEval
| * Eval script elemtents in HTML body responseLukas Reschke2017-05-101-0/+7
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #4787 from nextcloud/missing-parameterRoeland Jago Douma2017-05-101-1/+1
|\ \ | | | | | | Fix missing placeholder for doc link
| * | Fix missing placeholder for doc linkJoas Schilling2017-05-101-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #4788 from nextcloud/issue-4756-cron-errorLukas Reschke2017-05-101-5/+23
|\ \ \ | | | | | | | | Fix errors with LookupServerConnector background job
| * | | Use the configured lookup serverJoas Schilling2017-05-101-2/+9
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Define method shouldRunJoas Schilling2017-05-101-3/+14
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #4771 from nextcloud/error-page-logo-cssJoas Schilling2017-05-101-0/+6
|\ \ \ | |/ / |/| | use the same logo css for the error page as the login page
| * | use the same logo css for the error page as the login pageRobin Appelman2017-05-091-1/+7
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #4770 from ↵Morris Jobke2017-05-102-3/+2
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/4749/properties_table_propertyvalue_clob we can't predict the size of propertyvalue. text -> clob
| * | | we can't predict the size of propertyvalue. text -> clobGeorg Ehrke2017-05-092-3/+2
| | |/ | |/| | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-05-10174-572/+530
| | |
* | | Merge pull request #4772 from nextcloud/fix-theming-background-previewLukas Reschke2017-05-101-1/+2
|\ \ \ | | | | | | | | Fix theming preview for background image
| * | | Fix theming preview for background imageJulius Härtl2017-05-091-1/+2
| |/ / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #4702 from nextcloud/handle-user-folder-not-availableRoeland Jago Douma2017-05-091-0/+4
|\ \ \ | | | | | | | | Stop if user folder is not available
| * | | Stop if user folder is not availableMorris Jobke2017-05-091-0/+4
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4737 from nextcloud/logo-icon-containerRobin Appelman2017-05-091-1/+2
|\ \ \ | |/ / |/| | fix sizing of logo in header
| * | fix sizing of logo in headerRobin Appelman2017-05-081-1/+2
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #4758 from nextcloud/fix_3470Roeland Jago Douma2017-05-091-2/+3
|\ \ | | | | | | Do not write and read rootcerts.crt at the same time
| * | Do not write and read rootcerts.crt at the same timeRoeland Jago Douma2017-05-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Possibly) fixes #3470 When updating the main file /files_external/rootcerts.crt we should not read from /files_external/rootcerts.crt at the same time. For 2 reasons: writing to a file and reading from it at the same time can have non deterministic results And we don't want all the certificates to appear 2 times in there. This isn't caught by our standard file locking (that does not allow this actually) because it is in a non locked path.... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #4746 from ↵Roeland Jago Douma2017-05-092-6/+131
|\ \ \ | |/ / |/| | | | | | | | nextcloud/fix-mentioned-user-not-clickable-after-posting-or-editing-a-comment Fix mentioned user not clickable after posting or editing a comment
| * | Fix mentioned user not clickable after posting or editing a commentDaniel Calviño Sánchez2017-05-082-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The contactsMenu plugin was called on avatar elements from _postRenderItem, which is called when a new comment is added to the collection. Due to this contactsMenu was not called when messages were edited; when a new comment is posted _postRenderItem is called, but at that time the "mentions" attribute is not filled yet, so "@username" is not replaced by avatars in the message and thus contactsMenu has no avatars to be called on. Calling contactsMenu was moved to a new method, _postRenderMessage, which is called from _postRenderItem and from the success callback when fetching the model in _onSubmitSuccess (which replaces "@username" by avatars in the message after posting or editing a comment). Fixes #4555 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add missing unit tests for comments with mentionsDaniel Calviño Sánchez2017-05-081-3/+117
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #4752 from nextcloud/fix-personal-settings-popoverRoeland Jago Douma2017-05-091-3/+3
|\ \ \ | | | | | | | | Fix privacy settings drop downs on personal settings page
| * | | Fix privacy settings drop downs on personal settings pageMorris Jobke2017-05-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | * fixes #4672 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4736 from nextcloud/richdef-opengraphv12.0.0beta2Lukas Reschke2017-05-091-0/+68
|\ \ \ \ | | | | | | | | | | open-graph
| * | | | Add circle as wellJoas Schilling2017-05-091-0/+25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | my name as authorMaxence Lange2017-05-091-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
| * | | | using title as nameMaxence Lange2017-05-091-8/+8
| | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
| * | | | open-graphMaxence Lange2017-05-081-0/+43
| | |_|/ | |/| | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | | | Merge pull request #4705 from nextcloud/htaccess-uploadRoeland Jago Douma2017-05-092-13/+17
|\ \ \ \ | | | | | | | | | | Proper exception for upload of .htaccess file via WebDAV
| * | | | Proper exception for upload of .htaccess file via WebDAVMorris Jobke2017-05-082-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #2860 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #4757 from ↵Roeland Jago Douma2017-05-091-2/+8
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | nextcloud/fix/system-users-enumeration-contacts-menu Do not list system users in contacts menu if sharing autocompletion i…
| * | | | Do not list system users in contacts menu if sharing autocompletion is disabledChristoph Wurst2017-05-091-2/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #4753 from nextcloud/fix-links-on-error-pageRoeland Jago Douma2017-05-093-17/+11
|\ \ \ \ \ | |/ / / / |/| | | | Fix escaped HTML on error pages
| * | | | Fix escaped HTML on error pagesMorris Jobke2017-05-083-17/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | * fixes #4655 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4751 from nextcloud/wait-for-postgresRoeland Jago Douma2017-05-091-0/+6
|\ \ \ \ | | | | | | | | | | Wait for Postgres to be available
| * | | | Wait for Postgres to be availableMorris Jobke2017-05-081-0/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #4750 from nextcloud/allow-requests-to-manifest-jsonRoeland Jago Douma2017-05-091-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Don't redirect requests to /core/img/manifest.json
| * | | | | Don't redirect requests to /core/img/manifest.jsonLukas Reschke2017-05-091-0/+1
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-05-0914-0/+14
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-05-09104-158/+158
| | | | |
* | | | | Merge pull request #4755 from nextcloud/l10n-extractionMorris Jobke2017-05-082-0/+63
|\ \ \ \ \ | |_|/ / / |/| | | | Extract app name and navigation entries for l10n
| * | | | Extract app name and navigation entries for l10nMorris Jobke2017-05-082-0/+63
|/ / / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / / [tx-robot] updated from transifexNextcloud bot2017-05-0910-4/+16
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-05-08138-170/+314
| | |
* | | Merge pull request #4745 from nextcloud/improve-textLukas Reschke2017-05-081-2/+2
|\ \ \ | | | | | | | | Improve readability of verify text
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 20:30:04 +0000