summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8843 from ↵blizzz2018-03-163-4/+12
|\ | | | | | | | | nextcloud/set-share-with-field-to-the-id-of-the-circle Set "share with" field to the ID of the circle
| * Use the display name in the avatar for a circle shareDaniel Calviño Sánchez2018-03-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, the avatar for a circle share was generated using the "share_with" field as the seed for "imageplaceholder". Due to this, when the "share_with" field is set to the circle ID the character shown in the avatar was just a random character instead of the first character of the display name. Now the "share_with" is still used as the seed for the colour, but the display name is used as the text of the avatar. This adds support for "share_with" fields set to the circle ID while being backwards compatible with "share_with" fields set to the circle name. Note that when "share_with" fields is set to the circle name the colour of the avatar is different in the list of suggested sharees and in the list of current sharees, but that also happened before these changes (due to a different seed being used in each place). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Set "share_with" field to the ID of the circleDaniel Calviño Sánchez2018-03-161-2/+10
| | | | | | | | | | | | | | | | | | | | | | When a share is shared with a circle the "share_with" field returned by the API endpoint was always set to the name of the circle. However, the name is not enough to identify a circle. The Circles app now provides the ID of the circle in the "shared with" field of a Share, so this commit modifies the API endpoint to set the "share_with" field to the ID of the circle when provided by the Circles app. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #8835 from nextcloud/fix/noid/ldap_existence_checkMorris Jobke2018-03-161-1/+2
|\ \ | |/ |/| group existence check works without attribute (like with users)
| * existence check works without attribute (like with users)Arthur Schiwon2018-03-151-1/+2
| | | | | | | | | | | | cn is not necessarily given everywhere Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [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 nodes
| * Emit read for nodesRoeland Jago Douma2018-03-151-0/+7
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #8255 from nextcloud/bugfix/noid/group-display-nameblizzz2018-03-1523-266/+466
|\ \ | | | | | | Full implement group display names
| * | Fixed api testsJohn Molakvoæ (skjnldsv)2018-03-082-7/+7
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | No ES6 :(John Molakvoæ (skjnldsv)2018-03-081-1/+3
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | fixup! Fixed sharing groups select and fixed searchJohn Molakvoæ (skjnldsv)2018-03-081-2/+0
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixed sharing groups select and fixed searchJohn Molakvoæ (skjnldsv)2018-03-083-67/+63
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Send the group ids to the server on user creationJoas Schilling2018-03-081-0/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Remove resolved FIXMEJoas Schilling2018-03-081-2/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fixed caldav tests and metadata 2John Molakvoæ (skjnldsv)2018-03-082-4/+10
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix Metadata testsJohn Molakvoæ (skjnldsv)2018-03-081-1/+8
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixed Controller TestJohn Molakvoæ (skjnldsv)2018-03-083-54/+145
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixed select2 workflowJohn Molakvoæ (skjnldsv)2018-03-082-40/+30
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix users loading on group click and group creation on selectJohn Molakvoæ (skjnldsv)2018-03-082-3/+5
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Use group displayNames in users listJohn Molakvoæ (skjnldsv)2018-03-086-41/+74
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix group display name in the sidebar of the user managementJoas Schilling2018-03-082-8/+8
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix group displaynames in activityJoas Schilling2018-03-084-35/+108
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Start fixing Select2 optionsJoas Schilling2018-03-082-10/+16
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Correctly return the group nameJoas Schilling2018-03-082-11/+6
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Show the displayname in the users group listJoas Schilling2018-03-081-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #8793 from nextcloud/swift-configRoeland Jago Douma2018-03-153-4/+8
|\ \ \ | | | | | | | | Swift uses `containter` not `bucket`
| * | | Fix bucket and container usageRoeland Jago Douma2018-03-143-4/+8
| | |/ | |/| | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #8828 from ↵Roeland Jago Douma2018-03-151-3/+3
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/fix-configuration-values-matched-in-user-searches Fix configuration values matched in user searches
| * | | Fix configuration values matched in user searchesDaniel Calviño Sánchez2018-03-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a misplaced closing parenthesis the condition of the left join clause was just "userid = uid"; the other conditions were passed as additional parameters to "leftJoin", and thus they were ignored. Therefore, the result set contained every preference of each user instead of only the email, so the "WHERE configvalue LIKE XXX" matched any configuration value of the user. Besides the closing parenthesis this commit also fixes the literal values. Although "Literal" objects represent literal values they must be created through "IExpressionBuilder::literal()" to be properly quoted; otherwise it is just a plain string, which is treated as a column name. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | [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 page
| * | | Remove "Alternative logins" title on login pageMorris Jobke2018-03-141-1/+0
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8816 from nextcloud/cleanup-ocp-contactsMorris Jobke2018-03-145-205/+23
|\ \ \ | | | | | | | | Remove deprecated OCP\Contacts
| * | | Remove deprecated OCP\ContactsMorris Jobke2018-03-145-205/+23
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8811 from nextcloud/remove_dep_util_linkRoeland Jago Douma2018-03-145-43/+4
|\ \ \ | | | | | | | | Remove deprecated URL functions for OCP\Util
| * | | Remove deprecated URL functions for OCP\UtilRoeland Jago Douma2018-03-135-43/+4
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #8804 from nextcloud/remove_httphelperRoeland Jago Douma2018-03-1411-387/+31
|\ \ \ \ | | | | | | | | | | Remove deprecated HTTPHelper
| * | | | Replace ContactsManagerRoeland Jago Douma2018-03-131-1/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Remove deprecated HTTPHelperRoeland Jago Douma2018-03-1310-386/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove the HTTP Helper * Remove from Server Containter * Removed legacy share tests that use it Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [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 ICacheFactory
| * | | Properly provide local memcache check to ICacheFactoryMorris Jobke2018-03-133-4/+12
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #8796 from nextcloud/varadic_qbMorris Jobke2018-03-134-61/+67
|\ \ \ \ | |/ / / |/| | | Make QueryBuilder varadic
| * | | Made IExpressionBuilder varadicRoeland Jago Douma2018-03-132-12/+10
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Made orHaving varadicRoeland Jago Douma2018-03-132-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Made addHaving varadicRoeland Jago Douma2018-03-132-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Make having varadicRoeland Jago Douma2018-03-132-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Made addGroupBy varadicRoeland Jago Douma2018-03-132-5/+7
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Made groupBy varadicRoeland Jago Douma2018-03-132-5/+7
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 11:58:56 +0000