Commit graph

12860 commits

Author SHA1 Message Date
Camila San
75c2613b1b
Displays activity and notification messages in the list view.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
908870ccde
Adds notifications to the Activities list.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:57 +02:00
Roeland Jago Douma
30a4f1edd7
Merge pull request #510 from ivaradi/beta-ppa
Use the beta PPA for builds (re #402)
2018-07-30 20:34:05 +02:00
Roeland Jago Douma
9722fbc151
Merge pull request #507 from doits/allow_macos_gpu_switching
allow to switch to the integrated gpu on MacOS
2018-07-30 20:33:41 +02:00
Roeland Jago Douma
7fccae7875
Merge pull request #509 from ivaradi/artful-cosmic
Stop building for Artful, enable Cosmic
2018-07-30 20:32:56 +02:00
Nextcloud bot
d49aadaf76
[tx-robot] updated from transifex 2018-07-30 00:50:31 +00:00
Nextcloud bot
adb6606e6f
[tx-robot] updated from transifex 2018-07-29 00:48:28 +00:00
Nextcloud bot
e0a1b00d3e
[tx-robot] updated from transifex 2018-07-28 00:47:08 +00:00
István Váradi
c2ceb173b1
Merge branch 'master' into beta-ppa 2018-07-27 21:00:01 +02:00
István Váradi
5f74baabeb
Merge branch 'master' into artful-cosmic 2018-07-27 20:59:44 +02:00
Nextcloud bot
c38fa06754
[tx-robot] updated from transifex 2018-07-27 00:48:48 +00:00
István Váradi
d63bcb4d4b Use the beta PPA for builds (re #402) 2018-07-26 20:19:18 +02:00
István Váradi
dd9e12fe43 Start building for cosmic 2018-07-26 20:08:48 +02:00
István Váradi
8e92f87694 Stop building for artful 2018-07-26 20:07:36 +02:00
Markus Doits
2335688b68
allow to switch to the integrated gpu on MacOS
without that key, the client automatically runs on the dedicated gpu (if
present). now it allows the system to use the integrated one.

closes #501
2018-07-25 09:35:53 +02:00
Nextcloud bot
69b6f5a019
[tx-robot] updated from transifex 2018-07-25 00:46:45 +00:00
Roeland Jago Douma
1af353cb2f
Merge pull request #503 from ivaradi/libgnome-keyring0
Add a dependency on libgnome-keyring0 on Bionic
2018-07-24 13:26:05 +02:00
István Váradi
d228aa8644
Merge branch 'master' into libgnome-keyring0 2018-07-23 14:50:37 +02:00
Nextcloud bot
7f829a88bf
[tx-robot] updated from transifex 2018-07-23 00:46:53 +00:00
István Váradi
df9cc8396a Add a dependency on libgnome-keyring0 on Bionic 2018-07-22 20:33:45 +02:00
Nextcloud bot
df4fb880c2
[tx-robot] updated from transifex 2018-07-22 00:52:57 +00:00
Nextcloud bot
e45a37df73
[tx-robot] updated from transifex 2018-07-20 00:46:28 +00:00
Nextcloud bot
b0ec091e04
[tx-robot] updated from transifex 2018-07-19 00:45:48 +00:00
Nextcloud bot
0c44b32843
[tx-robot] updated from transifex 2018-07-18 00:45:39 +00:00
Camila Ayres
720960f0be
Merge pull request #497 from nextcloud/readme-updates
Updates the README with build instructions.
2018-07-16 12:35:23 +02:00
Camila Ayres
2511105cce
Adds link to wiki page 'System requirements' to README. 2018-07-16 11:31:34 +02:00
Camila Ayres
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
Nextcloud bot
0898ada696
[tx-robot] updated from transifex 2018-07-16 00:45:09 +00:00
Nextcloud bot
dce17b4bd3
[tx-robot] updated from transifex 2018-07-15 00:45:32 +00:00
Nextcloud bot
edf28d9191
[tx-robot] updated from transifex 2018-07-13 00:48:03 +00:00
Camila Ayres
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
Joas Schilling
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
Nextcloud bot
716f88e222
[tx-robot] updated from transifex 2018-07-11 00:47:26 +00:00
Nextcloud bot
62708dea13
[tx-robot] updated from transifex 2018-07-10 09:12:30 +00:00
Nextcloud bot
4f164d1e23
[tx-robot] updated from transifex 2018-07-07 00:40:31 +00:00
Nextcloud bot
e6d46cba17
[tx-robot] updated from transifex 2018-07-06 00:41:45 +00:00
Roeland Jago Douma
e69d56a0cd
Merge pull request #395 from nextcloud/upstream/pr/6388
OwnSql: Some refactoring
2018-07-04 13:34:44 +02:00
Camila Ayres
f1c4b76669
Merge branch 'master' into upstream/pr/6388 2018-07-04 10:12:42 +02:00
Nextcloud bot
41ca5388e9
[tx-robot] updated from transifex 2018-07-04 00:41:40 +00:00
Roeland Jago Douma
24efdd3b45
Fix E2E query
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-03 11:40:58 +02:00
Roeland Jago Douma
6c11c1aa73
Fix query
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-03 10:33:26 +02:00
Olivier Goffart
d114212333
OwnSql: Fixup after feedback for #6388 2018-07-03 10:33:26 +02:00
Olivier Goffart
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
Olivier Goffart
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
Roeland Jago Douma
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
Christian Kamm
4fa6fff1a9
Doc: Explaining conflict files and resolving them #6396 2018-07-03 10:18:20 +02:00
Christian Kamm
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
Roeland Jago Douma
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
István Váradi
e6cc593516
Revert "Do not require exact version for WebEngine dependencies"
This reverts commit dcceec25c89e935b59c921ae22c66199f8642531.
2018-07-03 09:11:31 +02:00
István Váradi
dec5473eec
The version is also read from the VERSION.cmake file 2018-07-03 09:11:31 +02:00