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

12164 commits

Author SHA1 Message Date
Nextcloud bot
e29835a702
[tx-robot] updated from transifex 2016-07-12 00:09:34 +00:00
Bjoern Schiessle
7c64e1973f
add test for needsRebundling() check 2016-07-11 15:51:48 +02:00
Lukas Reschke
0c1cf5f7eb Merge pull request #347 from nextcloud/drop-windows-foo 
Remove unneeded checks if it runs on a Windows machine
 2016-07-11 13:16:03 +02:00
Joas Schilling
103417fd9c Merge pull request #350 from nextcloud/fix-check-certificate-bundles 
fix check if the certificate bundle needs to be updated
 2016-07-11 11:04:49 +02:00
Bjoern Schiessle
49cad153af
always check the mtime of the system bundle and additionally the user specific certificate bundle if a user is given 2016-07-08 18:24:37 +02:00
Morris Jobke
c2d88a08b7
Remove unneeded checks if it runs on a Windows machine 
* the setup check is still there
 2016-07-08 15:55:17 +02:00
Morris Jobke
390a996297
Sanitize more config options and stack traces 2016-07-08 14:13:16 +02:00
Nextcloud bot
a84250e0af [tx-robot] updated from transifex 2016-07-08 00:09:25 +00:00
Lukas Reschke
c8ba8f637e Merge pull request #314 from jernst/master 
Allow wildcard * to be used in trusted domains
 2016-07-07 19:34:11 +02:00
Lukas Reschke
2a1a3957b6 Merge pull request #333 from nextcloud/sync-master 
Sync master
 2016-07-07 19:29:43 +02:00
Morris Jobke
2791b8f00d Revert "occ web executor (#24957)" 
This reverts commit 854352d9a0.
 2016-07-07 12:14:45 +02:00
Morris Jobke
e3b509220b Revert "Bypass upgrade page when occ controller is requested" 
This reverts commit 89e581acf8.
 2016-07-07 12:14:39 +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 3731b2a006eca1e96d4087212a5e779c85a002e4.

Revert "[tx-robot] updated from transifex"

This reverts commit 94d91113f1206161b00bbc28da00aaf80bcd0a3e.

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
Nextcloud bot
4a0efa38c0 [tx-robot] updated from transifex 2016-07-07 08:58:00 +00: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
Johannes Ernst
66a134e69e Disallow certain malformed domain names even if they match the trusted domain expression 
Stricter checking for valid domain names
 2016-07-06 23:51:04 +00:00
Johannes Ernst
2b4ceae620 Trusted domain wildcard checking made shorter, supporting multiple * 
Added test cases
 2016-07-06 23:38:30 +00:00
Vincent Petry
dc21a38a85 Use named parameter instead of direct value for system tags search param (#25380) 2016-07-06 22:39:34 +02: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
Johannes Ernst
3516b58be6 Duh, no 'next' in PHP. 
Use === instead of == for extra paranoia.
 2016-07-06 04:51:49 +00:00
Johannes Ernst
b1867dc8d1 Allow wildcard * to be used in trusted domains, to support setups where no reliable DNS entry is available (e.g. mDNS) or for simple-to-setup aliasing (e.g. *.example.com) 2016-07-05 18:49:18 +00:00
Vincent Petry
563c895a46 Merge pull request #25356 from owncloud/checkupgrade-bypass 
Bypass upgrade page when occ controller is requested
 2016-07-05 12:04:19 +02:00
Thomas Müller
d2d99a91a0 fix swift primary object store test (#25281) 
* Wait for socket to be open

* Fix call on null

* Allow DB access for MountProviderTest

Makes unit tests pass when using object store, since their FS access is
actually oc_filecache DB access. It is currently not possible to mock
or bypass the logic from "SharedMount::verifyMountPoint()" triggered by
this test.
 2016-07-05 08:54:51 +02:00
Jenkins for ownCloud
34eec57262 [tx-robot] updated from transifex 2016-07-05 02:31:32 -04:00
Victor Dubiniuk
e38bbdc9fe Bypass upgrade page when occ controller is requested 2016-07-05 09:20:37 +03: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
bca4f42e14 Merge branch 'master' of https://github.com/nextcloud/server 2016-07-04 12:06:52 +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
Lukas Reschke
dc5fea504b [master] Use paramterized parameter for \OC\SystemTag\SystemTagManager 
$nameSearchPattern was passed in and directly appended to the SQL query. Luckily the code path isn't reached anywhere in Nextcloud or the included apps.
 2016-07-03 16:54:41 +02: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
11be3d6276 remove png references in core 2016-07-01 16:36:37 +02:00
Lukas Reschke
179a355b2c Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-07-01 11:36:35 +02:00
Thomas Müller
b55ab6d22a Various database migration fixes (#25209) 
* String columns with a length higher then 4000 are converted into a CLOB columns automagically - we have to respect this when migrating

* Adding schema migration tests to prevent unnecessary and non-sense migration steps
Fix Oracle autoincrement and unsigned handling

* Fix sqlite integer type for autoincrement

* Use lower case table names - fixes pg

* Fix postgres with default -1 - this only affect pg 9.4 servers - 9.5 seems to work fine
 2016-06-29 14:54:41 +02: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
Robin Appelman
2a72eff9ee Fix getting the certificate bundle for dav external storage (#25274) 
* Fix getting the certificate bundle for dav external storages

* Log the original exception in dav external storage
 2016-06-27 22:26:43 +02:00
Christoph Wurst
1710de8afb Login hooks (#25260) 
* fix login hooks

* adjust user session tests

* fix login return value of successful token logins

* trigger preLogin hook earlier; extract method 'loginWithPassword'

* call postLogin hook earlier; add PHPDoc
 2016-06-27 22:16:22 +02:00
Robin Appelman
88ef163276 handle unavailable fed shares while testing for availability (#25277) 
* More explicit http status codes

* handle unavailable fed shares while testing for availability
 2016-06-27 21:34:28 +02:00
Lukas Reschke
e0445856b9 Merge pull request #59 from nextcloud/theming-app 
Theming app
 2016-06-27 21:14:40 +02:00
Lukas Reschke
6670d37658 Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-27 18:23:00 +02:00
Bjoern Schiessle
2a990a0db5
verify user password on change 2016-06-27 14:08:11 +02:00
Bjoern Schiessle
d4989c8037
remove old hook, no longer needed 2016-06-27 14:05:27 +02:00