aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Throw an exception when a shipped app was not replaced before the updateJoas Schilling2016-11-022-1/+14
* 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
* | | | | [tx-robot] updated from transifexNextcloud bot2016-10-3020-2/+172
| |_|_|/ |/| | |
* | | | Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10nLukas Reschke2016-10-2930-527/+47
|\ \ \ \ | |/ / / |/| | |
| * | | Use OCP\\IL10N in tests tooMorris Jobke2016-10-281-1/+1
| * | | Remove legacy l10nRoeland Jago Douma2016-10-281-343/+0
| * | | Fix more testsRoeland Jago Douma2016-10-286-161/+20
| * | | Move away from OC_L10NRoeland Jago Douma2016-10-2822-22/+26
* | | | [tx-robot] updated from transifexNextcloud bot2016-10-2920-20/+266
* | | | Merge pull request #1949 from nextcloud/disable-codecov-commentsChristoph Wurst2016-10-291-3/+1
|\ \ \ \
| * | | | Disable codecov commentsMorris Jobke2016-10-291-3/+1
|/ / / /
* | | | 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
* | | | Merge pull request #1888 from nextcloud/downstream-26361Joas Schilling2016-10-2815-121/+292
|\ \ \ \
| * | | | Proper DI of configRoeland Jago Douma2016-10-287-46/+76
| * | | | Use callForSeenUsers for avatar migrationMorris Jobke2016-10-281-24/+22
| * | | | introduce callForSeenUsers and countSeenUsers (#26361)Jörn Friedrich Dreyer2016-10-2810-65/+208
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2016-10-28176-362/+738
* | | | Merge pull request #1800 from nextcloud/nextcloud-rich-object-stringsMorris Jobke2016-10-2714-37/+709
|\ \ \ \ | |_|_|/ |/| | |
| * | | dump autoloaderMorris Jobke2016-10-242-0/+6
| * | | Move federated share notifications to ROSJoas Schilling2016-10-203-6/+148
| * | | Allow rich object subjects for NotificationsJoas Schilling2016-10-204-31/+109
| * | | Add Rich Object Definitions and a validatorJoas Schilling2016-10-206-0/+446
* | | | Merge pull request #1933 from spacegaier/patch-1Lukas Reschke2016-10-271-1/+1
|\ \ \ \