upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-18 13:10:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 15
39644 commits 974 branches 1224 tags 8.6 GiB
Commit graph

7481 commits

Author SHA1 Message Date
Morris Jobke
cf16087585 Disable default activity email for incoming shares 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-02 20:57:12 +02:00
Morris Jobke
1ef19bb0ec Send an email once a file/folder is shared with a user 
* only if user has set an email address
* only for user shares (no group shares for now)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-01 15:17:32 +02:00
Lukas Reschke
7425316b29 Merge pull request #5919 from nextcloud/add-brackets-on-concat-method 
Add brackets around concat statements so comparing the result works a…
 2017-07-28 15:35:49 +02:00
Joas Schilling
b8bd5808e8
Add brackets around concat statements so comparing the result works as intended 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-28 11:34:35 +02:00
Joas Schilling
690efbd4eb
Use the existing array of OC versions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-27 12:30:24 +02:00
Joas Schilling
d06d86a719
Add a repair step to drop the account_terms table on oc migration 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-27 11:38:55 +02:00
Lukas Reschke
7568b04705 Add new bundle 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-26 11:47:15 +02:00
Morris Jobke
f45e4471f0 Remove unneeded styles 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-24 13:46:17 +02:00
Lukas Reschke
3353dbfab4 Adjust to height=120 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-24 13:46:09 +02:00
Artem Kochnev
3d54cef078 Fix for mb strlen 
Error with moving files with long names in UTF-8
 2017-07-22 11:10:25 +02:00
Morris Jobke
2663aa253e Merge pull request #5826 from nextcloud/12-backport-5821 
[stable12] Fix error message on untrusted domain error page
 2017-07-21 23:35:46 +02:00
Morris Jobke
816f1e63e9 Merge pull request #5757 from nextcloud/mount-rename-12 
[12]  Fix renaming of non-renamble mounts
 2017-07-21 23:30:42 +02:00
Morris Jobke
111844e7b1 Fix error message on untrusted domain error page 
Fixes #5347

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-21 16:16:48 +02:00
Morris Jobke
c6e3368af7 Merge pull request #5786 from nextcloud/path-repair-steps-storage-12 
[12] Also repair storage id's when repairing invalid entries
 2017-07-21 14:03:38 +02:00
Joas Schilling
c6f57fe22d
Allow to overwrite the email template again 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-19 17:59:12 +02:00
Robin Appelman
9c2dce34e9
Also repair storage id's when repairing invalid entries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-19 12:34:00 +02:00
Pauli Järvinen
22b29943ed Fix emitting of legacy hook post_unshare 
- When a file was unshared, the legacy hook pre_unshare fired twice and the hook post_unshare did not fire at all. This was obviously a copy-paste error.

Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
 2017-07-19 11:42:23 +02:00
Robin Appelman
c17b07667e
Fix invalid path repair step not getting all invalid entries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-18 14:03:41 +02:00
Robin Appelman
d7620e3970
non movable mounts can not be moved 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-17 15:40:45 +02:00
blizzz
b9d7c48acf Merge pull request #5711 from nextcloud/null-user-exist-12 
[12] null users dont exist
 2017-07-14 12:38:27 +02:00
Morris Jobke
9a07f78480 Merge pull request #5710 from nextcloud/nested-permissions-mask-12 
[12] Fix scan permissions with nested permissions masks
 2017-07-13 23:42:15 +02:00
Morris Jobke
90972044b1 Merge pull request #5655 from nextcloud/moveFromCache-from-shared-12 
[12] fix moving folders out of a cache jail
 2017-07-13 16:35:57 +02:00
Robin Appelman
ce45f87699
null users dont exist 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 15:54:16 +02:00
Morris Jobke
61bac5637f Merge pull request #5697 from nextcloud/stable12-4984 
Write cert bundle to tmp file first
 2017-07-13 15:08:37 +02:00
Robin Appelman
5804dfc078
Fix scan permissions with nested permissions masks 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 14:37:09 +02:00
Robin Appelman
069df4c8cb
chunk getting invalid paths and reuse queries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 13:08:24 +02:00
Robin Appelman
95e17a8245
use a generator instead of fetching all rows at once 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 13:08:24 +02:00
Robin Appelman
64d0a0ffc9
adjust to moved repair step 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 13:08:23 +02:00
Morris Jobke
d422875ae4
Run repair step only once 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-13 13:08:23 +02:00
Robin Appelman
92b14fa8c0
Add repair step for invalid paths 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 13:08:23 +02:00
Robin Appelman
996269cfdd
fix moving folders out of a cache jail 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 13:08:23 +02:00
Roeland Jago Douma
fe7c907e8c
Write cert bundle to tmp file first 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-12 20:21:27 +02:00
Roeland Jago Douma
38ee24d56b Merge pull request #5687 from nextcloud/jail-propagator-12 
[12] Fix propagating changes within jail wrapper
 2017-07-12 11:50:10 +02:00
Maxence Lange
7464996c56 verify that circles is installed 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-07-11 20:21:06 +02:00
Robin Appelman
2f7d0bbb18
Fix propagating changes within jail wrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-11 19:20:51 +02:00
Joas Schilling
43964d99ee
Add a flag to allow checking if SVGs are okay 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-07 11:16:37 +02:00
Morris Jobke
36e3f3cc2a Merge pull request #5617 from nextcloud/backport-5615-fix-navigation-entries-for-group-restricted-apps 
[stable12] Don't load navigation entries of restricted apps
 2017-07-07 10:46:11 +02:00
Joas Schilling
79f6773ef9
Don't log passwords on dav exceptions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 15:10:38 +02:00
Joas Schilling
20091a21c9
Don't load navigation entries of restricted apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 15:07:56 +02:00
Joas Schilling
8b2d9251fd Merge pull request #5584 from nextcloud/stable12-5429 
[stable12] Use base url for cache prefix and SCSS caching
 2017-07-05 11:30:08 +02:00
Robin Appelman
a277101133 improved logging of objectore errors 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-04 11:14:41 +02:00
Julius Härtl
0c6e4edc19
Fix theming app to also use the prefix 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-07-02 14:03:35 +02:00
Julius Härtl
d9f83bac0f
Add tests and inject IRequest 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-07-02 14:03:35 +02:00
Julius Härtl
4c3b27da5c
Do not open version file again 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-07-02 14:03:35 +02:00
Julius Härtl
3801c3aa3f
Make cache and scss caching depend on the baseUrl 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-07-02 14:03:35 +02:00
Morris Jobke
8550fdf757 Merge pull request #5507 from derkostka/stable12 
[stable12] Use realpath to obtain the webroot
 2017-06-23 15:43:15 -05:00
blizzz
0f7cb1fd65 Merge pull request #5509 from nextcloud/backport-5498-allow-to-force-a-language 
[stable12] Allow to force a language and set it via the ocs api
 2017-06-23 14:24:05 +02:00
Joas Schilling
7257206bcf
Create users in non default backends first 
Most of the time, when people have multiple backends or add a
custom backend, they want to create the users there and not in
the default backend. But since that is registered first, users
were always created there.

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-22 13:02:53 +02:00
Joas Schilling
4d18757a85
Allow to force a language and set it via the ocs api 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-22 09:54:39 +02:00
Sebastian Kostka
f0753cb56d [stable12] Use realpath to obtain the webroot 
Use realpath to obtain the webroot - backport
Signed-off-by: Sebastian Kostka sebastian.kostka@gmail.com
 2017-06-22 08:37:11 +02:00