Björn Schießle
0710db77bc
Merge pull request #13896 from owncloud/share-generatetarget-remove-exclude
...
Dont create exclude list for generating the share target
2015-04-09 14:51:15 +02:00
Thomas Müller
1d9bd3d31e
Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deleting
...
Check if the key exists, before trying to delete it
2015-04-09 14:45:40 +02:00
Morris Jobke
9246c7e8ee
Merge pull request #15500 from owncloud/installation-hint
...
add link to installation documentation to setup page
2015-04-09 14:33:55 +02:00
Björn Schießle
5a50a678c9
Merge pull request #15507 from owncloud/remove-uneeded-file
...
Remove unneeded file
2015-04-09 14:32:53 +02:00
Lukas Reschke
96e7f607d5
Remove unneeded file
2015-04-09 13:29:51 +02:00
Thomas Müller
4f97cb9d1b
Merge pull request #15503 from owncloud/link-standard-subscription
...
Help section: fix commercial support link
2015-04-09 13:15:09 +02:00
Jan-Christoph Borchardt
95890804f1
help section: code style and wording fixes
2015-04-09 12:33:18 +02:00
Jan-Christoph Borchardt
83a0d1b3ba
link to proper subsite for Commercial support
2015-04-09 12:29:44 +02:00
Jan-Christoph Borchardt
c840c18252
Merge pull request #15499 from owncloud/admin-hints
...
add admin documentation hints to Federated Cloud Sharing and cron
2015-04-09 12:12:53 +02:00
Lukas Reschke
dbbb2546e0
Merge pull request #15497 from owncloud/enforce-type-security
...
Enforce string as passed type
2015-04-09 12:08:27 +02:00
Jan-Christoph Borchardt
65dc958418
add admin documentation hints to Federated Cloud Sharing and cron
2015-04-09 12:07:05 +02:00
Jan-Christoph Borchardt
dd7e519cda
add link to installation documentation to setup page
2015-04-09 11:39:46 +02:00
Jan-Christoph Borchardt
f3efd7a51e
fix position of SQLite warning
2015-04-09 11:10:41 +02:00
Jan-Christoph Borchardt
50f9ed78d3
code style fixes
2015-04-09 11:10:15 +02:00
Lukas Reschke
4ca6419475
Fix PHPDoc
2015-04-09 10:54:53 +02:00
Lukas Reschke
3aad47c0f0
Fix code style
2015-04-09 10:46:46 +02:00
Lukas Reschke
d869f8212b
Enforce string as passed type
2015-04-09 10:45:50 +02:00
Joas Schilling
45575d0135
Check if the key exists, before trying to delete it
2015-04-09 10:28:02 +02:00
Lukas Reschke
ba52f6f8fc
Merge pull request #15314 from owncloud/app-categories-15274
...
Add different trust levels to AppStore interface
2015-04-09 10:07:32 +02:00
Morris Jobke
56f1ffe820
Merge pull request #14676 from owncloud/deleteorphanedshares
...
Delete orphaned shares in a background job
2015-04-09 00:18:53 +02:00
Morris Jobke
9c76d068c3
Merge pull request #15196 from owncloud/limit-file-activities-to-favorites
...
Limit file activities to favorites
2015-04-09 00:18:31 +02:00
Morris Jobke
84ae9532c8
Merge pull request #15448 from owncloud/occ-check-server-env-master
...
Adding check command to validate server environment
2015-04-09 00:07:08 +02:00
Thomas Müller
4f0769fc07
Merge pull request #15483 from owncloud/maintenance-refresh
...
Fix maintenance refresh interval
2015-04-08 22:46:35 +02:00
Lukas Reschke
98698e05e8
Add JS unit test for sorting
2015-04-08 22:08:37 +02:00
Morris Jobke
f3ef17a963
Merge pull request #15490 from owncloud/remove-debug-logging
...
remove unessesary logging of methods instantiation
2015-04-08 21:42:47 +02:00
Lukas Reschke
eb1cf58d11
Reference $(this) instead
2015-04-08 21:26:12 +02:00
Lukas Reschke
0cd29e00d1
Fix wording
2015-04-08 21:24:03 +02:00
Morris Jobke
4e60b81264
Merge pull request #14120 from owncloud/dav-statcache
...
Stat cache for DAV storage, improves s2s performance a little bit
2015-04-08 21:09:28 +02:00
Morris Jobke
62936aa323
Merge pull request #15488 from owncloud/files-navigation-icons
...
add icons to Files sidebar
2015-04-08 21:06:03 +02:00
Morris Jobke
91a90e25ae
fix for IE8
2015-04-08 21:05:31 +02:00
Clark Tomlinson
3ffb2d8abd
remove unessesary logging of methods instantiation
2015-04-08 14:46:01 -04:00
Jan-Christoph Borchardt
84c2fe85b7
add icons to files sidebar, fix shade, fix position of settings icon and text
2015-04-08 19:25:28 +02:00
Vincent Petry
053c15d1a7
Merge pull request #15481 from owncloud/enc_no_error_if_enc_is_disabled
...
don't throw exception if a file gets uploaded and encryption is disabled
2015-04-08 18:50:40 +02:00
Morris Jobke
78ec7543d5
Fix maintenance refresh interval
...
* fix XMLHttpRequest - send after callback is registered
* check for correct type of value - it's a boolean
* return correct content-type in status.php
2015-04-08 18:02:00 +02:00
Bjoern Schiessle
c379557e1d
don't throw exception if a file gets uploaded and encryption is disabled
2015-04-08 16:41:20 +02:00
Clark Tomlinson
fc2711e156
Merge pull request #15472 from owncloud/enc_backward_compatibility
...
make private key handling backward compatible
2015-04-08 09:38:27 -04:00
Morris Jobke
103d451459
Merge pull request #14987 from rullzer/ocs_password_fix2
...
OCS Fixes to allow setting of password without removing additional settings
2015-04-08 14:44:17 +02:00
Lukas Reschke
d01a2acbcf
Merge pull request #15469 from owncloud/fix/15463
...
Fix language level incompatibilties
2015-04-08 14:30:56 +02:00
Bjoern Schiessle
4ce5669419
read cipher from key header and always write a key header if a new private key is stored
2015-04-08 14:26:00 +02:00
Vincent Petry
69ba67ec0f
Merge pull request #15464 from owncloud/fixmasterunittests
...
Replace originalStorage in tests with a proper teardown
2015-04-08 14:24:42 +02:00
Lukas Reschke
c3c50fb481
Fix language level incompatibilties
...
Arbitrary expressions in empty are allowed in PHP 5.5 ands upwards. Seems to only affect master.
Fixed https://github.com/owncloud/core/issues/15463
2015-04-08 13:55:10 +02:00
Vincent Petry
c12dd2820c
Merge pull request #15465 from owncloud/issue/15456-disable-ocs-maintenance
...
Disable OCS api when in maintenance mode
2015-04-08 13:29:49 +02:00
Vincent Petry
4acf6747d2
Disable trashbin when testing orphaned shares deletion job
2015-04-08 13:04:06 +02:00
Thomas Müller
19834211b4
Merge pull request #15443 from owncloud/encryption-user-hook-tests
...
adding test for user hooks
2015-04-08 12:56:18 +02:00
Joas Schilling
f7dd16f1ac
Disable OCS api when in maintenance mode
2015-04-08 12:51:20 +02:00
Vincent Petry
f8cfc03f36
Replace originalStorage in tests with a proper teardown
...
The purpose of $originalStorage in unit tests was to remount the old
root.
However that storage itself is already wrapped by storage wrapper, so
remounting it would rewrap the storage several times.
This fix makes use of "loginAsUser()" and "logout()" from the TestCase
class to properly initialize and cleanup the FS as expected.
2015-04-08 12:45:38 +02:00
Morris Jobke
59322a5037
Merge pull request #15333 from owncloud/copy-cross-device
...
fix copying folder across devices
2015-04-08 12:35:15 +02:00
Vincent Petry
9c3893ce69
Added FIXME about registering jobs in apps.php
2015-04-08 12:09:42 +02:00
James Anslow
d53aa4a816
Fixing issue #15322 - showing Settings button next to gear icon
2015-04-08 11:57:33 +02:00
Morris Jobke
dfc0a26e57
Merge pull request #15453 from owncloud/enc2_fix
...
fix function call
2015-04-08 11:10:00 +02:00
