wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
20696 commits 157 branches 562 tags 714 MiB
Commit graph

7423 commits

Author SHA1 Message Date
michag86
0df070a8e4 fix for issue #10880 2014-10-07 14:30:14 +02:00
Morris Jobke
6323d5fb3a Merge pull request #11437 from owncloud/add-import-filter 
Add CssImportFilter. More elegant fix for documents#348
 2014-10-07 08:28:08 +02:00
Jenkins for ownCloud
01be0af209 [tx-robot] updated from transifex 2014-10-07 01:54:46 -04:00
Victor Dubiniuk
b6087ea79b Add CssImportFilter. More elegant fix for documents#348 2014-10-06 19:39:02 +03:00
Morris Jobke
a6293a38f2 Merge pull request #11390 from Nemesiz/master 
Preview large TXT files fix
 2014-10-06 14:25:27 +02:00
Jenkins for ownCloud
6e991a53ec [tx-robot] updated from transifex 2014-10-06 01:54:57 -04:00
Olivier Paroz
b0000800e1 New generic class for Imagemagick conversions 2014-10-04 17:50:12 +02:00
Nmz
83c2829ca8 Preview large TXT files fix 
Limit the size of the string generating the preview image for TXT files
 2014-10-02 12:47:39 +03:00
Jenkins for ownCloud
553274b28f [tx-robot] updated from transifex 2014-10-01 06:56:17 -04:00
Lukas Reschke
e762ff2bbd Merge pull request #11356 from owncloud/redirect-only-to-the-same-domain 
Redirect only to absolute URL
 2014-10-01 12:47:43 +02:00
Lukas Reschke
cbecd62287 Merge pull request #11303 from owncloud/addFilelockToConfig 
Add flock to config
 2014-10-01 10:43:18 +02:00
Morris Jobke
5beeb923e6 Merge pull request #11365 from owncloud/fix-phpdoc 
Fix PHPDoc
 2014-09-30 16:15:37 +02:00
Morris Jobke
e881be7926 Merge pull request #11366 from owncloud/invalid-doc 
Remove invalid PHPDoc
 2014-09-30 16:12:58 +02:00
Lukas Reschke
68cf6681e5 Add flock to config 
This adds a file lock to the config in hope that this prevents race conditions as reported in https://github.com/owncloud/core/issues/11070

Testplan:

- [ ] Delete config.php and make it read-only => Error is thrown that it is not writeable
- [ ] Installation still works
- [ ] Changing config settings works (i.e. using the SMTP config switches in the administration menu)
- [ ] Your PC didn't blow up
- [ ] Installing the news app and the "Disable AppCode checker" app did not destroy your installation

Only skip the main config

Otherwise read only additional configs might not be processed

Test on tmpdir
 2014-09-30 15:53:27 +02:00
Lukas Reschke
67f8875f47 Remove invalid PHPDoc 
Despite the documentation this function does not read values from the cookie
 2014-09-30 13:46:43 +02:00
Lukas Reschke
b4944ffcc5 Fix PHPDoc 2014-09-30 13:34:50 +02:00
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
Lukas Reschke
6e7365fc17 Redirect only to absolute URL 
We do not want to redirect to other domains using the "?redirect_url=" feature. Please notice, that the ownCloud project does not consider open redirectors as security issue.
 2014-09-29 17:07:43 +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