Morris Jobke
2791b8f00d
Revert "occ web executor ( #24957 )"
...
This reverts commit 854352d9a0
.
2016-07-07 12:14:45 +02:00
Morris Jobke
ba16fd0d33
Merge branch 'master' into sync-master
2016-07-07 11:29:46 +02:00
Morris Jobke
5ace43f438
Revert "[tx-robot] updated from transifex"
...
This reverts commit 3731b2a006
.
Revert "[tx-robot] updated from transifex"
This reverts commit 94d91113f1
.
Revert "[tx-robot] updated from transifex"
This reverts commit e7cc8bac1e
.
Revert "[tx-robot] updated from transifex"
This reverts commit 59fc3ff45a
.
Revert "[tx-robot] updated from transifex"
This reverts commit 6a89a63d2e
.
Revert "[tx-robot] updated from transifex"
This reverts commit b0bad03234
.
2016-07-07 11:04:08 +02:00
Morris Jobke
ed28885d73
Merge pull request #323 from Faldon/database_port
...
Added occ install option for database-port
2016-07-07 10:20:08 +02:00
Jenkins for ownCloud
38718bf89e
[tx-robot] updated from transifex
2016-07-07 01:56:27 -04:00
Nextcloud bot
da2363a1dd
[tx-robot] updated from transifex
2016-07-06 13:28:06 +00:00
Thomas Pulzer
0638937ada
Changed the input option for database-port to required when parameter was provided.
...
Added casting database port to int for input sanitation in pgsql and oci connections.
2016-07-06 11:31:28 +02:00
Thomas Pulzer
d367318088
Added occ install option for database-port.
...
Extended the database setup to store the database port.
Changed the PostgreSQL connection error message for clarification.
2016-07-06 09:58:38 +02:00
Jenkins for ownCloud
6103df97cc
[tx-robot] updated from transifex
2016-07-06 01:56:27 -04:00
Jenkins for ownCloud
34eec57262
[tx-robot] updated from transifex
2016-07-05 02:31:32 -04:00
Morris Jobke
387ac9e048
Merge pull request #25240 from owncloud/remove-svg
...
Remove SVG fallback
2016-07-04 17:49:00 +02:00
Thomas Pulzer
90b7f74da7
Changed name of default logfile from owncloud.log to nextcloud.log.
2016-07-04 11:50:32 +02:00
Jenkins for ownCloud
9e0d8fcf41
[tx-robot] updated from transifex
2016-07-04 01:56:34 -04:00
Jenkins for ownCloud
cea84cf7a8
[tx-robot] updated from transifex
2016-07-03 01:54:52 -04:00
Jenkins for ownCloud
dea7b5be35
[tx-robot] updated from transifex
2016-07-02 01:54:53 -04:00
Hendrik Leppelsack
61e604c2d9
adjusts tests to removal of svg fallback
2016-07-01 16:36:37 +02:00
Hendrik Leppelsack
c47833718f
remove svg classes
2016-07-01 16:36:37 +02:00
Hendrik Leppelsack
11be3d6276
remove png references in core
2016-07-01 16:36:37 +02:00
Hendrik Leppelsack
769deaee2f
remove png actions, fileicons, etc
2016-07-01 16:36:37 +02:00
Hendrik Leppelsack
bc5c89e9c0
remove javascript png fallback for svg
2016-07-01 16:36:37 +02:00
Vincent Petry
ba95297c5c
Merge pull request #25262 from owncloud/fed-sharing-error
...
Only save federated share after remote server is notified
2016-07-01 16:20:39 +02:00
Lukas Reschke
179a355b2c
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-07-01 11:36:35 +02:00
Jenkins for ownCloud
2d2d2267f7
[tx-robot] updated from transifex
2016-07-01 01:57:04 -04:00
Jenkins for ownCloud
1b9fa4dd5f
[tx-robot] updated from transifex
2016-06-30 01:55:56 -04:00
Jenkins for ownCloud
2b0f053126
[tx-robot] updated from transifex
2016-06-29 05:52:18 -04:00
Morris Jobke
b6397ef73a
Merge pull request #236 from nextcloud/master-sync-upstream
...
[Master] sync upstream
2016-06-28 09:02:03 +02:00
Jenkins for ownCloud
894b7d93f6
[tx-robot] updated from transifex
2016-06-28 01:57:10 -04:00
Lukas Reschke
6670d37658
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-27 18:23:00 +02:00
Christoph Wurst
b14376419d
Merge pull request #25263 from owncloud/decryptall-keepencryptionenabledforsingleuser
...
Keep encryption enabled if decrypting for single user
2016-06-27 12:19:45 +02:00
Vincent Petry
199c8e304c
Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadperms
...
Add explicit delete permission to link shares
2016-06-27 12:14:05 +02:00
Lukas Reschke
27b699bdbc
Migrate logic to dynamic controller
...
Also adds support for having custom login backgrounds
2016-06-27 10:26:23 +02:00
Vincent Petry
93f29f57c5
Merge pull request #25129 from owncloud/remove-ie
...
Remove ie8+9 support
2016-06-27 10:20:47 +02:00
Jenkins for ownCloud
ee90bef50a
[tx-robot] updated from transifex
2016-06-27 01:55:57 -04:00
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
2016-06-26 12:55:05 +02:00
Jenkins for ownCloud
52eab2a61a
[tx-robot] updated from transifex
2016-06-26 01:55:53 -04:00
Vincent Petry
f062b62f03
Keep encryption enabled if decrypting for single user
...
When decrypting all files of a single user, the admin usually does not
intend encryption to be suddenly disabled for everyone. This fix
reenables encryption after decrypting for a single user.
Decrypting for all users will still disable encryption globally.
2016-06-24 16:46:25 +02:00
Robin Appelman
ee674844f2
better detect errors in fed sharing response
2016-06-24 15:56:33 +02:00
Vincent Petry
955635c7aa
Add explicit delete permission to link shares
...
Link shares always allowed deletion, however internally the permissions
were stored as 7 which lacked delete permissions. This created an
inconsistency in the Webdav permissions.
This fix makes sure we include delete permissions in the share
permissions, which now become 15.
In case a client is still passing 7 for legacy reasons, it gets
converted automatically to 15.
2016-06-24 09:48:48 +02:00
Vincent Petry
dc78d26f2a
Merge pull request #25239 from owncloud/setupchecks-preventreload
...
Don't reload page in case of auth errors during setup checks
2016-06-24 09:47:55 +02:00
Hendrik Leppelsack
e5d8726859
remove ie8+9 support
2016-06-23 12:34:53 +02:00
Vincent Petry
97f1813695
Don't reload page in case of auth errors during setup checks
...
If an error occurs during setup checks, do not let the global ajax
error handler reload the page.
2016-06-23 11:54:49 +02:00
Joachim Sokolowski
d7d7b49647
to Nextcloud
2016-06-22 17:41:01 +02:00
Vincent Petry
4a2fb1b4cb
Init the headers in iedavclient.js
2016-06-22 16:58:06 +02:00
VicDeo
854352d9a0
occ web executor ( #24957 )
...
* Initial web executor
* Fix PHPDoc
Fix broken integration test
OccControllerTests do not require database access - moch them all!
Kill unused sprintf
2016-06-22 13:12:36 +02:00
Morris Jobke
7e186194c4
Fix translation strings
2016-06-22 10:27:24 +02:00
Morris Jobke
7ba89b1175
Merge pull request #196 from JSoko/patch-2
...
singleuser.user.php -> nextcloud
2016-06-22 10:25:03 +02:00
Joachim Sokolowski
a83cbee717
changed to nextcloud
2016-06-22 08:20:23 +02:00
Joachim Sokolowski
1ffd8d0d96
nextcloud server
...
nextcloud server
2016-06-22 08:07:45 +02:00
Jenkins for ownCloud
b85bcccc09
[tx-robot] updated from transifex
2016-06-22 01:54:55 -04:00
Joachim Sokolowski
64a9f9d77b
singleuser.user.php -> nextcloud
...
Changed to nextcloud
2016-06-22 07:48:36 +02:00