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
Arthur Schiwon
6c502e11f8
make scrutinizer happy, very minor changes
2014-10-01 11:55:53 +02:00
Lukas Reschke
e93f98f1de
Merge pull request #11368 from owncloud/use-svg-previews
...
Use SVG previews for public sharing
2014-10-01 11:15:50 +02:00
Lukas Reschke
cbecd62287
Merge pull request #11303 from owncloud/addFilelockToConfig
...
Add flock to config
2014-10-01 10:43:18 +02:00
Clark Tomlinson
6de8531ace
fixing windows max depth test
2014-09-30 16:04:49 -04:00
Arthur Schiwon
f9e085b020
init a new paged search on read operations to satisfy OpenLDAP
2014-09-30 17:00:25 +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
306bf71c62
Use SVG previews for public sharing
...
Fixes https://github.com/owncloud/core/pull/11367#issuecomment-57306037 and https://github.com/owncloud/core/issues/9218
2014-09-30 15:49:49 +02:00
Lukas Reschke
96d9e0eb5b
Remove uneeded slicing of element
...
The "*/*" provider has been removed. This is therefore not needed anymore and leads to unexpected bugs.
Please notice that this is only relevant for master.
2014-09-30 14:08:43 +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
Arthur Schiwon
2b9696efae
abandond paged search only if PHP supports them
2014-09-30 13:13:52 +02:00
Arthur Schiwon
53ec32807a
abandon ongoing paged search before starting a new one
2014-09-30 12:42:37 +02:00
Arthur Schiwon
9a63693227
properly cancel a Paginated Results operation in order to avoid protocol errors, fixes #10526
2014-09-30 12:42:37 +02:00
Jenkins for ownCloud
5292a14cdf
[tx-robot] updated from transifex
2014-09-30 01:55:11 -04:00
Lukas Reschke
659b9fc030
Merge pull request #11337 from danbartram/better_encryption_recovery_labels
...
Add clickable labels to encryption recovery radios
2014-09-29 22:06:00 +02:00
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
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
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
1b9c31d349
Add clickable labels to encryption recovery radios
...
Add clickable radio button labels to the encryption recovery settings
pages:
* settings-admin
* settings-personal
Pressing on the radio button text now toggles the state of the radio
button.
2014-09-27 16:20:06 +01: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