summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-07-2594-94/+94
|
* Merge pull request #10238 from ↵Morris Jobke2018-07-245-1/+53
|\ | | | | | | | | 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-242-0/+40
| | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Add "password_by_talk" column to "share" table in the databaseDaniel Calviño Sánchez2018-07-242-0/+2
| | | | | | | | 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-2410-3/+205
|\ \ | | | | | | allow to add a personal note to a share
| * | Comply @since requirementsJohn Molakvoæ (skjnldsv)2018-07-231-0/+1
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Design structure fixesJohn Molakvoæ (skjnldsv)2018-07-213-0/+23
| | | | | | | | | | | | 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>
| * | Autoresize + autoloaderJohn Molakvoæ (skjnldsv)2018-07-212-0/+2
| | | | | | | | | | | | 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-214-2/+169
| | | | | | | | | | | | 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
| * | | Make sure error_log() always receives a stringJoas Schilling2018-07-231-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2018-07-232-0/+2
| |/ / |/| |
* | | Merge pull request #10229 from ↵Morris Jobke2018-07-202-8/+40
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/feature/noid/allow-notifiers-to-know-if-we-prepare-push-notifications Allow notifiers to know if we prepare push notifications
| * | | Add return types and fully qualified function callsJoas Schilling2018-07-131-8/+8
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Allow notifiers to know whether we are preparing push notificationsJoas Schilling2018-07-132-0/+32
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #8188 from arnowelzel/masterMorris Jobke2018-07-201-2/+2
|\ \ \ \ | |_|/ / |/| | | Avoid error messages for restricted opcache API
| * | | Avoid error messages for restricted opcache APIArno Welzel2018-02-051-2/+2
| | | |
* | | | Merge pull request #10296 from nextcloud/bug/noid/dont_fail_on_unkown_userJoas Schilling2018-07-201-1/+7
|\ \ \ \ | | | | | | | | | | Don't fail contacts menu on unkown user
| * | | | Don't fail contacts menu on unkown userRoeland Jago Douma2018-07-191-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If for some reason the system addressbook holds a user that is no longer accessible from the usermanager (so it got somehow out of sync) we should not fail hard but rather just ignore the entry. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #9984 from nextcloud/inverted-svg-apiMorris Jobke2018-07-197-41/+245
|\ \ \ \ \ | | | | | | | | | | | | Svg color api
| * | | | | Php code bumpJohn Molakvoæ (skjnldsv)2018-07-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Fix icon url regexJulius Härtl2018-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Use proper URL prefix for iconsJulius Härtl2018-07-191-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Fixed testsJohn Molakvoæ (skjnldsv)2018-07-193-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Autoloader bumpJohn Molakvoæ (skjnldsv)2018-07-192-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Fix accessibility invertJohn Molakvoæ (skjnldsv)2018-07-192-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Fixed icons detection and cachingJohn Molakvoæ (skjnldsv)2018-07-192-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Mixin scss icon apiJohn Molakvoæ (skjnldsv)2018-07-193-37/+213
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | autoloader bumpJohn Molakvoæ (skjnldsv)2018-07-192-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Svg icon api sass function and upgrade of all stylesJohn Molakvoæ (skjnldsv)2018-07-192-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Svg color apiJohn Molakvoæ (skjnldsv)2018-07-191-0/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #10291 from nextcloud/bugfix/10052/fix-lotus-notesMorris Jobke2018-07-191-7/+7
|\ \ \ \ \ | |/ / / / |/| | | | EMailTemplate: Fix button background in Lotus Notes
| * | | | Use index for format string parametersJulius Härtl2018-07-191-9/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | EMailTemplate: Move background color of buttons to the table to fix ↵Julius Härtl2018-07-191-6/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | rendering in lotus notes Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | [tx-robot] updated from transifexNextcloud bot2018-07-194-0/+8
| | | |