Lukas Reschke
35465f5375
Merge pull request #11352 from owncloud/close-session-for-previews
...
Close the session for preview generation
2014-09-29 22:03:33 +02:00
Lukas Reschke
b13b86502f
Merge pull request #11347 from mark0n/create_empty_config
...
Add a CLI command that creates an empty LDAP config
2014-09-29 21:42:07 +02:00
Lukas Reschke
8c8e5c168e
Merge pull request #10107 from owncloud/sharing_group_shares
...
[sharing] group shares
2014-09-29 20:26:41 +02:00
Thomas Müller
9489852e94
Merge pull request #11357 from owncloud/kill-dead-code
...
Remove dead code
2014-09-29 20:25:20 +02:00
Lukas Reschke
41374986d3
Remove dead code
2014-09-29 17:20:29 +02:00
Lukas Reschke
6b45cb5416
Merge pull request #11321 from owncloud/ldap-fix-memberof-detection
...
dn needs to be fetched to be able to detect memberOf support
2014-09-29 14:46:10 +02:00
Lukas Reschke
ba2472575f
Close the session for preview generation
...
Without closing the session every preview image generation is locking the session which makes the webinterface unresponsive.
2014-09-29 14:27:44 +02:00
Lukas Reschke
a8ed427515
Merge pull request #11324 from owncloud/tryToCreateDatadirectory
...
Try to create datadirectory to test whether the .htaccess works
2014-09-29 12:22:20 +02:00
Bjoern Schiessle
6e7acb8ae0
some small fixed, suggested by scrutinizer
2014-09-29 11:23:18 +02:00
Bjoern Schiessle
e5f0dded84
throw a exception if we can't handle the provided path
2014-09-29 11:13:06 +02:00
Jenkins for ownCloud
63726ea9e2
[tx-robot] updated from transifex
2014-09-29 01:54:33 -04:00
Martin Konrad
b57960aeec
Add a CLI command that creates an empty LDAP config
...
This is needed to configure the user_ldap app without using the
wizard (e.g. using tools like Puppet).
2014-09-29 00:21:20 -04:00
Thomas Müller
57c619e0f3
Merge pull request #11322 from owncloud/adding-unittest-helper
...
Adding test helper to test private methods
2014-09-29 00:15:14 +02:00
Morris Jobke
530b17c71a
Merge pull request #11335 from danbartram/imp_logrotate_conf_example
...
Clear up confusion of log_rotate_size config value
2014-09-28 23:32:47 +02:00
Jenkins for ownCloud
84923475c0
[tx-robot] updated from transifex
2014-09-28 01:55:09 -04:00
Dan Bartram
0d76a211a9
Clear up confusion of log_rotate_size config value
...
Remove the second comment which could be confused with suggesting an invalid value: `// 100 MiB`.
To keep the easily readable example value, it has been moved into the comment header for the config item.
2014-09-27 14:53:56 +01:00
Morris Jobke
cea70298f2
Merge pull request #11304 from owncloud/share-spinner
...
Added spinners in share dropdown
2014-09-27 10:41:25 +02:00
Morris Jobke
cd2c238b08
Merge pull request #11319 from owncloud/header-owncloud-name
...
for whitelabeled edition, show branding name (e.g. 'ownCloud') instead of appname in header bar
2014-09-27 10:28:53 +02:00
Jenkins for ownCloud
3a16b1bb68
[tx-robot] updated from transifex
2014-09-27 01:54:48 -04:00
Lukas Reschke
c20d629836
Try to create datadirectory to test whether the .htaccess works
...
Fixes https://github.com/owncloud/core/pull/11299#issuecomment-56968588 and also https://github.com/owncloud/core/issues/10628 together with https://github.com/owncloud/core/pull/11299#issuecomment-56968588 when backported.
2014-09-26 17:25:28 +02:00
Vincent Petry
ca6f296ae0
Prevent monkey clicking on labels
...
Clicking on labels while the spinner is there will not trigger the
hidden checkbox any more.
2014-09-26 17:07:14 +02:00
Bjoern Schiessle
2a4da7fe09
on unshare only unshare childrens if there is no other parent available
2014-09-26 16:58:47 +02:00
Clark Tomlinson
2b209d27d0
Adding test helper to test private methods
2014-09-26 10:23:41 -04:00
Jan-Christoph Borchardt
185f442df8
for whitelabeled edition, show branding name (e.g. 'ownCloud') instead of appname in header bar
2014-09-26 15:38:35 +02:00
Arthur Schiwon
6041ae6224
dn needs to be fetched to be able to detect memberOf support
2014-09-26 15:36:49 +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
Lukas Reschke
08287e2880
Add ID to markup to have the checkboxes in the right position
2014-09-26 13:46:22 +02:00
Vincent Petry
16cad5862a
Added spinners in share dropdown
...
Added spinners for the following actions:
- adding user
- removing user
- changing password
- toggling allowing upload
- setting a password
2014-09-26 13:46:22 +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
Morris Jobke
dbf81c89b6
Merge pull request #11286 from owncloud/clarify-possible-formats
...
Clarify possible preview providers for type Office
2014-09-24 23:55:21 +02:00
Morris Jobke
fe28c9a78c
Merge pull request #11287 from owncloud/kill-with
...
Disable external code coverage
2014-09-24 23:54:06 +02:00
Lukas Reschke
5a7c378015
Disable external code coverage
2014-09-24 22:35:30 +02:00
Lukas Reschke
cb002c1f6b
Clarify possible preview providers for type Office
...
a
2014-09-24 21:21:39 +02:00
Clark Tomlinson
341cba1b1e
Merge pull request #11281 from owncloud/scanner-unkown-user
...
Show a proper error message when trying to scan the filesystem for a non...
2014-09-24 15:11:11 -04: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
e8280c80da
Show a proper error message when trying to scan the filesystem for a non existing user
2014-09-24 15:48:54 +02:00
Robin Appelman
f88021dbbc
Don't keep the full info of all children in memory
2014-09-24 15:44:56 +02:00