aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #657 from nextcloud/share-by-mailJoas Schilling2016-11-0214-263/+1919
|\
| * import exceptionBjoern Schiessle2016-11-011-0/+1
| * remove unused variableBjoern Schiessle2016-11-011-1/+0
| * add new method getSharesInFolder(), see #339Bjoern Schiessle2016-11-012-1/+84
| * add tests for the share-by-mail providerBjoern Schiessle2016-11-012-8/+622
| * always show correct place holder, mention share by mail only if the share pro...Bjoern Schiessle2016-11-013-0/+126
| * enabled by default and add to shipped.jsonBjoern Schiessle2016-11-011-0/+1
| * unit tests updated and new addedBjoern Schiessle2016-11-014-186/+159
| * find and show share-by mail linksBjoern Schiessle2016-11-011-0/+1
| * don't show 'notify by mail' option or permissions not available for mail sharesBjoern Schiessle2016-11-012-2/+3
| * send mail for share-by-mail sharesBjoern Schiessle2016-11-013-6/+177
| * if we have a exact match, either for the federated cloud id or for theBjoern Schiessle2016-11-011-26/+41
| * unified way to display remote shares and mail sharesBjoern Schiessle2016-11-012-2/+4
| * show correct display name if we have the user in one of our address booksBjoern Schiessle2016-11-011-4/+24
| * improve search for federated cloud ids and email adressesBjoern Schiessle2016-11-011-8/+58
| * handle case if no share-by-mail share provider is loadedBjoern Schiessle2016-11-012-1/+11
| * update permissionsBjoern Schiessle2016-11-012-2/+10
| * add share by mail share providerBjoern Schiessle2016-11-013-1/+626
| * introduce share by mail, ui partBjoern Schiessle2016-11-011-67/+23
* | [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 defaultShareProvider & federatedshareprovider testsRoeland Jago Douma2016-11-011-0/+45
| * Fix merging backend resultsRoeland Jago Douma2016-11-012-2/+5
| * Add remoteprovider getsharesinfolder functionRoeland Jago Douma2016-10-311-2/+40
| * Add getShareTypesInFolder to optimize folder listeningRobin Appelman2016-10-313-4/+52
* | [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 connectionJuan Pablo Villafáñez2016-10-271-1/+1
* | Merge pull request #1903 from nextcloud/fix-log-in-buttonLukas Reschke2016-10-312-10/+3
|\ \
| * | also fix log in button confirm arrow when theming, fix #1615Jan-Christoph Borchardt2016-10-252-0/+3
| * | remove slight transparency of primary action button, ref #1615Jan-Christoph Borchardt2016-10-252-10/+0
* | | [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.Julia Bode2016-10-291-2/+6
* | | | [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
|\ \ \ \ | |/ / / |/| | |
| * | | Use OCP\\IL10N in tests tooMorris Jobke2016-10-281-1/+1
| * | | Fix more testsRoeland Jago Douma2016-10-282-15/+13
| * | | Move away from OC_L10NRoeland Jago Douma2016-10-2812-12/+12
* | | | [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 activitiesJoas Schilling2016-10-281-0/+25
* | | | introduce callForSeenUsers and countSeenUsers (#26361)Jörn Friedrich Dreyer2016-10-284-8/+8
* | | | [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
|\ \ \ \ | |_|_|/ |/| | |
| * | | Move federated share notifications to ROSJoas Schilling2016-10-202-6/+129
* | | | [tx-robot] updated from transifexNextcloud bot2016-10-2720-44/+124
| |/ / |/| |
* | | Merge pull request #1738 from nextcloud/comments-provide-displaynames-with-me...Morris Jobke2016-10-269-179/+307
|\ \ \
| * | | fix JS test and introduce tests for rendering mentions to displaynamesArthur Schiwon2016-10-251-8/+62
| * | | avoid that all avatars are copied to the author row when editing commentsArthur Schiwon2016-10-211-1/+1