summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-05-1424-90/+180
|
* [tx-robot] updated from transifexNextcloud bot2017-05-1310-0/+24
|
* Merge pull request #4829 from nextcloud/theming-preview-clickMorris Jobke2017-05-122-0/+13
|\ | | | | Clicking on theming preview triggers fileupload dialog
| * Don't open the dialog for logo and backgroundJoas Schilling2017-05-121-1/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Clicking on theming preview triggers fileupload dialogMorris Jobke2017-05-112-0/+12
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-05-128-2/+136
|/
* [tx-robot] updated from transifexNextcloud bot2017-05-1146-8/+88
|
* Merge pull request #4783 from nextcloud/lite-application-classesMorris Jobke2017-05-102-29/+9
|\ | | | | Use automatic injection for appdata folders
| * Use automatic DI injection for UpdateLookupServerJoas Schilling2017-05-102-29/+9
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | 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>
* | | 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>
* | [tx-robot] updated from transifexNextcloud bot2017-05-10108-38/+262
| |
* | 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>
* / Stop if user folder is not availableMorris Jobke2017-05-091-0/+4
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* 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 #4705 from nextcloud/htaccess-uploadRoeland Jago Douma2017-05-091-12/+12
|\ \ | | | | | | Proper exception for upload of .htaccess file via WebDAV
| * | Proper exception for upload of .htaccess file via WebDAVMorris Jobke2017-05-081-12/+12
| | | | | | | | | | | | | | | | | | * fixes #2860 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | 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>
* | | [tx-robot] updated from transifexNextcloud bot2017-05-0914-0/+14
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-05-09104-158/+158
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-05-096-4/+10
| |
* | [tx-robot] updated from transifexNextcloud bot2017-05-08100-122/+246
| |
* | Merge pull request #4692 from nextcloud/unify-sharing-messagesMorris Jobke2017-05-082-44/+16
|\ \ | | | | | | don't mention the owner of a file in case of a re-share by mail.
| * | don't mention the owner of a file in case of a re-share by mail. The ↵Bjoern Schiessle2017-05-082-44/+16
| | | | | | | | | | | | | | | | | | recipient doesn't care about the owner and probably don't even know it Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #4621 from nextcloud/fix_readonly_shared_calendar_proppatchMorris Jobke2017-05-083-2/+11
|\ \ \ | | | | | | | | fix PROPPATCH requests to read-only shared calendars
| * | | fix PROPPATCH requests to read-only shared calendarsGeorg Ehrke2017-05-083-2/+11
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Merge pull request #4675 from nextcloud/fix_4651Morris Jobke2017-05-088-245/+476
|\ \ \ \ | | | | | | | | | | Create a photo cache to speedup the contactsmenu
| * | | | Fix initRoeland Jago Douma2017-05-082-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Fix ImageExportPluginTestRoeland Jago Douma2017-05-082-129/+115
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | No more XSSRoeland Jago Douma2017-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Clear cache on vcard change/deleteRoeland Jago Douma2017-05-083-8/+31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Request proper size for contacts menuRoeland Jago Douma2017-05-082-72/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Cache the carddav photo endpointRoeland Jago Douma2017-05-084-19/+281
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Always dispatch Carddav eventsRoeland Jago Douma2017-05-083-33/+58
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #4733 from nextcloud/fix-browser-dav-rootRobin Appelman2017-05-081-4/+3
|\ \ \ \ \ | | | | | | | | | | | | fix error when browsing the dav root
| * | | | | fix error when browsing the dav rootRobin Appelman2017-05-081-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Add function to request SVG or regular fallback imageLukas Reschke2017-05-082-5/+19
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/4647 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #4556 from nextcloud/downstream-ldap-78Lukas Reschke2017-05-081-30/+10
|\ \ \ \ \ | | | | | | | | | | | | LDAP: only use proxy classes as backend
| * | | | | Use proxy classesJuan Pablo Villafáñez2017-04-271-30/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Adjust login button color and remove borderJulius Härtl2017-05-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Fix tests for theming backgroundColorJulius Härtl2017-05-083-6/+50
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Theming app: Add plain background color optionJulius Haertl2017-05-086-15/+108
| |/ / / / |/| | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | | | Fix name of external storagesJan-Christoph Borchardt2017-05-083-4/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-05-0826-92/+164
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-05-0714-8/+42
| |_|_|/ |/| | |