upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-07-16 23:12:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 49
20639 commits 1029 branches 1232 tags 8.1 GiB
Commit graph

7406 commits

Author SHA1 Message Date
Jenkins for ownCloud
5292a14cdf [tx-robot] updated from transifex 2014-09-30 01:55:11 -04:00
Lukas Reschke
8c8e5c168e Merge pull request #10107 from owncloud/sharing_group_shares 
[sharing] group shares
 2014-09-29 20:26:41 +02:00
Lukas Reschke
41374986d3 Remove dead code 2014-09-29 17:20:29 +02:00
Bjoern Schiessle
6e7acb8ae0 some small fixed, suggested by scrutinizer 2014-09-29 11:23:18 +02:00
Jenkins for ownCloud
63726ea9e2 [tx-robot] updated from transifex 2014-09-29 01:54:33 -04:00
Jenkins for ownCloud
84923475c0 [tx-robot] updated from transifex 2014-09-28 01:55:09 -04:00
Jenkins for ownCloud
3a16b1bb68 [tx-robot] updated from transifex 2014-09-27 01:54:48 -04:00
Bjoern Schiessle
2a4da7fe09 on unshare only unshare childrens if there is no other parent available 2014-09-26 16:58:47 +02:00
Lukas Reschke
53f6d74938 Merge pull request #11311 from owncloud/fixing-unhandled-exception-cleanTmp-master 
catch and log exception in OC_Helper::cleanTmp()
 2014-09-26 14:31:31 +02:00
Bjoern Schiessle
e115a7043f only create a new share entry, if the user needs a different target name than the group share 2014-09-26 13:19:15 +02:00
Bjoern Schiessle
ed85055d31 for group shares we don't need a extra db entry of groupTarget equals itemTarget 2014-09-26 13:10:31 +02:00
Bjoern Schiessle
d242e518f9 for group shares only the parent has the up-to-date permission. Make sure that we always use this permission, except if the user permission is '0' because in this case the user unshared the group share from self 2014-09-26 13:01:54 +02:00
Thomas Müller
4c08215e66 catch and log exception in OC_Helper::cleanTmp() 2014-09-26 11:36:53 +02:00
Thomas Müller
e5a111b80e Merge pull request #11285 from owncloud/dav-permissions-create 
Fix dav permissions for folders
 2014-09-26 09:21:32 +02:00
Jenkins for ownCloud
1631937990 [tx-robot] updated from transifex 2014-09-26 01:54:59 -04:00
Robin Appelman
6365c57b04 Merge pull request #11282 from owncloud/scanner-memory-stable7 
Don't keep the full info of all children in memory
 2014-09-25 15:53:33 +02:00
Vincent Petry
9fc23e1967 Merge pull request #10934 from owncloud/datadir-write-setup 
Don't complain about non-writable datadirs before we're installed
 2014-09-25 14:32:32 +02:00
Bjoern Schiessle
52b6469b0c call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks are executed, e.g. to check if the share is really visible 2014-09-25 14:26:31 +02:00
Robin Appelman
10c350b895 Fix dav permissions for folders without create permissions 2014-09-25 14:01:19 +02:00
Robin Appelman
ccb4475a8d Expose creatable permissions trough fileinfo 2014-09-25 14:00:13 +02:00
Bjoern Schiessle
968152113e always select permissions, used in getItems() 2014-09-25 12:35:11 +02:00
Bjoern Schiessle
d5fc011c90 some small fixes 2014-09-25 11:29:57 +02:00
Jenkins for ownCloud
f46e49529f [tx-robot] updated from transifex 2014-09-25 01:55:32 -04:00
Lukas Reschke
cb002c1f6b Clarify possible preview providers for type Office 
a
 2014-09-24 21:21:39 +02:00
Thomas Müller
17f97ea2ca Merge pull request #11225 from owncloud/showLoginAgainInsteadOfJSON 
Show login again instead of JSON if CSRF check fails
 2014-09-24 17:51:12 +02:00
Robin Appelman
f88021dbbc Don't keep the full info of all children in memory 2014-09-24 15:44:56 +02:00
Lukas Reschke
3da6b3b533 Merge pull request #11229 from kofemann/for-upstream 
user/backed: use pow of two for backed action constants
 2014-09-24 15:19:11 +02:00
Bjoern Schiessle
07d43df713 only add a new row if it isn't a unique share, otherwise update the existing row 2014-09-24 14:02:02 +02:00
Bjoern Schiessle
a6cc810349 mark exclude list as deprecated. It neither used by the files app nor by the 
calendar or contacts app. It doesn't make sense to build a exclude list by the
share API, the apps knows best which are valid targets.
 2014-09-24 14:02:02 +02:00
Bjoern Schiessle
9f7b15582a fix add user to group to work with grouped shares 2014-09-24 14:02:01 +02:00
Bjoern Schiessle
bd268c35f5 generateTarget() will always find a unique target 2014-09-24 14:02:01 +02:00
Jenkins for ownCloud
5ff5b7386f [tx-robot] updated from transifex 2014-09-24 01:56:46 -04:00
Lukas Reschke
75e45ac786 Merge pull request #11019 from owncloud/do-not-show-exception-to-enduser 
Do not show exception to the end-user - use a proper error page instead
 2014-09-23 18:36:40 +02:00
Vincent Petry
89e02e89d4 Merge pull request #7051 from owncloud/postsetupajaxcheck 
Moved WebDAV check to client side JS
 2014-09-23 16:55:16 +02:00
Tigran Mkrtchyan
276f50a1ba user/backed: use pow of two for backed action constants 
the current implementation limits number of possible backed actions
to 8 as it uses pow of 16 for constants. This change introduces pow
of two and allows up-to 32 actions to be defined.

The old values are preserved for backward compatibility.
 2014-09-23 15:18:01 +02:00
Lukas Reschke
4893d2c0ed Show login again instead of JSON if CSRF check fails 
Previously a JSON error page was shown to the user in-case the CSRF token was not valid. This was confusing and prevented people from login.

With this at least the login page is shown again and not a JSON error message. I consider this as sufficient since adding a new error page just for this sake would uneededly make lib/base.php even more cluttered and this is a edge-case which optimally should anyways not happen that often.

This can be tested by opening the login page, then clearing the cookies, and trying to login.
 2014-09-23 14:55:08 +02:00
Thomas Müller
c587a4aaa2 Merge pull request #11222 from owncloud/store-users-timezone-master 
send browsers timezone back tp the server on login
 2014-09-23 13:45:21 +02:00
Thomas Müller
42fe0b9e08 Merge pull request #11241 from owncloud/use-lower-case 
Use only lower-case letters
 2014-09-23 12:16:58 +02:00
Lukas Reschke
5d977f97b0 Merge pull request #11032 from owncloud/harden-redirect 
Do only follow HTTP and HTTPS redirects
 2014-09-23 11:34:44 +02:00
Vincent Petry
e65ceb08fc Moved WebDAV and internet checks to client side JS 
- Added setup checks in JavaScript
- Moved isWebDAVWorking to JS using SetupChecks
- Moved internet connection checks to an ajax call that goes through the
  server
 2014-09-23 11:16:14 +02:00
Vincent Petry
fc42a64e6c Merge pull request #11226 from owncloud/kill-postsetupcheck-master 
remove post setup check
 2014-09-23 10:33:50 +02:00
Jenkins for ownCloud
479e4410c5 [tx-robot] updated from transifex 2014-09-23 02:05:45 -04:00
Thomas Müller
37a5bff155 Merge pull request #11227 from owncloud/fix-windows-path 
fixing directory seperators
 2014-09-23 07:38:23 +02:00
Morris Jobke
f970c81b1e Merge pull request #11215 from owncloud/dav-throwwhendeletefailed 
WebDAV now throws 403 when deletion did not work
 2014-09-23 00:49:30 +02:00
Morris Jobke
051ed93e24 Merge pull request #11211 from owncloud/previewProviderSwitch 
Add a configuration switch for enabled preview mimetypes
 2014-09-23 00:45:59 +02:00
Lukas Reschke
1565d82b81 Use only lower-case letters 
Fixes https://github.com/owncloud/core/issues/11239
 2014-09-22 21:29:03 +02:00
Lukas Reschke
6eeb905871 Do only follow HTTP and HTTPS redirects 
We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server)

Get final redirect manually using get_headers()

Migrate to HTTPHelper class and add unit tests
 2014-09-22 20:02:32 +02:00
Thomas Müller
21412559df remove post setup check 2014-09-22 19:43:55 +02:00
Bjoern Schiessle
9105e17307 unit tests for grouping of shares pointing to the same source 2014-09-22 17:54:47 +02:00
Bjoern Schiessle
89c3b650e6 group shares and combine permissions 2014-09-22 17:25:15 +02:00