summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10569 from nextcloud/custom-avatar-userconfigRoeland Jago Douma2018-08-071-1/+1
|\ | | | | get avatar custom status from user config
| * get avatar custom status from user configRobin Appelman2018-08-071-1/+1
| | | | | | | | | | | | this saves a cache operation because the user config is already cached Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Icons cacher css url fixJohn Molakvoæ (skjnldsv)2018-08-071-1/+1
|/ | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Do not log to error loglevel when converting the errorRoeland Jago Douma2018-08-061-1/+1
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #10480 from nextcloud/bugfix/10420/settingsRoeland Jago Douma2018-08-022-4/+3
|\ | | | | Settings design polishing
| * Move encryption settings to securityJulius Härtl2018-08-012-4/+3
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | There is no update available if the app didnt have a version (aka was not ↵Joas Schilling2018-08-021-1/+1
| | | | | | | | | | | | installed) Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #10481 from ↵Roeland Jago Douma2018-08-011-1/+10
|\ \ | | | | | | | | | | | | nextcloud/feature/noid/make-info-available-if-the-avatar-was-uploaded Make the info available if the avatar was uploaded or generated
| * | Make the info available if the avatar was uploaded or generatedJoas Schilling2018-08-011-1/+10
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / Append cache bump parameter to scss files URLJulius Härtl2018-08-011-1/+5
|/ | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Merge pull request #10444 from ↵blizzz2018-07-311-2/+7
|\ | | | | | | | | nextcloud/feature/noid/allow-to-filter-unread-count-by-verb Allow to filter the unread count by verb
| * Allow to filter the unread count by verbJoas Schilling2018-07-301-2/+7
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Fix duplicate inserts in the 2fa provider registry DAOChristoph Wurst2018-07-311-10/+18
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #10451 from nextcloud/fix/9693/move_logcondition_upRoeland Jago Douma2018-07-301-1/+2
|\ \ | | | | | | Fetch logcondition earlier
| * | Fetch logcondition earlierRoeland Jago Douma2018-07-301-1/+2
| |/ | | | | | | | | | | Fixes #9693 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Fix primary key handling on postgresJoas Schilling2018-07-271-3/+4
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Ignore custom prefixes which are longerJoas Schilling2018-07-271-9/+9
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Ignore automatic generated sequencesJoas Schilling2018-07-271-1/+10
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Fix calculation of default nameJoas Schilling2018-07-271-3/+23
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Prevent too long identifier namesJoas Schilling2018-07-271-1/+41
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Fix regex for icon urlsJulius Härtl2018-07-261-2/+2
| | | | | | | | Use the version from the url rather than hardcoding v=1. Also allow uppercase chars in the url, so that uppercase hex color values will also be included Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Check if the favorite tag existsRoeland Jago Douma2018-07-261-0/+4
| | | | | | | If the tag does not exist there is no need to do :boom: and log an exception on error level Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #9222 from ↵Morris Jobke2018-07-251-0/+48
|\ | | | | | | | | nextcloud/feature/noid/search-for-files-by-comments Allow to search files by comments
| * Add pagination supportJoas Schilling2018-07-251-2/+8
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Allow to search by commentsJoas Schilling2018-07-251-0/+42
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #10377 from nextcloud/sccs-cache-iscachedMorris Jobke2018-07-252-12/+39
|\ \ | | | | | | cache isCached state for scss resources
| * | cache isCached state for scss resourcesRobin Appelman2018-07-242-12/+39
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #8380 from nextcloud/bugfix/noid/reenable-disabled-appsMorris Jobke2018-07-252-1/+10
|\ \ \ | |_|/ |/| | Re-enable apps that got automatically disabled while updating
| * | Re-enable apps that got automatically disabled while updatingJoas Schilling2018-06-262-1/+10
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #10238 from ↵Morris Jobke2018-07-242-1/+28
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/add-support-for-sending-the-password-for-a-share-by-nextcloud-talk Add support for sending the password for a share by Nextcloud Talk
| * | Honour "sendPasswordByTalk" property in mail sharesDaniel Calviño Sánchez2018-07-241-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a password was set for a mail share an e-mail was sent to the recipient with the password. Now the e-mail is no longer sent if the password is meant to be sent by Talk. However, before the e-mail was not sent when the share was updated but the password was not changed. Now an e-mail is sent in that case too if switching from a password sent by Talk to a password sent by mail. On the other hand, when switching from a password sent by mail to a password sent by Talk it is mandatory to change the password; otherwise the recipient would already have access to the share without having to call the sharer to verify her identity. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add "sendPasswordByTalk" property to sharesDaniel Calviño Sánchez2018-07-241-0/+17
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #10298 from ↵Morris Jobke2018-07-241-9/+15
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/talk-714/only-migrate-the-schema-when-moving-database Only create the schema when moving between databases
| * | | Only create the schema when moving between databasesJoas Schilling2018-07-191-9/+15
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #10375 from nextcloud/background-scan-rootMorris Jobke2018-07-241-5/+0
|\ \ \ \ | | | | | | | | | | Do scan the root storage in background scan
| * | | | Do scan the root storage in background scanRobin Appelman2018-07-241-5/+0
| | |/ / | |/| | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | UppercaseJohn Molakvoæ (skjnldsv)2018-07-241-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Fix regex of iconsCacherJohn Molakvoæ (skjnldsv)2018-07-241-1/+1
|/ / / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #10218 from nextcloud/share-commentsRoeland Jago Douma2018-07-246-3/+175
|\ \ \ | | | | | | | | allow to add a personal note to a share
| * | | Design structure fixesJohn Molakvoæ (skjnldsv)2018-07-212-0/+14
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Tests fixes and design bumpJohn Molakvoæ (skjnldsv)2018-07-211-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | some small template fixesBjoern Schiessle2018-07-211-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | allow 'note' to be nullBjoern Schiessle2018-07-211-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | add a nice looking button as direct link to the sharreBjoern Schiessle2018-07-211-9/+7
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | add direct link to the file for user/group sharesBjoern Schiessle2018-07-212-5/+20
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | fix mail templatesBjoern Schiessle2018-07-211-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | add note to share object when reading it from the dbBjoern Schiessle2018-07-211-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | improve mail template and escape html codeBjoern Schiessle2018-07-211-12/+5
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | allow to add a personal note to a shareBjoern Schiessle2018-07-213-2/+151
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #10355 from ↵Roeland Jago Douma2018-07-231-0/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/bugfix/noid/make-sure-error-log-always-receives-a-string Make sure error_log() always receives a string