aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10378 from nextcloud/bugfix/noid/fix-icon-name-14Morris Jobke2018-07-257-4/+7
|\
| * Readd starred icon since it is used in activity renderingsJulius Härtl2018-07-241-0/+1
| * Replace contacts-dark iconJulius Härtl2018-07-241-1/+1
| * Add group iconJulius Härtl2018-07-243-1/+3
| * Replace contacts-dark icon with contactsJulius Härtl2018-07-242-2/+2
* | Merge pull request #10322 from weeman1337/feature-9978-improve-disabled-user-...Roeland Jago Douma2018-07-246-31/+164
|\ \
| * | Adds disabled user acceptance testsMichael Weimann2018-07-243-0/+24
| * | Adds disabled user unit testsMichael Weimann2018-07-211-3/+47
| * | Implements handling for deactivated usersMichael Weimann2018-07-212-28/+93
* | | Merge pull request #10238 from nextcloud/add-support-for-sending-the-password...Morris Jobke2018-07-2416-48/+959
|\ \ \
| * | | Make possible to enable "sending password by Talk" from the share menuDaniel Calviño Sánchez2018-07-241-8/+99
| * | | Add event to load additional scripts in the auth page for public sharesDaniel Calviño Sánchez2018-07-242-0/+30
| * | | Add support for sending the password by Talk to ShareAPIControllerDaniel Calviño Sánchez2018-07-243-33/+121
| * | | Honour "sendPasswordByTalk" property in mail sharesDaniel Calviño Sánchez2018-07-244-3/+606
| * | | Store "sendPasswordByTalk" property of mail shares in the databaseDaniel Calviño Sánchez2018-07-242-3/+12
| * | | Add "sendPasswordByTalk" property to sharesDaniel Calviño Sánchez2018-07-242-0/+40
| * | | Add "password_by_talk" column to "share" table in the databaseDaniel Calviño Sánchez2018-07-244-1/+51
* | | | Merge pull request #10298 from nextcloud/bugfix/talk-714/only-migrate-the-sch...Morris Jobke2018-07-242-10/+16
|\ \ \ \
| * | | | Only create the schema when moving between databasesJoas Schilling2018-07-192-10/+16
* | | | | Merge pull request #10348 from nextcloud/fix-transfering-ownership-of-a-share...Morris Jobke2018-07-242-1/+15
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix transfering ownership of a share to user with same id as receiverDaniel Calviño Sánchez2018-07-242-1/+15
* | | | | Merge pull request #10375 from nextcloud/background-scan-rootMorris Jobke2018-07-241-5/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Do scan the root storage in background scanRobin Appelman2018-07-241-5/+0
| | |/ / | |/| |
* | | | Merge pull request #10353 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Morris Jobke2018-07-244-25/+12
|\ \ \ \
| * | | | Rebuild updatenotificationsRoeland Jago Douma2018-07-243-8/+13
| * | | | Bump webpack from 4.16.0 to 4.16.2 in /apps/updatenotificationdependabot[bot]2018-07-242-30/+12
* | | | | Merge pull request #10326 from nextcloud/svg-api-suf-fixesMorris Jobke2018-07-245-8/+31
|\ \ \ \ \
| * | | | | new testsJohn Molakvoæ (skjnldsv)2018-07-241-2/+27
| * | | | | UppercaseJohn Molakvoæ (skjnldsv)2018-07-241-1/+1
| * | | | | Fix regex of iconsCacherJohn Molakvoæ (skjnldsv)2018-07-241-1/+1
| * | | | | Fix header controls sticky positioningJohn Molakvoæ (skjnldsv)2018-07-243-5/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #10327 from nextcloud/focus-comment-on-tabs-selectMorris Jobke2018-07-242-24/+25
|\ \ \ \ \
| * | | | | Fixed comments designJohn Molakvoæ (skjnldsv)2018-07-241-24/+22
| * | | | | Focus the comment input on tab select/loadingJohn Molakvoæ (skjnldsv)2018-07-241-0/+3
| |/ / / /
* | | | | Merge pull request #10369 from nextcloud/techdebt/noid/avoid-404-on-developer...Morris Jobke2018-07-243-3/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rerun js buildRoeland Jago Douma2018-07-241-1/+0
| * | | | Remove hint to .map.js files on vendor projects that we do not shipMorris Jobke2018-07-242-2/+0
| |/ / /
* | | | Merge pull request #10363 from nextcloud/structure-mobile-and-public-fixesMorris Jobke2018-07-2420-34/+128
|\ \ \ \ | |/ / / |/| | |
| * | | Phpunit tests fixesJohn Molakvoæ (skjnldsv)2018-07-241-0/+63
| * | | Fixed scrolling containerJohn Molakvoæ (skjnldsv)2018-07-2411-14/+23
| * | | Acceptance and mobile navigation fixesJohn Molakvoæ (skjnldsv)2018-07-2410-22/+44
|/ / /
* | | Merge pull request #10331 from weeman1337/fix-10330-files-multi-select-headerMorris Jobke2018-07-241-1/+1
|\ \ \
| * | | Uses a variable for the multiselect header offsetMichael Weimann2018-07-231-1/+1
| * | | Adjusts the files multi select header widthMichael Weimann2018-07-221-1/+1
* | | | Merge pull request #10218 from nextcloud/share-commentsRoeland Jago Douma2018-07-2442-953/+1252
|\ \ \ \
| * | | | Comply @since requirementsJohn Molakvoæ (skjnldsv)2018-07-231-0/+1
| * | | | Design fixesJohn Molakvoæ (skjnldsv)2018-07-211-2/+4
| * | | | Adjust acceptance tests to the new share link UIDaniel Calviño Sánchez2018-07-211-24/+66
| * | | | Design structure fixesJohn Molakvoæ (skjnldsv)2018-07-217-31/+65
| * | | | Tests fixes and design bumpJohn Molakvoæ (skjnldsv)2018-07-219-191/+45