aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #8843 from ↵blizzz2018-03-161-2/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/set-share-with-field-to-the-id-of-the-circle Set "share with" field to the ID of the circle
| * | | | | 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-164-2/+26
|/ / / /
* | | | Merge pull request #8255 from nextcloud/bugfix/noid/group-display-nameblizzz2018-03-158-78/+159
|\ \ \ \ | | | | | | | | | | Full implement group display names
| * | | | Fixed api testsJohn Molakvoæ (skjnldsv)2018-03-081-3/+4
| | | | | | | | | | | | | | | | | | | | 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>
| * | | | Fixed sharing groups select and fixed searchJohn Molakvoæ (skjnldsv)2018-03-082-4/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.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-081-1/+7
| | | | | | | | | | | | | | | | | | | | 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 group displaynames in activityJoas Schilling2018-03-084-35/+108
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Start fixing Select2 optionsJoas Schilling2018-03-081-5/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-03-1530-50/+78
| | | | |
* | | | | Merge pull request #8811 from nextcloud/remove_dep_util_linkRoeland Jago Douma2018-03-143-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Remove deprecated URL functions for OCP\Util
| * | | | | Remove deprecated URL functions for OCP\UtilRoeland Jago Douma2018-03-133-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #8804 from nextcloud/remove_httphelperRoeland Jago Douma2018-03-142-33/+15
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | 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-131-32/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-14140-752/+826
|/ / / /
* | | | Move storagestats endpoint to proper controllerRoeland Jago Douma2018-03-135-60/+82
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #8781 from nextcloud/cleanup-old-federation-codeMorris Jobke2018-03-131-114/+2
|\ \ \ \ | | | | | | | | | | Remove old code to be compatible with Nextcloud 9 and before
| * | | | Remove old code to be compatible with Nextcloud 9 and beforeMorris Jobke2018-03-121-114/+2
| | |/ / | |/| | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #8792 from nextcloud/cleanup-oc_responseMorris Jobke2018-03-131-1/+8
|\ \ \ \ | | | | | | | | | | Remove unused methods of OC_Response
| * | | | Fix the HTTP 1.0 status code and properly detect 1.0 vs 1.1&2.0Morris Jobke2018-03-131-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Remove unused methods of OC_ResponseMorris Jobke2018-03-121-1/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-03-1360-0/+100
| | | | |
* | | | | Use proper method to log exceptionsMorris Jobke2018-03-123-16/+16
|/ / / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / / Remove deprecated and unsused methods of OCP\DBMorris Jobke2018-03-121-1/+1
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8769 from nextcloud/admin_audit_strictMorris Jobke2018-03-1212-10/+22
|\ \ \ | | | | | | | | Make admin_audit strict
| * | | Make admin_audit strictRoeland Jago Douma2018-03-1012-10/+22
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2018-03-12278-444/+458
| | | |
* | | | Merge pull request #8633 from nextcloud/rakekniven-i18n-fixMorris Jobke2018-03-114-4/+11
|\ \ \ \ | | | | | | | | | | Improved translation strings
| * | | | Use variable for proper translationsRoeland Jago Douma2018-03-101-1/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Update ThemingControllerTest.phprakekniven2018-03-101-1/+1
| | | | | | | | | | | | | | | Fixed tests for https://github.com/nextcloud/server/pull/8633
| * | | | Update wizardTabElementary.jsrakekniven2018-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | Fixed grammar. Reported at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/91002422?issue=yes
| * | | | Update settings.jsrakekniven2018-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | Added question mark. Reported at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/120539223?issue=yes
| * | | | Update ThemingController.phprakekniven2018-03-101-1/+1
| |/ / / | | | | | | | | | | | | Improved translation string. Reported at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/121491256?issue=yes
* / / / [tx-robot] updated from transifexNextcloud bot2018-03-118-0/+36
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2018-03-106-0/+28
| | |
* | | Merge pull request #8112 from nextcloud/fix-integer-overflowMorris Jobke2018-03-091-1/+4
|\ \ \ | | | | | | | | Fix integer overflow in ChunkingPlugin
| * | | Fix integer overflow in ChunkingPluginMorris Jobke2018-03-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Avoids errors when the size exceeds MAX_INT because of the cast to int. Better cast it to float to avoid this. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2018-03-09136-168/+268
| | | |
* | | | Merge pull request #8716 from nextcloud/fix-cache-prefixingRoeland Jago Douma2018-03-082-4/+4
|\ \ \ \ | | | | | | | | | | Remove base url from global cache prefix
| * | | | Use cache prefix for theming as wellJulius Härtl2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix tests to use ICacheFactoryJulius Härtl2018-03-072-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Move base url from global cache prefix to frontend related onesJulius Härtl2018-03-071-1/+1
| | |/ / | |/| | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #8575 from nextcloud/new-folder-buttonRoeland Jago Douma2018-03-086-63/+47
|\ \ \ \ | | | | | | | | | | Updated popover rules to allow form inputs and added input submit for…
| * | | | Fixed jsunitJohn Molakvoæ (skjnldsv)2018-03-081-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>