aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-11-0216-0/+70
|
* Merge pull request #339 from nextcloud/share-types-by-folderLukas Reschke2016-11-014-4/+138
|\ | | | | Add getShareTypesInFolder to optimize folder listening
| * Add defaultShareProvider & federatedshareprovider testsRoeland Jago Douma2016-11-011-0/+45
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix merging backend resultsRoeland Jago Douma2016-11-012-2/+5
| | | | | | | | | | | | | | | | * Merge share types correctly * Filter share types * Order share types Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add remoteprovider getsharesinfolder functionRoeland Jago Douma2016-10-311-2/+40
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add getShareTypesInFolder to optimize folder listeningRobin Appelman2016-10-313-4/+52
| | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
* | [tx-robot] updated from transifexNextcloud bot2016-11-0122-42/+290
|/
* Merge pull request #1935 from nextcloud/downstream-ldap-26Lukas Reschke2016-10-311-1/+1
|\ | | | | Add prefix to the connection
| * Add prefix to the connectionJuan Pablo Villafáñez2016-10-271-1/+1
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #1903 from nextcloud/fix-log-in-buttonLukas Reschke2016-10-312-10/+3
|\ \ | | | | | | remove slight transparency of primary action button, ref #1615
| * | also fix log in button confirm arrow when theming, fix #1615Jan-Christoph Borchardt2016-10-252-0/+3
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | remove slight transparency of primary action button, ref #1615Jan-Christoph Borchardt2016-10-252-10/+0
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | [tx-robot] updated from transifexNextcloud bot2016-10-3124-10/+96
| | |
* | | Merge pull request #1955 from nextcloud/issue_#1776Marius Blüm2016-10-301-2/+6
|\ \ \ | | | | | | | | Issue-1776: Add unshare function to 3-dot menu.
| * | | Issue-1776: Add unshare function to 3-dot menu.Julia Bode2016-10-291-2/+6
| | | | | | | | | | | | | | | | Signed-off-by: Julia Bode <julia.bode@lulisaur.us>
* | | | [tx-robot] updated from transifexNextcloud bot2016-10-3012-0/+52
| | | |
* | | | Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10nLukas Reschke2016-10-2915-28/+26
|\ \ \ \ | |/ / / |/| | | Move away from legacy OC_L10N
| * | | Use OCP\\IL10N in tests tooMorris Jobke2016-10-281-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Fix more testsRoeland Jago Douma2016-10-282-15/+13
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Move away from OC_L10NRoeland Jago Douma2016-10-2812-12/+12
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2016-10-2916-8/+98
| | | |
* | | | Merge pull request #1926 from nextcloud/fix-comment-mentions-in-activitiesMorris Jobke2016-10-281-0/+25
|\ \ \ \ | |/ / / |/| | | Fix comment mentions in activities
| * | | Fix comment mentions in activitiesJoas Schilling2016-10-281-0/+25
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | introduce callForSeenUsers and countSeenUsers (#26361)Jörn Friedrich Dreyer2016-10-284-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * introduce callForSeenUsers and countSeenUsers * add tests * oracle should support not null on clob * since 9.2.0
* | | | [tx-robot] updated from transifexNextcloud bot2016-10-2858-114/+274
| | | |
* | | | Merge pull request #1800 from nextcloud/nextcloud-rich-object-stringsMorris Jobke2016-10-272-6/+129
|\ \ \ \ | |_|_|/ |/| | | Nextcloud rich object strings
| * | | Move federated share notifications to ROSJoas Schilling2016-10-202-6/+129
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2016-10-2720-44/+124
| |/ / |/| |
* | | Merge pull request #1738 from ↵Morris Jobke2016-10-269-179/+307
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/comments-provide-displaynames-with-mentions comment mentions: show displayname not uid
| * | | fix JS test and introduce tests for rendering mentions to displaynamesArthur Schiwon2016-10-251-8/+62
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | avoid that all avatars are copied to the author row when editing commentsArthur Schiwon2016-10-211-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | consolidate error handlingArthur Schiwon2016-10-191-27/+41
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | fix avatar displaying after submit (either edit or new)Arthur Schiwon2016-10-191-3/+7
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | display avatar (if enabled) alongside displaynamesArthur Schiwon2016-10-192-1/+12
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | fix regexArthur Schiwon2016-10-191-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | improve regex, fixes replacements of usernames with same trunkArthur Schiwon2016-10-191-1/+12
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | show displayname not uid in commit mentionsArthur Schiwon2016-10-192-17/+76
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | resolve displayname via manager and registerable resolversArthur Schiwon2016-10-193-4/+45
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | move mention extraction to (I)Comment and report mentions via DAVArthur Schiwon2016-10-194-143/+77
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #1907 from nextcloud/downstream-26164Morris Jobke2016-10-263-5/+15
|\ \ \ \ | | | | | | | | | | Highlight files and update storage stats at end of upload (#26164)
| * | | | Highlight files and update storage stats at end of upload (#26164)Vincent Petry2016-10-253-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Properly trigger the "stop" even from the uploader. Also update storage stats at the end of all uploads instead of for each upload.
* | | | | [tx-robot] updated from transifexNextcloud bot2016-10-26124-346/+176
| | | | |
* | | | | Merge pull request #1911 from nextcloud/downstream-26477Roeland Jago Douma2016-10-251-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix malformed attribute in files app
| * | | | | Fix malformed attribute in files appVincent Petry2016-10-251-1/+1
| |/ / / /
* | | | | Merge pull request #1913 from nextcloud/downstream-26441Roeland Jago Douma2016-10-252-16/+11
|\ \ \ \ \ | | | | | | | | | | | | Require to use at least desktop client 2.0 by default
| * | | | | Fix unit tests for BlockLegacyClientPluginThomas Müller2016-10-251-15/+10
| | | | | |
| * | | | | Require to use at least desktop client 2.0 by defaultThomas Müller2016-10-251-1/+1
| |/ / / /
* | | | | Merge pull request #1906 from nextcloud/downstream-26460Morris Jobke2016-10-252-24/+2
|\ \ \ \ \ | |/ / / / |/| | | | Remove any detailed information about the exception in the browser er…
| * | | | Remove any detailed information about the exception in the browser error pluginThomas Müller2016-10-252-24/+2
| | | | |
* | | | | Merge pull request #1871 from nextcloud/use-csp-noncesMorris Jobke2016-10-251-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Use CSP nonces