Commit graph

12975 commits

Author SHA1 Message Date
Roeland Jago Douma
35c0c9c0b1
Merge branch 'master' into upstream/issue/6522 2018-10-23 20:13:28 +02:00
Roeland Jago Douma
d3bc9fbdf3
Merge pull request #639 from nextcloud/upstream/pr/6605
UpdateInfo: Remove unused code
2018-10-23 13:05:27 +02:00
Roeland Jago Douma
0cf2970134
Merge branch 'master' into upstream/pr/6605 2018-10-23 12:32:16 +02:00
Roeland Jago Douma
206f081505
Merge pull request #727 from nextcloud/fix-issue-268
Uses QByteArray to store private key.
2018-10-23 12:31:39 +02:00
Roeland Jago Douma
1c8307f264
Merge branch 'master' into fix-issue-268 2018-10-23 12:04:14 +02:00
Roeland Jago Douma
2d65091f27
Merge pull request #637 from nextcloud/upstream/issue/6545
Tray workarounds #6545
2018-10-23 11:48:08 +02:00
Roeland Jago Douma
a492ab8294
Merge branch 'master' into upstream/issue/6545 2018-10-23 10:59:56 +02:00
Nextcloud bot
3da6f45ba9
[tx-robot] updated from transifex 2018-10-23 00:43:03 +00:00
Julius Härtl
856d40fd99
Merge branch 'master' into upstream/issue/6581 2018-10-22 20:41:17 +02:00
Nextcloud bot
846075704e
[tx-robot] updated from transifex 2018-10-22 00:45:03 +00:00
Roeland Jago Douma
156308c72e
Merge branch 'master' into upstream/issue/6581 2018-10-21 14:19:07 +02:00
Camila Ayres
c99a35a8a5
Merge pull request #732 from st4ll1/master
Fix cmake command for linux in README too
2018-10-21 11:50:28 +02:00
Andreas Stallinger
f937fdd624 Fix cmake command for linux in README too 2018-10-21 10:40:44 +02:00
Nextcloud bot
1f8c3074a6
[tx-robot] updated from transifex 2018-10-21 00:44:18 +00:00
Nextcloud bot
11673005db
[tx-robot] updated from transifex 2018-10-20 00:43:12 +00:00
Roeland Jago Douma
df24a25829
Merge pull request #396 from nextcloud/upstream/pr/6360
SyncJournal: Clear etag filter before sync
2018-10-19 20:26:30 +02:00
Roeland Jago Douma
2dc7ff7332
Merge branch 'master' into upstream/pr/6360 2018-10-19 16:13:09 +02:00
Roeland Jago Douma
7ace48d5de
Merge pull request #643 from nextcloud/upstream/pr/6615
Log: Adjust update/reconcile log verbosity
2018-10-19 16:04:26 +02:00
Roeland Jago Douma
56ccff4ee8
Merge pull request #654 from nextcloud/upstream/sqlite-version-3-24
sqlite: Update bundled version to 3.24.0
2018-10-19 16:03:04 +02:00
Roeland Jago Douma
9d9f96a685
Merge branch 'master' into upstream/pr/6615 2018-10-19 15:43:50 +02:00
Nextcloud bot
052c37acda
[tx-robot] updated from transifex 2018-10-19 00:42:46 +00:00
Nextcloud bot
fd2e88e13b
[tx-robot] updated from transifex 2018-10-17 00:42:35 +00:00
storca
4bd3829f78
Merge branch 'master' into patch-1 2018-10-16 21:17:58 +02:00
tuxmaster5000
28b399ec2b
Merge branch 'master' into gitignore 2018-10-16 08:55:18 +02:00
Roeland Jago Douma
4bb936f876
Merge pull request #709 from nextcloud/fix-issue-665
Fixes #665 Adds slot for confirmShare button.
2018-10-15 13:58:16 +02:00
Roeland Jago Douma
6805d91033
Merge branch 'master' into fix-issue-665 2018-10-15 13:47:18 +02:00
Nextcloud bot
8da2b9dbf8
[tx-robot] updated from transifex 2018-10-15 00:43:12 +00:00
Camila San
45ff3385c7
Uses QByteArray to store private key.
Removes QSslkey. See #268

Signed-off-by: Camila San <hello@camila.codes>
2018-10-15 00:21:08 +02:00
Camila Ayres
53cc6a1611
Merge branch 'master' into gitignore 2018-10-14 16:17:13 +02:00
Camila Ayres
4e3b408c50
Merge branch 'master' into patch-1 2018-10-14 16:14:43 +02:00
Nextcloud bot
bfc8154e68
[tx-robot] updated from transifex 2018-10-14 00:43:12 +00:00
storca
620908523e
Update accountmanager.cpp
Fixed syntax error
Possible fix for issue #720
2018-10-13 18:45:01 +02:00
storca
8a996ba9a9
Update accountmanager.cpp
Fixed issue #720 by adding the isWrittable method
2018-10-13 18:36:40 +02:00
Nextcloud bot
74d8f32f37
[tx-robot] updated from transifex 2018-10-13 00:42:33 +00:00
tuxmaster5000
a5e329a1c5 Add cmake temporary stuff 2018-10-12 11:48:32 +02:00
Nextcloud bot
3fe44f0d25
[tx-robot] updated from transifex 2018-10-11 00:43:07 +00:00
Nextcloud bot
e207c91228
[tx-robot] updated from transifex 2018-10-10 00:50:58 +00:00
Nextcloud bot
cdf922f51d
[tx-robot] updated from transifex 2018-10-09 00:49:05 +00:00
Camila Ayres
45ffc0ae09
Merge pull request #710 from kevin147147/patch-1
Rename INSTALL to INSTALL.md for Preview :)
2018-10-08 22:00:22 +02:00
kevin147147
e214234001
Rename README to README.md
Preview :)
2018-10-08 21:01:08 +02:00
kevin147147
54e58b51ab
Rename INSTALL to INSTALL.md
Preview :)
2018-10-08 20:57:34 +02:00
Camila San
debe37308f
Fixes #665 Adds slot for confirmShare button.
Signed-off-by: Camila San <hello@camila.codes>
2018-10-08 20:56:01 +02:00
Nextcloud bot
7c096d08aa
[tx-robot] updated from transifex 2018-10-07 00:50:40 +00:00
Nextcloud bot
ac631d008c
[tx-robot] updated from transifex 2018-10-06 00:48:41 +00:00
Nextcloud bot
f1cad3443b
[tx-robot] updated from transifex 2018-10-05 00:51:40 +00:00
Nextcloud bot
cacde7a3aa
[tx-robot] updated from transifex 2018-10-02 00:49:28 +00:00
Camila Ayres
b533c3582e
Updates issue_template.md.
Signed-off-by: Camila San <hello@camila.codes>
2018-10-01 17:57:35 +02:00
Nextcloud bot
69f18f6b7d
[tx-robot] updated from transifex 2018-10-01 00:49:10 +00:00
Nextcloud bot
de80f7d6ca
[tx-robot] updated from transifex 2018-09-30 00:50:09 +00:00
Nextcloud bot
38ec3b8972
[tx-robot] updated from transifex 2018-09-29 00:47:33 +00:00