b0ec091e04
[tx-robot] updated from transifex
2018-07-19 00:45:48 +00:00
0c44b32843
[tx-robot] updated from transifex
2018-07-18 00:45:39 +00:00
720960f0be
Merge pull request #497 from nextcloud/readme-updates
...
Updates the README with build instructions.
2018-07-16 12:35:23 +02:00
2511105cce
Adds link to wiki page 'System requirements' to README.
2018-07-16 11:31:34 +02:00
7e63fd535e
Updates the README with build instructions.
...
- Adds a shorter version of how to build the client but the extended version will be kept on the Wiki.
- Makes the instructions available if you clone the repo and work offline.
2018-07-16 11:09:05 +02:00
0898ada696
[tx-robot] updated from transifex
2018-07-16 00:45:09 +00:00
dce17b4bd3
[tx-robot] updated from transifex
2018-07-15 00:45:32 +00:00
edf28d9191
[tx-robot] updated from transifex
2018-07-13 00:48:03 +00:00
d70e2d5c02
Merge pull request #490 from nextcloud/nickvergessen-patch-1
...
Link IRC to webchat so people without a client can do something.
2018-07-11 09:37:53 +02:00
dd154c7505
Link IRC to webchat so people without a client can do something
...
Also note that github doesn't render irc:// links, so it just showed the name
2018-07-11 09:04:03 +02:00
716f88e222
[tx-robot] updated from transifex
2018-07-11 00:47:26 +00:00
62708dea13
[tx-robot] updated from transifex
2018-07-10 09:12:30 +00:00
4f164d1e23
[tx-robot] updated from transifex
2018-07-07 00:40:31 +00:00
e6d46cba17
[tx-robot] updated from transifex
2018-07-06 00:41:45 +00:00
e69d56a0cd
Merge pull request #395 from nextcloud/upstream/pr/6388
...
OwnSql: Some refactoring
2018-07-04 13:34:44 +02:00
f1c4b76669
Merge branch 'master' into upstream/pr/6388
2018-07-04 10:12:42 +02:00
41ca5388e9
[tx-robot] updated from transifex
2018-07-04 00:41:40 +00:00
24efdd3b45
Fix E2E query
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-03 11:40:58 +02:00
6c11c1aa73
Fix query
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-03 10:33:26 +02:00
d114212333
OwnSql: Fixup after feedback for #6388
2018-07-03 10:33:26 +02:00
779969f865
OwnSql: Put the SQL queries next to their use.
...
This avoid haivng to modify 4 places when we want to add a query
2018-07-03 10:33:26 +02:00
518fb90757
OwnSql: Some refactoring
...
Use QByteArray for the query so we don't have to convert twice.
Automatically finish the query when the DB close, so we don't
have to call reset
2018-07-03 10:33:26 +02:00
b309a1c8c4
Merge pull request #401 from nextcloud/upstream/pr/6456
...
Issues: Show link to conflicts doc if there are some #6396
2018-07-03 10:32:09 +02:00
4fa6fff1a9
Doc: Explaining conflict files and resolving them #6396
2018-07-03 10:18:20 +02:00
d549c77af6
Issues: Show link to conflicts doc if there are some #6396
...
The link url is themed.
2018-07-03 10:18:18 +02:00
b527013ad8
Merge pull request #402 from ivaradi/master
...
Use the VERSION.cmake file to determine Ubuntu/Debian main package version
2018-07-03 10:17:42 +02:00
e6cc593516
Revert "Do not require exact version for WebEngine dependencies"
...
This reverts commit dcceec25c89e935b59c921ae22c66199f8642531.
2018-07-03 09:11:31 +02:00
dec5473eec
The version is also read from the VERSION.cmake file
2018-07-03 09:11:31 +02:00
ced4cad329
Do not require exact version for WebEngine dependencies
2018-07-03 09:11:31 +02:00
b18c62dc41
Merge pull request #472 from nextcloud/feature/noid/loginflow_accept_language
...
Set Accept-language header for webview requests
2018-07-03 08:52:11 +02:00
0d70b05b65
Set Accept-language header for webview requests
...
This way the server will properly translate it for you if it has
translations.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-03 07:45:02 +02:00
44205359a5
[tx-robot] updated from transifex
2018-07-03 00:44:23 +00:00
2361076b75
Merge pull request #471 from nextcloud/fix/458/do_not_show_webview_by_default
...
Do not force to show the webview on construct
2018-07-02 22:22:40 +02:00
9627aad04c
Merge branch 'master' into fix/458/do_not_show_webview_by_default
2018-07-02 22:01:03 +02:00
cbf417664d
Merge pull request #404 from nextcloud/upstream/pr/6491
...
Proxy settings: Fix bad behavior with empty host
2018-07-02 21:25:53 +02:00
70b5d54082
Proxy settings: Fix bad behavior with empty host
...
Fixes f6a075ef54#5885
When no host is given it shouldn't just *appear* that there is no
proxy, there actually shouldn't be a proxy set then.
2018-07-02 21:15:30 +02:00
34d964fc80
Do not force to show the webview on construct
...
Should fix #458
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-02 20:09:30 +02:00
93c6576bcb
Merge pull request #470 from nextcloud/update-readme
...
Adds item about Code of Conduct in the README.
2018-07-02 19:48:07 +02:00
4adade9818
More polishing the emojis markdown in the README.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 18:50:40 +02:00
cb6506e3f1
More polishing the emojis markdown in the README.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 18:25:10 +02:00
165b164e95
Fixes CoC links in the README.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 18:21:35 +02:00
c437ffc95f
Adds 'Code of Conduct' item to the README.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 18:17:32 +02:00
9bb58550ff
Merge pull request #469 from nextcloud/update-readme
...
Updates the README
2018-07-02 18:11:32 +02:00
3bf8002708
README: changes emoji markup positions.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 18:06:59 +02:00
74dedf636c
README: trying some emoji markup.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 17:47:12 +02:00
19f1513af0
Fixes link, put items in a list in the README.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 17:29:05 +02:00
ee668eb6cd
Changes the order of the content in the README.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 17:24:57 +02:00
65cb94c316
Updates the README with info about the daily builds and how to compile the client.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-07-02 17:06:48 +02:00
178edb97bc
Merge pull request #466 from nextcloud/fix_compile_warnings
...
Fix compile warnings
2018-07-02 13:50:04 +02:00
08abc71acb
gui Q_UNUSED
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-02 13:02:15 +02:00
Nextcloud bot