Morris Jobke
cb69571cda
Fix docker image naming issue for CI
...
* wrongly named PHP7 - it is PHP 5.6
* moved integration tests at the very end
2016-07-06 13:25:13 +02:00
Vincent Petry
21b5533b83
Merge pull request #25361 from owncloud/sharing-inttestforusershareaftergroupshare
...
Add integration test for sharing with group, then user in group
2016-07-06 12:49:30 +02:00
Vincent Petry
cf6fe95cbf
Merge pull request #25325 from owncloud/filelist-prependslash
...
Filelist change dir auto-prepend slash
2016-07-06 12:44:03 +02:00
Vincent Petry
1f9d728538
Ignore invalid paths in the JS file list ( #25368 )
2016-07-06 11:55:02 +02: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
Carlos Damken
d58e6b59d3
Upgrading the log level From Debug to INFO to be consistent with files_trashbin ( #25367 )
2016-07-06 10:33:31 +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
Roeland Douma
54666a6418
Merge pull request #319 from nextcloud/config-sample
...
Fix config sample text
2016-07-06 09:58:14 +02:00
Morris Jobke
68b03a0eab
Fix config sample text
2016-07-06 08:59: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
Robin Appelman
d623763aac
Add "goto" links for files in non-default file lists
2016-07-05 22:22:55 +02: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
Joas Schilling
fcf25864d6
Merge pull request #311 from Bugsbane/master
...
Update system tags icon
2016-07-05 13:52:17 +02:00
Bugsbane
29ffe0b790
Replace tag svg with optimized version
...
Replace the system tags tag icon svg with a version that has been optimized by the optimization script (running scour)
2016-07-05 06:52:10 -04:00
Bugsbane
01149c9e97
Clean the svg with inkscapes clean document function
2016-07-05 06:18:02 -04:00
Bugsbane
515df6db59
Update system tags icon
...
Change system tags icon from a magnifying glass to a newly created tag icon. Updates both the png and it's original source SVG.
2016-07-05 06:16:25 -04: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
Vincent Petry
b77fcc19d4
Merge pull request #25344 from owncloud/fix-ldap-check-user
...
check if renamed user is still valid by reapplying the ldap filter
2016-07-05 11:29:55 +02:00
Vincent Petry
17297d4db1
Add integration test for sharing with group, then user in group
...
Add integration test for the use case where a group share exists and
then the same owner creates a direct share to a user in that group.
2016-07-05 11:16:39 +02:00
Björn Schießle
3ffe424985
Merge pull request #309 from Faldon/master
...
Changed the creation of the update notification link
2016-07-05 10:27:48 +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
Thomas Pulzer
cf7afabf62
Added escaping html code when building link to documentation.
2016-07-05 06:59:11 +02:00
Thomas Pulzer
52336b2038
Changed the creation of the update notification link to generate the js object from concated string.
2016-07-04 22:57:10 +02:00
Marius Blüm
0481a3eadf
Merge pull request #306 from nextcloud/sidebar-preview-text
...
Add large sidebar previews for text files
2016-07-04 21:36:51 +02:00
Morris Jobke
387ac9e048
Merge pull request #25240 from owncloud/remove-svg
...
Remove SVG fallback
2016-07-04 17:49:00 +02:00
Morris Jobke
dd337597b3
for text use max-height to trim whitespace
2016-07-04 17:38:26 +02:00
Vincent Petry
a48df671a3
Merge pull request #25253 from owncloud/users-fixotherquotadropdown
...
Fix "Other" value handling in quota dropdown in users page
2016-07-04 16:13:18 +02:00
Vincent Petry
8d866dfba4
Merge pull request #25314 from owncloud/files_external-backends-config
...
show configuration options for authentication backends
2016-07-04 16:10:03 +02:00
Morris Jobke
2e5e0c157d
adjust padding of text preview
2016-07-04 15:38:16 +02:00
Joas Schilling
411515ba0e
Change nickvergessen mailmap entry ( #25349 )
2016-07-04 15:19:47 +02:00
felixboehm
e901ec4941
check if renamed user is still valid by reapplying the ldap filter ( #25338 )
2016-07-04 14:20:08 +02:00
Jörn Friedrich Dreyer
d2d2a75529
Cap LDAP user cache ( #25323 )
2016-07-04 13:57:15 +02:00
Lukas Reschke
be847398b4
Merge pull request #296 from ayamshanov/add_fb2_mimetype
...
Add mimetype for fb2-extension
2016-07-04 13:54:11 +02:00
Lukas Reschke
77082c20a7
Merge pull request #305 from Faldon/master
...
Changing name of default logfile
2016-07-04 13:25:00 +02:00
Robin Appelman
a4d75a60a9
Add large sidebar previews for text files
2016-07-04 12:54:12 +02:00
Morris Jobke
2f475a9f1e
Merge pull request #284 from nextcloud/cleanup-after-sync
...
we don't need to check permissions twice
2016-07-04 12:23:41 +02:00
Thomas Pulzer
bca4f42e14
Merge branch 'master' of https://github.com/nextcloud/server
2016-07-04 12:06:52 +02:00
Robin Appelman
860b7c36ec
Factor out handling sidebar previews
2016-07-04 12:04:32 +02:00
Morris Jobke
b3fbf8b3f3
Merge pull request #303 from nextcloud/collapse-logs-in-github-issue-template
...
Collapse logs and lists with HTML5 support of github
2016-07-04 11:57:43 +02:00
Morris Jobke
55ad79a97f
Fix summary
2016-07-04 11:56:38 +02:00
Thomas Pulzer
90b7f74da7
Changed name of default logfile from owncloud.log to nextcloud.log.
2016-07-04 11:50:32 +02:00
Morris Jobke
152c1d414e
Merge pull request #299 from nextcloud/master-use-parameterized-query
...
[master] Use paramterized parameter for \OC\SystemTag\SystemTagManager
2016-07-04 11:49:40 +02:00
Bjoern Schiessle
4a4cac611f
we don't need to check permissions twice
2016-07-04 10:48:15 +02:00
Joas Schilling
8e0e7937f5
Collapse logs and lists with HTML5 support of github
2016-07-04 10:40:13 +02:00
Morris Jobke
978ab660f7
Merge pull request #290 from nextcloud/update-transifex-link
...
We have our own Transifex org now ;)
2016-07-04 08:07:22 +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