summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove 'send mail notification' option from sharing, replaced by send-by-mail...Bjoern Schiessle2016-11-0217-494/+22
* Merge pull request #657 from nextcloud/share-by-mailJoas Schilling2016-11-0225-290/+2120
|\
| * 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-015-10/+151
| * enabled by default and add to shipped.jsonBjoern Schiessle2016-11-012-0/+2
| * unit tests updated and new addedBjoern Schiessle2016-11-015-187/+161
| * find and show share-by mail linksBjoern Schiessle2016-11-012-0/+11
| * don't show 'notify by mail' option or permissions not available for mail sharesBjoern Schiessle2016-11-013-6/+14
| * send mail for share-by-mail sharesBjoern Schiessle2016-11-014-7/+180
| * 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-014-10/+17
| * 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-013-2/+16
| * add method to check if a share provider for a given type is loadedBjoern Schiessle2016-11-013-0/+62
| * update permissionsBjoern Schiessle2016-11-012-2/+10
| * add share by mail share providerBjoern Schiessle2016-11-017-7/+685
| * introduce share by mail, ui partBjoern Schiessle2016-11-013-75/+45
* | Merge pull request #1964 from nextcloud/color-the-trusted-domain-to-alert-the...Roeland Jago Douma2016-11-023-6/+35
|\ \
| * | Color the trusted domain to alert the admin a bit moreJoas Schilling2016-10-313-6/+35
* | | Merge pull request #1951 from nextcloud/settingsmaxheightRoeland Jago Douma2016-11-021-0/+3
|\ \ \
| * | | restricted the height of the settings area in core/css/apps.css to max 80%pgys2016-10-291-0/+3
* | | | [tx-robot] updated from transifexNextcloud bot2016-11-0228-4/+236
| |_|/ |/| |
* | | Merge pull request #339 from nextcloud/share-types-by-folderLukas Reschke2016-11-0112-10/+412
|\ \ \
| * | | Add defaultShareProvider & federatedshareprovider testsRoeland Jago Douma2016-11-012-0/+136
| * | | Add Manager unit testsRoeland Jago Douma2016-11-011-6/+77
| * | | Fix merging backend resultsRoeland Jago Douma2016-11-014-4/+16
| * | | Add remoteprovider getsharesinfolder functionRoeland Jago Douma2016-10-311-2/+40
| * | | Stricter signatureRoeland Jago Douma2016-10-314-6/+9
| * | | Add getShareTypesInFolder to optimize folder listeningRobin Appelman2016-10-3110-4/+146
| | |/ | |/|
* / | [tx-robot] updated from transifexNextcloud bot2016-11-0192-2858/+3274
|/ /
* | Merge pull request #1961 from nextcloud/configphp_begoneRoeland Jago Douma2016-10-311-207/+0
|\ \
| * | Remove config.php for oc.jsRoeland Jago Douma2016-10-311-207/+0
* | | Merge pull request #1937 from nextcloud/ros-for-notification-messageRoeland Jago Douma2016-10-312-12/+76
|\ \ \
| * | | Type hints already make sure it is an arrayJoas Schilling2016-10-311-16/+6
| * | | Allow rich object strings in messages as wellJoas Schilling2016-10-312-0/+74
* | | | Merge pull request #1952 from nextcloud/deprecated_backgroudjobLukas Reschke2016-10-313-112/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Cleanup usagesRoeland Jago Douma2016-10-292-20/+0
| * | | Removed depreacted functions (since 6.0)Roeland Jago Douma2016-10-291-92/+0
| | |/ | |/|
* | | 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-3134-22/+198
* | | | Merge pull request #1955 from nextcloud/issue_#1776Marius Blüm2016-10-303-6/+13
|\ \ \ \
| * | | | Issue-1776: Add unshare function to 3-dot menu.Julia Bode2016-10-293-6/+13