summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-05-104-26/+66
|
* [tx-robot] updated from transifexNextcloud bot2018-05-0912-0/+16
|
* Merge pull request #9389 from nextcloud/log-lock-state-on-conflict-13Morris Jobke2018-05-073-10/+23
|\ | | | | [13] Log lock state on conflict
| * always log locking errorsRobin Appelman2018-05-041-3/+1
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * Log more info about locking conflicts for memcache locking backendsRobin Appelman2018-05-042-7/+22
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | remove unneeded locks in getCacheEntryRobin Appelman2018-05-041-3/+1
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Issue #9318: catch exceptions in SCSSCacher::resetCache()Roland Tapken2018-05-031-1/+5
| | | | Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
* [tx-robot] updated from transifexNextcloud bot2018-04-272-2/+2
|
* [tx-robot] updated from transifexNextcloud bot2018-04-222-8/+40
|
* [tx-robot] updated from transifexNextcloud bot2018-04-212-0/+10
|
* Merge pull request #9231 from nextcloud/13-9205Morris Jobke2018-04-182-8/+15
|\ | | | | [stable13] Provide an option to disable HTML emails
| * Provide an option to disable HTML emailsMorris Jobke2018-04-182-8/+15
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9233 from nextcloud/13-9159Roeland Jago Douma2018-04-181-0/+5
|\ \ | | | | | | [stable13] fix appinfo parsing when a single localized option is provided
| * | fix appinfo parsing when a single localized option is providedRobin Appelman2018-04-181-0/+5
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* / Show EOL warning in the update sectionJoas Schilling2018-04-181-0/+1
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2018-04-072-2/+2
|
* Merge pull request #8779 from nextcloud/backport/8255/show-group-display-namesJohn Molakvoæ2018-04-062-2/+2
|\ | | | | [stable13] Show group display names
| * Correctly return the group nameJoas Schilling2018-03-121-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Show the displayname in the users group listJoas Schilling2018-03-121-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #9095 from JaredBoone/bugfix/8387Morris Jobke2018-04-062-2/+2
|\ \ | | | | | | Do not convert email addresses with idn_to_ascii if…
| * | Do not convert email addresses with idn_to_ascii if INTL_IDNA_VARIANT_UTS46 ↵Jared Boone2018-04-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | is undefined. Fixes https://github.com/nextcloud/server/issues/8387. Signed-off-by: Jared Boone <jared.boone@gmail.com>
* | | Add more logging for the object storage during creation of the bucketsMorris Jobke2018-04-051-2/+3
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Allow usage of Windows 10 WebDav NetdriveRoeland Jago Douma2018-04-051-0/+1
| | | | | | | | | | | | | | | | | | Fixes #3523 As long as we don't have #8123 lets not leave our Window10 netdrive users hanging. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9077 from nextcloud/fix-callForSeenUsers-stable13Morris Jobke2018-04-051-1/+2
|\ \ | | | | | | [stable13] Move on with the next user if we found the user on one user back-end
| * | Move on with the next user if we found the user on one user back-endBjoern Schiessle2018-04-041-1/+2
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | [tx-robot] updated from transifexNextcloud bot2018-04-052-0/+14
|/ /
* | Fix proper permissions for multiple file accessRoeland Jago Douma2018-04-041-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #8890 In case you have access to a file via multiple ways, for example: 1. the file is shared with you with permission read only 2. the folder containing the file is shared with your read/write Requesting the getById function on the userFolder would give back two entries but both with the same permissions. Depending on the node you picked this is not right. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | reset encryptionVersion to '1' if a file was stream copied, because this ↵Bjoern Schiessle2018-04-031-7/+8
| | | | | | | | | | | | means that we basically write the file from scratch Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #9015 from nextcloud/backport-apps-versionsMorris Jobke2018-04-031-6/+22
|\ \ | | | | | | [stable13] Use app version to generate scss filename
| * | Use app version to generate scss filenameJohn Molakvoæ (skjnldsv)2018-03-281-6/+22
| | | | | | | | | | | | | | | | | | Fixed scsscacher tests Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2018-04-032-0/+2
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-04-022-2/+6
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-03-312-2/+8
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-03-222-2/+70
| |
* | [tx-robot] updated from transifexNextcloud bot2018-03-212-2/+2
| |
* | the FN is optional, carrying the displayname if presentArthur Schiwon2018-03-201-5/+11
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2018-03-174-2/+16
| |
* | [tx-robot] updated from transifexNextcloud bot2018-03-132-0/+2
|/
* Merge pull request #8745 from nextcloud/stable13-8716Morris Jobke2018-03-094-18/+22
|\ | | | | [13] Remove base url from global cache prefix
| * Actually clear cache values for all base urlsJulius Härtl2018-03-093-10/+20
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Use JSCombiner from server container when searching for JS filesJulius Härtl2018-03-091-7/+1
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Move base url from global cache prefix to frontend related onesJulius Härtl2018-03-091-3/+3
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #8749 from ↵Morris Jobke2018-03-091-5/+14
|\ \ | | | | | | | | | | | | nextcloud/backport/8596/sharee-email-matches-not-limited [stable13] Sharee email matches not limited
| * | Fix calculation if there are more resultsJoas Schilling2018-03-091-1/+5
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Add the users result only when non empty so tests stay the sameJoas Schilling2018-03-091-1/+3
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Also array_slice wide email matches of local usersJoas Schilling2018-03-091-4/+7
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #8746 from nextcloud/8705_13Julius Härtl2018-03-091-1/+8
|\ \ | | | | | | [stable13] Check if the cached js file exists
| * | Check if the cached js file existsRoeland Jago Douma2018-03-091-1/+8
| |/ | | | | | | | | | | | | | | | | Fixes #8705 If the file does not exist (for whatever reason). It is never cached. No matter what the depscache etc tell you. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #8725 from nextcloud/objectstore-no-part-files-13Morris Jobke2018-03-091-0/+4
|\ \ | |/ |/| [13] disable part files for object stores
| * disable part files for object storesRobin Appelman2018-03-081-0/+4
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>