Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-02 | 16 | -0/+70 |
| | |||||
* | Merge pull request #339 from nextcloud/share-types-by-folder | Lukas Reschke | 2016-11-01 | 4 | -4/+138 |
|\ | | | | | Add getShareTypesInFolder to optimize folder listening | ||||
| * | Add defaultShareProvider & federatedshareprovider tests | Roeland Jago Douma | 2016-11-01 | 1 | -0/+45 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Fix merging backend results | Roeland Jago Douma | 2016-11-01 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | * Merge share types correctly * Filter share types * Order share types Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Add remoteprovider getsharesinfolder function | Roeland Jago Douma | 2016-10-31 | 1 | -2/+40 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Add getShareTypesInFolder to optimize folder listening | Robin Appelman | 2016-10-31 | 3 | -4/+52 |
| | | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-01 | 22 | -42/+290 |
|/ | |||||
* | Merge pull request #1935 from nextcloud/downstream-ldap-26 | Lukas Reschke | 2016-10-31 | 1 | -1/+1 |
|\ | | | | | Add prefix to the connection | ||||
| * | Add prefix to the connection | Juan Pablo Villafáñez | 2016-10-27 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | Merge pull request #1903 from nextcloud/fix-log-in-button | Lukas Reschke | 2016-10-31 | 2 | -10/+3 |
|\ \ | | | | | | | remove slight transparency of primary action button, ref #1615 | ||||
| * | | also fix log in button confirm arrow when theming, fix #1615 | Jan-Christoph Borchardt | 2016-10-25 | 2 | -0/+3 |
| | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | remove slight transparency of primary action button, ref #1615 | Jan-Christoph Borchardt | 2016-10-25 | 2 | -10/+0 |
| | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-31 | 24 | -10/+96 |
| | | | |||||
* | | | Merge pull request #1955 from nextcloud/issue_#1776 | Marius Blüm | 2016-10-30 | 1 | -2/+6 |
|\ \ \ | | | | | | | | | Issue-1776: Add unshare function to 3-dot menu. | ||||
| * | | | Issue-1776: Add unshare function to 3-dot menu. | Julia Bode | 2016-10-29 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | Signed-off-by: Julia Bode <julia.bode@lulisaur.us> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-30 | 12 | -0/+52 |
| | | | | |||||
* | | | | Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10n | Lukas Reschke | 2016-10-29 | 15 | -28/+26 |
|\ \ \ \ | |/ / / |/| | | | Move away from legacy OC_L10N | ||||
| * | | | Use OCP\\IL10N in tests too | Morris Jobke | 2016-10-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | Fix more tests | Roeland Jago Douma | 2016-10-28 | 2 | -15/+13 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Move away from OC_L10N | Roeland Jago Douma | 2016-10-28 | 12 | -12/+12 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-29 | 16 | -8/+98 |
| | | | | |||||
* | | | | Merge pull request #1926 from nextcloud/fix-comment-mentions-in-activities | Morris Jobke | 2016-10-28 | 1 | -0/+25 |
|\ \ \ \ | |/ / / |/| | | | Fix comment mentions in activities | ||||
| * | | | Fix comment mentions in activities | Joas Schilling | 2016-10-28 | 1 | -0/+25 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | introduce callForSeenUsers and countSeenUsers (#26361) | Jörn Friedrich Dreyer | 2016-10-28 | 4 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * introduce callForSeenUsers and countSeenUsers * add tests * oracle should support not null on clob * since 9.2.0 | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-28 | 58 | -114/+274 |
| | | | | |||||
* | | | | Merge pull request #1800 from nextcloud/nextcloud-rich-object-strings | Morris Jobke | 2016-10-27 | 2 | -6/+129 |
|\ \ \ \ | |_|_|/ |/| | | | Nextcloud rich object strings | ||||
| * | | | Move federated share notifications to ROS | Joas Schilling | 2016-10-20 | 2 | -6/+129 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-27 | 20 | -44/+124 |
| |/ / |/| | | |||||
* | | | Merge pull request #1738 from ↵ | Morris Jobke | 2016-10-26 | 9 | -179/+307 |
|\ \ \ | | | | | | | | | | | | | | | | | nextcloud/comments-provide-displaynames-with-mentions comment mentions: show displayname not uid | ||||
| * | | | fix JS test and introduce tests for rendering mentions to displaynames | Arthur Schiwon | 2016-10-25 | 1 | -8/+62 |
| | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | avoid that all avatars are copied to the author row when editing comments | Arthur Schiwon | 2016-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | consolidate error handling | Arthur Schiwon | 2016-10-19 | 1 | -27/+41 |
| | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | fix avatar displaying after submit (either edit or new) | Arthur Schiwon | 2016-10-19 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | display avatar (if enabled) alongside displaynames | Arthur Schiwon | 2016-10-19 | 2 | -1/+12 |
| | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | fix regex | Arthur Schiwon | 2016-10-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | improve regex, fixes replacements of usernames with same trunk | Arthur Schiwon | 2016-10-19 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | show displayname not uid in commit mentions | Arthur Schiwon | 2016-10-19 | 2 | -17/+76 |
| | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | resolve displayname via manager and registerable resolvers | Arthur Schiwon | 2016-10-19 | 3 | -4/+45 |
| | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | move mention extraction to (I)Comment and report mentions via DAV | Arthur Schiwon | 2016-10-19 | 4 | -143/+77 |
| | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | | Merge pull request #1907 from nextcloud/downstream-26164 | Morris Jobke | 2016-10-26 | 3 | -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 Petry | 2016-10-25 | 3 | -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 transifex | Nextcloud bot | 2016-10-26 | 124 | -346/+176 |
| | | | | | |||||
* | | | | | Merge pull request #1911 from nextcloud/downstream-26477 | Roeland Jago Douma | 2016-10-25 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix malformed attribute in files app | ||||
| * | | | | | Fix malformed attribute in files app | Vincent Petry | 2016-10-25 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #1913 from nextcloud/downstream-26441 | Roeland Jago Douma | 2016-10-25 | 2 | -16/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Require to use at least desktop client 2.0 by default | ||||
| * | | | | | Fix unit tests for BlockLegacyClientPlugin | Thomas Müller | 2016-10-25 | 1 | -15/+10 |
| | | | | | | |||||
| * | | | | | Require to use at least desktop client 2.0 by default | Thomas Müller | 2016-10-25 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #1906 from nextcloud/downstream-26460 | Morris Jobke | 2016-10-25 | 2 | -24/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | Remove any detailed information about the exception in the browser er… | ||||
| * | | | | Remove any detailed information about the exception in the browser error plugin | Thomas Müller | 2016-10-25 | 2 | -24/+2 |
| | | | | | |||||
* | | | | | Merge pull request #1871 from nextcloud/use-csp-nonces | Morris Jobke | 2016-10-25 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Use CSP nonces |