Commit Graph

10761 Commits

Author SHA1 Message Date
Christian Kamm 494ea5c78c Reformatting: Add .git-blame-ignore-revs
For git hyper-blame support
2017-05-17 12:31:49 +02:00
Christian Kamm c8d0f788e0 Apply clang-format 2017-05-17 12:26:27 +02:00
Christian Kamm ae263d60bd Reformatting: Reformat some lines that would become really long 2017-05-17 12:26:27 +02:00
Christian Kamm df3fe25702 Reformatting: Adjust trailing comments
These would otherwise be line-wrapped by clang-format,
and then consecutive reformattings remove the aligned
comment indentation

Example:

int a; // too long comment

->

int a; // too long
       // comment

->

int a; // too long
// comment
2017-05-17 12:26:27 +02:00
Christian Kamm 566e6c813e Add .clang-format style
From http://code.qt.io/cgit/qt/qtrepotools.git/tree/config/_clang-format
2017-05-17 12:26:27 +02:00
Christian Kamm ee4892e345 Wizard: Skip result page with acceptance instead of closing #5764 2017-05-12 10:21:07 +02:00
Jocelyn Turcotte 7fd2f292e7 Promote a few more logs to info/warning 2017-05-11 17:22:59 +02:00
Markus Goetz b68d982619 macOS: Fix usage of qCDebug in .mm file 2017-05-11 17:22:59 +02:00
Jocelyn Turcotte cf058bc537 Add the possiblility to enable debug logging categories
Add a checkbox in the log window as well as a --logdebug command-line
option that should have the same effect.

Issue #5647
2017-05-11 17:22:59 +02:00
Jocelyn Turcotte cc9680c1e8 Also pass csync logs through QMessageLogger
This allows using logging rules and custom message patterns with csync.
This also pass the a relative verbosity to the message logger.

Issue #5647
2017-05-11 17:22:59 +02:00
Jocelyn Turcotte b7553d5bdf Upgrade some qCDebug to qCInfo or qCWarning
Use qCInfo for anything that has general value for support and
development. Use qCWarning for any recoverable error and qCCritical
for anything that could result in data loss or would identify a serious
issue with the code.

Issue #5647
2017-05-11 17:22:59 +02:00
Jocelyn Turcotte 4ad190a558 Use Qt logging categories for logging
This gives more insight about the logs and allow setting fine-tuned
logging rules. The categories are set to only output Info by default
so this allows us to provide more concise logging while keeping the
ability to extract more information for a specific category when
developping or debugging customer issues.

Issue #5647
2017-05-11 17:22:59 +02:00
Jocelyn Turcotte 3a193655b3 Improve the logging message pattern
Add the log level and category name in the output. Only output the
thread ID and function name for qCDebug statements as they are not
necessary for general use and make the log harder to read.

Also make sure that the message pattern is set when NO_MSG_HANDLER is
used. Using an environment variable should have priority over it anyway.
2017-05-11 17:22:59 +02:00
Jocelyn Turcotte e10a08f64d Remove the unused folderwatcher_qt implementation 2017-05-11 17:22:59 +02:00
Markus Goetz cc94c772cd ChangeLog: 2.4 until now 2017-05-11 12:03:52 +02:00
Christian Kamm 4b6edaa01a Detect maintenance mode #4485
When we first detect a 503 (probably from a PROPFIND) and enter the
ServiceUnavailable state, we new trigger a status.php query that will
switch the state to MaintenanceMode if necessary.
2017-05-11 11:39:49 +02:00
Markus Goetz 8da7919a43 Sharing: Fix UI glitch when sharing is disabled 2017-05-10 15:41:58 +02:00
Markus Goetz f52d66a954 Sharing: Optionally show warning that links are public
For https://github.com/owncloud/enterprise/issues/1914
2017-05-10 15:41:58 +02:00
Jocelyn Turcotte 4d3212b31f Merge branch 2.3 into master 2017-05-09 18:23:01 +02:00
Markus Goetz 973dc9e1e2 Update release_template.md 2017-05-09 13:12:22 +02:00
Markus Goetz 8e1422fb37 VERSION.cmake: This is 2.3.3 now 2017-05-09 12:23:52 +02:00
Christian Kamm 881641f0b7 Remove stray debug output 2017-05-09 10:37:40 +02:00
Jenkins for ownCloud 6a378a6362 [tx-robot] updated from transifex 2017-05-09 02:18:36 +02:00
Jocelyn Turcotte 879dadba78 Use QTemporaryDir in TestOwnSql
This will improve the cleanup and possibly help for #5366.
2017-05-08 23:18:06 +02:00
Jocelyn Turcotte 5266720c62 Jenkinsfile: Also use 4 parallel jobs for linux builds 2017-05-08 23:18:06 +02:00
Jocelyn Turcotte dca2b67338 Favor QtKeychain installed together with Qt
By default we will look in /usr/lib, which would prevent us from
using a different path for Qt as QtKeychain depends on Qt itself.
2017-05-08 23:18:06 +02:00
Markus Goetz d1b1da3414 Update release_template.md 2017-05-08 20:34:57 +02:00
Markus Goetz 48a359b69e Update release_template.md 2017-05-08 17:01:37 +02:00
Markus Goetz 2a8f9a7c04 Update release_template.md 2017-05-08 16:17:07 +02:00
Markus Goetz ea691aa2a0 ChangeLog: 2.3.2 2017-05-08 15:50:09 +02:00
Christian Kamm 3da1e9a4b9 Remove 3rdparty qjson #5710 2017-05-08 11:50:33 +02:00
Christian Kamm f1b42cedda Port PollJob responses to Qt5's QJson #5710 2017-05-08 11:50:33 +02:00
Christian Kamm 2598579d84 Switch JsonApiJob to Qt5's QJson #5710 2017-05-08 11:50:33 +02:00
Christian Kamm c5b6ec209a Sharing: Switch from QtJson to Qt5's QJson #5710 2017-05-08 11:50:33 +02:00
Olivier Goffart 13705999f7 Discovery: Increase the MAX_DEPTH and show deep folder as ignored
Before this patch, to deep folder would just be ignored, without any feedback.
This patch makes it so deep folder are properly shown as ignored in the UI.

Also increase the MAX_DEPTH

Issue: #1067
2017-05-08 11:29:51 +02:00
Markus Goetz fbe812b9bc Selective Sync: Open sub folder context menu #5596 2017-05-08 11:24:02 +02:00
Olivier Goffart 4697f0274f Exclude list: remove .htaccess
As per issue #5701, if the server does not support it, let the server
show return an error, but we should not blacklist it localy
2017-05-08 11:17:22 +02:00
Jenkins for ownCloud 9597c2b808 [tx-robot] updated from transifex 2017-05-08 02:18:29 +02:00
Jenkins for ownCloud 3817202b9c [tx-robot] updated from transifex 2017-05-07 02:18:30 +02:00
Jenkins for ownCloud ed960e5a71 [tx-robot] updated from transifex 2017-05-06 02:18:30 +02:00
Jenkins for ownCloud 8b08ca2d00 [tx-robot] updated from transifex 2017-05-05 02:18:28 +02:00
Christian Kamm aff8008baf Downloads: Remove empty temporary if disk space full #5746 2017-05-04 15:12:14 +02:00
Christian Kamm c922015521 SSL error handling: Remove unnecessary confusing code
I'm confident this is unnecessary. The original bug in #3283 was
to call ignoreSslErrors() without an argument in the 'accept'
case, which meant ignoring *all* subsequent SSL errors.

With that fixed, explicitly aborting the reply and resetting QNAM
is not needed since not ignoring the error will lead to the SSL
handshake failing.

See also:
  75b38d1a2f (workaround introduced)
  89376e14d6 (real fix)
  76ce5adbf0 (cherry-pick of workaround)
2017-05-04 09:19:01 +02:00
Jenkins for ownCloud b20adf2281 [tx-robot] updated from transifex 2017-05-04 02:18:38 +02:00
Markus Goetz 4ed9edb104 Wizard: Don't show not-so-useful result page #5726
Better immediately show the settings dialog where people can see what's going on.
They can go to sync folder or webinterface from there.
2017-05-03 19:21:46 +02:00
Olivier Goffart bb244d527c Better words for the error message when one cannot create the database.
Issue #5291
2017-05-03 17:53:46 +02:00
Matthew Setter 7f1d13dfbf Merge pull request #5741 from owncloud/add-checksum-details
Document the checksums addition in 10.0
2017-05-03 13:32:21 +02:00
Matthew Setter 3185b0940b Increase the clarity of the checksum statements
This comes after discussion and feedback with @phil-davis.
2017-05-03 13:17:09 +02:00
Christian Kamm d709a47b93 Share dialog: Add option to copy/email direct links #5627 2017-05-03 10:26:27 +02:00
Jenkins for ownCloud b02f724e7e [tx-robot] updated from transifex 2017-05-03 02:18:29 +02:00