summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Return groups displayname in provisioning apiJohn Molakvoæ (skjnldsv)2018-03-233-0/+59
* [tx-robot] updated from transifexNextcloud bot2018-03-1742-4/+60
* Merge pull request #8853 from nextcloud/remove-resolve-reshareMorris Jobke2018-03-162-33/+0
|\
| * Remove unused resolveReshare of old sharing codeMorris Jobke2018-03-162-33/+0
* | Merge pull request #8843 from nextcloud/set-share-with-field-to-the-id-of-the...blizzz2018-03-163-4/+12
|\ \ | |/ |/|
| * Use the display name in the avatar for a circle shareDaniel Calviño Sánchez2018-03-162-2/+2
| * Set "share_with" field to the ID of the circleDaniel Calviño Sánchez2018-03-161-2/+10
* | Merge pull request #8835 from nextcloud/fix/noid/ldap_existence_checkMorris Jobke2018-03-161-1/+2
|\ \ | |/ |/|
| * existence check works without attribute (like with users)Arthur Schiwon2018-03-151-1/+2
* | [tx-robot] updated from transifexNextcloud bot2018-03-168-12/+36
|/
* Merge pull request #8830 from nextcloud/node_emit_readRoeland Jago Douma2018-03-151-0/+7
|\
| * Emit read for nodesRoeland Jago Douma2018-03-151-0/+7
* | Merge pull request #8255 from nextcloud/bugfix/noid/group-display-nameblizzz2018-03-1523-266/+466
|\ \
| * | Fixed api testsJohn Molakvoæ (skjnldsv)2018-03-082-7/+7
| * | No ES6 :(John Molakvoæ (skjnldsv)2018-03-081-1/+3
| * | fixup! Fixed sharing groups select and fixed searchJohn Molakvoæ (skjnldsv)2018-03-081-2/+0
| * | Fixed sharing groups select and fixed searchJohn Molakvoæ (skjnldsv)2018-03-083-67/+63
| * | Send the group ids to the server on user creationJoas Schilling2018-03-081-0/+1
| * | Remove resolved FIXMEJoas Schilling2018-03-081-2/+2
| * | Fixed caldav tests and metadata 2John Molakvoæ (skjnldsv)2018-03-082-4/+10
| * | Fix Metadata testsJohn Molakvoæ (skjnldsv)2018-03-081-1/+8
| * | Fixed Controller TestJohn Molakvoæ (skjnldsv)2018-03-083-54/+145
| * | Fixed select2 workflowJohn Molakvoæ (skjnldsv)2018-03-082-40/+30
| * | Fix users loading on group click and group creation on selectJohn Molakvoæ (skjnldsv)2018-03-082-3/+5
| * | Use group displayNames in users listJohn Molakvoæ (skjnldsv)2018-03-086-41/+74
| * | Fix group display name in the sidebar of the user managementJoas Schilling2018-03-082-8/+8
| * | Fix group displaynames in activityJoas Schilling2018-03-084-35/+108
| * | Start fixing Select2 optionsJoas Schilling2018-03-082-10/+16
| * | Correctly return the group nameJoas Schilling2018-03-082-11/+6
| * | Show the displayname in the users group listJoas Schilling2018-03-081-1/+1
* | | Merge pull request #8793 from nextcloud/swift-configRoeland Jago Douma2018-03-153-4/+8
|\ \ \
| * | | Fix bucket and container usageRoeland Jago Douma2018-03-143-4/+8
| | |/ | |/|
* | | Merge pull request #8828 from nextcloud/fix-configuration-values-matched-in-u...Roeland Jago Douma2018-03-151-3/+3
|\ \ \
| * | | Fix configuration values matched in user searchesDaniel Calviño Sánchez2018-03-141-3/+3
* | | | [tx-robot] updated from transifexNextcloud bot2018-03-15156-224/+252
| |/ / |/| |
* | | Merge pull request #8818 from nextcloud/remove-alternative-logins-titleRoeland Jago Douma2018-03-141-1/+0
|\ \ \
| * | | Remove "Alternative logins" title on login pageMorris Jobke2018-03-141-1/+0
|/ / /
* | | Merge pull request #8816 from nextcloud/cleanup-ocp-contactsMorris Jobke2018-03-145-205/+23
|\ \ \
| * | | Remove deprecated OCP\ContactsMorris Jobke2018-03-145-205/+23
|/ / /
* | | Merge pull request #8811 from nextcloud/remove_dep_util_linkRoeland Jago Douma2018-03-145-43/+4
|\ \ \
| * | | Remove deprecated URL functions for OCP\UtilRoeland Jago Douma2018-03-135-43/+4
* | | | Merge pull request #8804 from nextcloud/remove_httphelperRoeland Jago Douma2018-03-1411-387/+31
|\ \ \ \
| * | | | Replace ContactsManagerRoeland Jago Douma2018-03-131-1/+15
| * | | | Remove deprecated HTTPHelperRoeland Jago Douma2018-03-1310-386/+16
| |/ / /
* | | | [tx-robot] updated from transifexNextcloud bot2018-03-14152-758/+848
* | | | Merge pull request #8806 from nextcloud/add-local-memcache-checkblizzz2018-03-133-4/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Properly provide local memcache check to ICacheFactoryMorris Jobke2018-03-133-4/+12
* | | | Merge pull request #8796 from nextcloud/varadic_qbMorris Jobke2018-03-134-61/+67
|\ \ \ \ | |/ / / |/| | |
| * | | Made IExpressionBuilder varadicRoeland Jago Douma2018-03-132-12/+10
| * | | Made orHaving varadicRoeland Jago Douma2018-03-132-5/+5