 Roeland Jago DoumaandGitHub
|
30fc87daea
|
Merge pull request #344 from nextcloud/fix-share-dialog
Fix share dialog
|
2018-08-02 22:13:30 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
5be1bcd8b0
|
Merge pull request #439 from nextcloud/feature/noid/register
Providers integration
|
2018-07-31 14:21:51 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
fa5026bba7
|
Merge pull request #491 from nextcloud/fix-activities-v2
Fix activities v2
|
2018-07-30 22:39:08 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
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 DoumaandGitHub
|
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 DoumaandGitHub
|
7fccae7875
|
Merge pull request #509 from ivaradi/artful-cosmic
Stop building for Artful, enable Cosmic
|
2018-07-30 20:32:56 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
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 |
|
|
Roeland Jago DoumaandGitHub
|
e69d56a0cd
|
Merge pull request #395 from nextcloud/upstream/pr/6388
OwnSql: Some refactoring
|
2018-07-04 13:34:44 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
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 |
|
|
Roeland Jago DoumaandGitHub
|
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 |
|
|
Roeland Jago DoumaandGitHub
|
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 |
|
|
Roeland Jago DoumaandGitHub
|
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 |
|
|
Roeland Jago DoumaandGitHub
|
9bb58550ff
|
Merge pull request #469 from nextcloud/update-readme
Updates the README
|
2018-07-02 18:11:32 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
70d7676794
|
Merge pull request #440 from nextcloud/fix/runtestsci
Run unit tests on drone
|
2018-06-28 21:55:15 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
0c21e4945d
|
Merge pull request #455 from nextcloud/fix/appimage/openssl
Fix/appimage/openssl
|
2018-06-27 23:26:44 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
5ce9aedb7a
|
Merge pull request #452 from nextcloud/organize-windows-translation
Windows: moves translation files to /i18n.
|
2018-06-27 13:14:19 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
aa04f20ad6
|
Merge pull request #449 from nextcloud/ci/appimage
Build AppImage with Qt-5.11
|
2018-06-26 21:18:30 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
106756624a
|
Merge pull request #448 from nextcloud/ci/clang
Add clang build to CI
|
2018-06-26 17:44:23 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
1235652cde
|
Merge pull request #442 from nextcloud/fix/noid/appimage_webview
Fix webview appimage
|
2018-06-23 21:36:47 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
9eb950bdcf
|
Merge pull request #438 from nextcloud/bugfix/413/hide-decrypt-option
Hide decrypt option since it does only work for empty folders
|
2018-06-23 21:20:46 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
aff749da12
|
Merge pull request #437 from nextcloud/feature/150/e2e-indicator
Add indicator to e2e folders
|
2018-06-22 11:32:22 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
cf93b74028
|
Merge pull request #432 from nextcloud/feature/157/show_mnemonic
Add a button to E2E accounts to show the mnemonic
|
2018-06-22 10:15:07 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
a742cbcdce
|
Merge pull request #409 from nextcloud/upstream/pr/6556
Fix make doc-man in shadow build
|
2018-06-21 19:50:48 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
652dd8c812
|
Merge pull request #410 from nextcloud/upstream/windows-shell-integration
Windows Shell extention: Fix clicking on the menu entries
|
2018-06-21 19:42:04 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
81d8a1ec6b
|
Merge pull request #419 from nextcloud/fix/osx/no_thead_local
Thread local storage don't work properly on OSX
|
2018-06-20 15:15:15 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
9fe77ed7bf
|
Merge pull request #430 from nextcloud/update_mac_deploy-at
Fix macdeployqt
|
2018-06-20 15:14:43 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
f71c74e5aa
|
Merge pull request #418 from nextcloud/fix/nextcloud_sparkle_key
Add our own dsa_pub.pem
|
2018-06-14 21:06:17 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
2ce79717b2
|
Merge pull request #412 from nextcloud/upstream/nsis
NSIS: SVG imageformats plugin DLL
|
2018-06-13 19:52:40 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
26bf407d62
|
Merge pull request #400 from nextcloud/upstream/pr/6481
SocketAPI: Allow opening share dialog if contents still syncing #4608
|
2018-06-11 19:43:01 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
f31d4ba341
|
Merge pull request #392 from nextcloud/upstream/pr/6413
Rename local discovery option for clarity
|
2018-06-11 15:25:03 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
2cc94636cf
|
Merge pull request #391 from nextcloud/upstream/pr/6417
Conflicts: Change tags to be more user friendly #6365
|
2018-06-11 14:48:47 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
7e98a1e802
|
Merge pull request #390 from nextcloud/upstream/pr/6377
Notify if an explicitly excluded folder is created #6222
|
2018-06-08 14:58:45 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
d0a93ddfc4
|
Merge pull request #387 from nextcloud/upstream/accountwizard
AccountWizard: Reserve space for error label #6546
|
2018-06-07 15:39:55 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
a6179876c7
|
Merge pull request #385 from nextcloud/upstream/pr/6525
Credentials: Retry fetching from the keychain in case the keychain is…
|
2018-06-07 15:32:16 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
81b0cdc9d2
|
Merge pull request #386 from nextcloud/upstream/owncloudsynclog
owncloudsynclog: 1 MB -> 10 MB #6420
|
2018-06-07 15:01:34 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
2a60141ef2
|
Merge pull request #383 from nextcloud/upstream/pr/6526
macOS: Don't use WAL for sqlite3 in /Volumes
|
2018-06-07 10:36:57 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
a01c78a4ce
|
Merge pull request #382 from nextcloud/upstream/pr/6530
SyncJournal: Check file existence even for open dbs #6049
|
2018-06-07 10:21:07 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
a348ff3134
|
Merge pull request #381 from nextcloud/upstream/pr/6532
Upload: Adjust timeout for final job based on size #6527
|
2018-06-07 09:49:25 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
b2a8eea875
|
Merge pull request #380 from nextcloud/upstream/pr/6533
Propagation: Connection closed is a normal error #6516
|
2018-06-07 09:35:32 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
f540c37ad3
|
Merge pull request #375 from nextcloud/upstream/pr/6523
PropagateUpload: Remove unused PropagateUploadFileCommon::abort
|
2018-06-07 09:11:45 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
448b0ebf63
|
Merge pull request #374 from nextcloud/upstream/pr/6519
ShareLink: Preserve password when unrelated ui changes #6512
|
2018-06-06 21:01:51 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
04930768ee
|
Merge pull request #370 from nextcloud/upstream/pr/6238
update supported linux platforms
|
2018-06-06 20:56:03 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
8189c50f51
|
Merge pull request #368 from nextcloud/upstream/sqlite-version
sqlite: Update bundled version to 3.23.1
|
2018-06-06 20:46:53 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
fb6e503f7b
|
Merge pull request #367 from nextcloud/upstream/clang
Fix a bunch of warning with clang
|
2018-06-06 20:39:44 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
075091d7e0
|
Merge pull request #365 from nextcloud/upstream/pr/6464
Logging: Avoid the word "Error"
|
2018-06-06 20:30:30 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
ba901503fc
|
Merge pull request #364 from nextcloud/upstream/pr/6458
Network settings: If no proxy host given, show "no proxy" #5885
|
2018-06-06 20:23:49 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
33b6d0473a
|
Merge pull request #399 from nextcloud/upstream/pr/6333
Use std::chrono::milliseconds to represent milliseconds
|
2018-06-06 20:09:48 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
ad43d88fde
|
Merge pull request #360 from nextcloud/upstream/pr/6428
Uploads: Don't delete unexisting chunks
|
2018-06-06 13:34:55 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
27e1efb8a3
|
Merge pull request #358 from nextcloud/upstream/pr/6434
SocketApi/Sharing: Add "copy public link" to menu #6356
|
2018-06-06 09:34:19 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
d7ce92b017
|
Merge pull request #357 from nextcloud/upstream/notifications
Notifications: Lower hiding timeout
|
2018-06-05 21:45:37 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
4e4ec48bbc
|
Merge pull request #356 from nextcloud/upstream/qunused
Q_UNUSED: Sprinkle around
|
2018-06-05 21:20:09 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
27826ddee0
|
Merge pull request #355 from nextcloud/upstream/pr/6450
macOS: Implement new dynamic Finder menu items #6328
|
2018-06-05 20:45:11 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
5b0a1d4c79
|
Merge pull request #354 from nextcloud/upstream/pr/6444
macOS: Unload the Finder extension on exit #5382 #3819
|
2018-06-05 20:39:43 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
eda221227f
|
Merge pull request #353 from nextcloud/upstream/pr/6448
Simple permanent logging
|
2018-06-05 20:21:25 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
a7b7344659
|
Merge pull request #352 from nextcloud/upstream/pr/6438
Folders: Use "Problem" icon for unresolved conflicts #6277
|
2018-06-05 20:07:00 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
f9f1f8bda6
|
Merge pull request #351 from nextcloud/upstream/pr/6437
Share link: Update permission wording #6192
|
2018-06-05 19:58:40 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
7c4c3b0493
|
Merge pull request #349 from nextcloud/upstream/macOS
macOS: build/installer changes
|
2018-06-05 13:39:36 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
3ce41c71c1
|
Merge pull request #350 from nextcloud/upstream/pr/6436
SyncJournalDb::setSelectiveSyncList: Always use a transaction
|
2018-06-05 11:30:24 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
0afcb23734
|
Merge pull request #331 from nextcloud/upstream/pr/6412
Blacklisting must prevent parent etag updates #6411
|
2018-06-05 10:18:53 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
5309694b34
|
Merge pull request #394 from nextcloud/fix/master/info
Fix output add E2E again
|
2018-06-05 09:39:06 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
a035b9b10b
|
Merge pull request #393 from ivaradi/master
Re-encoded Ubuntu/Debian upload keys
|
2018-06-05 09:02:23 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
2eb87e769c
|
Merge pull request #330 from nextcloud/upstream/pr/6408
FolderStatusModel: fix potential assert
|
2018-06-05 08:19:01 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
6872cbda7e
|
Merge pull request #329 from nextcloud/upstream/pr/6416
csync_update: add the checksum in the discovery log
|
2018-06-05 08:12:00 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
69aa077212
|
Merge pull request #338 from ivaradi/master
Patch the OSX CMakeLists.txt for Xenial
|
2018-06-05 07:51:46 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
dfed78a665
|
Merge pull request #328 from nextcloud/upstream/issue/5932
macdeployqt: Adjust minimum version based on our Qt #5932
|
2018-06-04 20:23:38 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
8477c5a565
|
Merge pull request #327 from nextcloud/upstream/pr/6271
postinstall macOS: check if Finder is running
|
2018-06-04 20:00:58 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
32ae670c4e
|
Merge pull request #325 from nextcloud/upstream/ssl-button-speed
SslButton: Improve speed (especially on macOS) #6031
|
2018-06-04 17:14:38 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
4bd6f2b26d
|
Merge pull request #323 from nextcloud/upstream/upload-finished-flag
Upload: Simplify 'finished' flag
|
2018-06-04 17:14:17 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
c1171d700e
|
Merge pull request #322 from nextcloud/upstream/pr/6404
Excludes: Expand doc, Desktop.ini only in root folder
|
2018-06-04 17:13:23 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
3a1dc44ec8
|
Merge pull request #320 from nextcloud/upstream/issue/6403
propagateuploadv1: don't finalize after a done()
|
2018-06-04 17:12:52 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
3c3f3541d4
|
Merge pull request #291 from nextcloud/fixEncryptionDecryptionNonEmptyFolder
Forbid to encrypt or decrypt a non-empty folder.
|
2018-06-04 16:03:25 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
c49597d9d8
|
Merge pull request #319 from nextcloud/upstream/issue/4424
Folder: normalize the local path.
|
2018-06-04 16:02:49 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
321e8c0264
|
Merge pull request #317 from nextcloud/upstream/issue/3146
SslButton: Add HTTP/2 info #3146
|
2018-06-04 16:01:44 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
092063d348
|
Merge pull request #316 from nextcloud/upstream/pr/6384
CSync Errors cleanup
|
2018-06-04 15:59:45 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
f96206705a
|
Merge pull request #315 from nextcloud/upstream/pr/6379
Discovery: Error if properties are missing #6317
|
2018-06-03 19:58:21 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
1262cbf4ef
|
Merge pull request #314 from nextcloud/upstream/pr/6373
Make sure ignored and conflict files show up in the issues tab even with partial local discovery
|
2018-06-02 20:20:19 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
335298f4e2
|
Merge pull request #312 from nextcloud/upstream/pr/6374
Move ClientProxy and and ConnectionValidator out of libsync
|
2018-06-01 11:08:20 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
c6ef8eec0a
|
Merge pull request #305 from nextcloud/upstream/pr/6363
SyncEngine: Use separate state for two unicode conversions
|
2018-05-30 08:04:05 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
86741de622
|
Merge pull request #299 from nextcloud/upstream/pr/6349
Don't delete contents behind directory junctions #6322
|
2018-05-30 08:03:04 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
c6c42c3c70
|
Merge pull request #311 from nextcloud/upstream/pr/6371
Utility::fsCasePreserving: remove UNIT_TESTING ifdef
|
2018-05-29 20:33:34 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
d410b8e057
|
Merge pull request #310 from nextcloud/upstream/version-cmake
VERSION.cmake: This is 2.4.2 now
|
2018-05-29 20:32:27 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
6ebcc638e0
|
Merge pull request #300 from nextcloud/upstream/pr/6351
SettingsDialogMac: Also start timer for notifications
|
2018-05-29 20:19:03 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
1b756ac80f
|
Merge pull request #318 from nextcloud/upstream/pr/6402
Dolphin plugin: fall back if $XDG_RUNTIME_DIR is empty
|
2018-05-26 21:33:45 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
bb1b86b087
|
Merge pull request #307 from nextcloud/upstream/pr/6366
test/testsyncengine: testNoLocalEncoding is for Linux
|
2018-05-26 21:30:21 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
b7d5aff901
|
Merge pull request #303 from nextcloud/upstream/issue/6322
SyncJournal: Don't use LIKE with paths
|
2018-05-18 13:56:25 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
1dc3c156d4
|
Merge pull request #304 from nextcloud/upstream/pr/6364
Conflicts: Add user name to conflict file name #6325
|
2018-05-18 13:56:14 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
cf4e156fa0
|
Merge pull request #321 from nextcloud/upstream/qtversion-pkg-name
macOS: Put Qt version in .pkg name
|
2018-05-17 21:13:42 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
3b4fcfcc65
|
Merge pull request #302 from nextcloud/upstream/pr/6352
Sharing: Use maximum allowed permissions for new share #6346
|
2018-05-17 21:11:33 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
33555292ae
|
Merge pull request #301 from nextcloud/upstream/pr/6353
HTTP2: Only from Qt 5.9.4 #6285
|
2018-05-17 15:39:09 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
36572b79c3
|
Merge pull request #298 from nextcloud/upstream/no-shibboleth
NO_SHIBBOLETH: Fix warning
|
2018-05-17 15:38:04 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
2e0d724e3e
|
Merge pull request #297 from nextcloud/upstream/pr/6336
- add description for moveToTrash variable
|
2018-05-17 15:37:40 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
cbeb9af7fd
|
Merge pull request #296 from nextcloud/upstream/issue/6337
FolderStatusModel: Refresh folders on Problem sync #6337
|
2018-05-17 15:37:20 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
880f256a62
|
Merge pull request #278 from ivaradi/master
Fix Debian build
|
2018-05-03 22:20:44 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
e40bddb2c2
|
Merge pull request #276 from nextcloud/no_debian
Build no debian while it fails
|
2018-05-03 14:38:38 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
889c930b36
|
Merge pull request #75 from nextcloud/new_flow
Add weblogin flow for NC > 12
|
2018-05-03 14:07:44 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
75609c1b2c
|
Merge pull request #254 from ad1rie1/FIX32BitApplication
Fix #6394
|
2018-04-22 20:57:36 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
4c40789dca
|
Merge pull request #140 from nextcloud/appimage_drone_bump
Bump AppImage Drone
|
2018-03-23 15:36:33 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
a2815dac12
|
Merge pull request #224 from nextcloud/fix-documentation-cmake
Remove configure_file for non-existing documentation config file
|
2018-03-23 15:36:13 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
0743c63c81
|
Merge pull request #114 from ivaradi/debian-build
Moved Debian build to Drone
|
2018-02-06 08:18:00 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
89b2df62c5
|
Merge pull request #144 from nextcloud/win_images
Use Nextcloud images for windows installer
|
2018-01-30 14:23:32 +01:00 |
|