6d680bdebf
Change png icons to svg
2016-07-07 15:09:28 +02:00
2791b8f00d
Revert "occ web executor ( #24957 )"
...
This reverts commit 854352d9a0
2016-07-07 12:14:45 +02:00
e3b509220b
Revert "Bypass upgrade page when occ controller is requested"
...
This reverts commit 89e581acf8
2016-07-07 12:14:39 +02:00
ba16fd0d33
Merge branch 'master' into sync-master
2016-07-07 11:29:46 +02:00
5ace43f438
Revert "[tx-robot] updated from transifex"
...
This reverts commit 3731b2a00694d91113f1e7cc8bac1e59fc3ff45a6a89a63d2eb0bad03234
2016-07-07 11:04:08 +02:00
ed28885d73
Merge pull request #323 from Faldon/database_port
...
Added occ install option for database-port
2016-07-07 10:20:08 +02:00
38718bf89e
[tx-robot] updated from transifex
2016-07-07 01:56:27 -04:00
d769e718a5
Set content type when downloading log file to force download in some browsers ( #25382 )
2016-07-06 22:47:16 +02:00
dc21a38a85
Use named parameter instead of direct value for system tags search param ( #25380 )
2016-07-06 22:39:34 +02:00
f78f44d1e9
Merge pull request #327 from nextcloud/add-php-5.4-5.5
...
Add PHP 5.4 and 5.5 jobs to CI
2016-07-06 16:37:57 +02:00
da2363a1dd
[tx-robot] updated from transifex
2016-07-06 13:28:06 +00:00
e328d98b6c
Add PHP 5.4 and 5.5 jobs to CI
2016-07-06 15:01:11 +02:00
e1abe5a62b
Merge pull request #324 from nextcloud/fix-naming-issue-drone
...
Fix docker image naming issue for CI
2016-07-06 14:48:30 +02:00
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
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
cf6fe95cbf
Merge pull request #25325 from owncloud/filelist-prependslash
...
Filelist change dir auto-prepend slash
2016-07-06 12:44:03 +02:00
1f9d728538
Ignore invalid paths in the JS file list ( #25368 )
2016-07-06 11:55:02 +02:00
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
d58e6b59d3
Upgrading the log level From Debug to INFO to be consistent with files_trashbin ( #25367 )
2016-07-06 10:33:31 +02:00
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
54666a6418
Merge pull request #319 from nextcloud/config-sample
...
Fix config sample text
2016-07-06 09:58:14 +02:00
68b03a0eab
Fix config sample text
2016-07-06 08:59:38 +02:00
6103df97cc
[tx-robot] updated from transifex
2016-07-06 01:56:27 -04:00
fcf25864d6
Merge pull request #311 from Bugsbane/master
...
Update system tags icon
2016-07-05 13:52:17 +02:00
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
01149c9e97
Clean the svg with inkscapes clean document function
2016-07-05 06:18:02 -04:00
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
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
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
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
3ffe424985
Merge pull request #309 from Faldon/master
...
Changed the creation of the update notification link
2016-07-05 10:27:48 +02:00
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
34eec57262
[tx-robot] updated from transifex
2016-07-05 02:31:32 -04:00
e38bbdc9fe
Bypass upgrade page when occ controller is requested
2016-07-05 09:20:37 +03:00
cf7afabf62
Added escaping html code when building link to documentation.
2016-07-05 06:59:11 +02:00
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
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
387ac9e048
Merge pull request #25240 from owncloud/remove-svg
...
Remove SVG fallback
2016-07-04 17:49:00 +02:00
dd337597b3
for text use max-height to trim whitespace
2016-07-04 17:38:26 +02:00
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
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
2e5e0c157d
adjust padding of text preview
2016-07-04 15:38:16 +02:00
411515ba0e
Change nickvergessen mailmap entry ( #25349 )
2016-07-04 15:19:47 +02:00
e901ec4941
check if renamed user is still valid by reapplying the ldap filter ( #25338 )
2016-07-04 14:20:08 +02:00
d2d2a75529
Cap LDAP user cache ( #25323 )
2016-07-04 13:57:15 +02:00
be847398b4
Merge pull request #296 from ayamshanov/add_fb2_mimetype
...
Add mimetype for fb2-extension
2016-07-04 13:54:11 +02:00
77082c20a7
Merge pull request #305 from Faldon/master
...
Changing name of default logfile
2016-07-04 13:25:00 +02:00
a4d75a60a9
Add large sidebar previews for text files
2016-07-04 12:54:12 +02:00
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
bca4f42e14
Merge branch 'master' of https://github.com/nextcloud/server
2016-07-04 12:06:52 +02:00
Juan Pablo Villafáñez
Morris Jobke
Jenkins for ownCloud
Vincent Petry
Roeland Douma
Nextcloud bot
Thomas Pulzer
Carlos Damken
Joas Schilling
Bugsbane
Björn Schießle
Thomas Müller
Victor Dubiniuk
Thomas Pulzer
Marius Blüm
felixboehm
Jörn Friedrich Dreyer
Lukas Reschke
Robin Appelman