| 
							
							
								 Daniel Molkentin | fcbadda40f | Make Settings Window close on Ctrl+W Fixes #2141
(cherry picked from commit 2ab19b23d7) | 2014-09-02 14:03:20 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Molkentin | 2455faa6fe | Account Migrator: Switch to string comparison for URLs. QUrl does not normalize trailing slashes, so there is no benefit
of using QUrl here.
(cherry picked from commit d770f9cc1a) | 2014-09-02 14:03:07 +02:00 |  | 
			
				
					| 
							
							
								 Markus Goetz | 0be4b59cff | Sparkle: Keep permissions from bundle | 2014-08-31 18:57:39 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | 291231c561 | Merge missing commits from 1.6.2-themefix  into 1.7 Conflicts:
	VERSION.cmake | 2014-08-30 17:57:58 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schmidt | 7ad557f2f8 | Add crash reporter to osx package and don't build it with BUILD_LIBRARIES_ONLY enabled | 2014-08-30 14:45:39 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schmidt | ef70052b0e | Package installer if it was built | 2014-08-30 14:12:40 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schmidt | 202426f536 | Make crash reporter application name branded | 2014-08-30 11:05:52 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schmidt | d240415671 | Make crash reporter logo branded | 2014-08-30 11:05:34 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schmidt | 1aca22b5f8 | Make crash reporter executable branded | 2014-08-30 10:46:09 +02:00 |  | 
			
				
					| 
							
							
								 hefee | 68792ee9db | Fixing spellingerror GNU Public License -> GNU General Public License | 2014-08-30 02:18:55 +02:00 |  | 
			
				
					| 
							
							
								 Klaas Freitag | bcff1ced5e | Merge branch '1.7' Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/folderman.cpp
	src/gui/wizard/owncloudadvancedsetuppage.cpp
	src/libsync/account.cpp | 2014-08-29 20:40:33 +02:00 |  | 
			
				
					| 
							
							
								 Klaas Freitag | 7ce2a93c63 | Merge remote-tracking branch 'origin/reuse_oc_config' into 1.7 Conflicts:
	src/CMakeLists.txt
	src/mirall/folderman.cpp
	src/mirall/folderman.h
	src/mirall/owncloudtheme.h | 2014-08-29 20:23:07 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | 5d19426930 | Propagator: When the server don't support ranges, reset the counter so the progress is not messed up Issue #2081 | 2014-08-29 19:33:20 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | 1b51a10b19 | Socket API:  be consistant in the VERSION command and add the VERSION at the beginning | 2014-08-29 17:28:36 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schmidt | 38ff7d87c8 | Hide crashreporter config option if not build with crashreporter enabled | 2014-08-29 17:07:31 +02:00 |  | 
			
				
					| 
							
							
								 Markus Goetz | 12e2bac16b | Propagator: Also parse OC-ETag header Client side part of https://github.com/owncloud/core/issues/9005 | 2014-08-29 16:30:58 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | 34a27c748a | Progress: in case of resuming chunks, advance directly at startup by the amount of chunk already done Fixes #2103 | 2014-08-29 16:06:56 +02:00 |  | 
			
				
					| 
							
							
								 Markus Goetz | 7ec0c52439 | Poll URL: Use trimmed() on response | 2014-08-29 13:58:33 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | a73fbccf8c | t4.pl: add a test to test that ignored file are not deleted | 2014-08-28 19:33:52 +02:00 |  | 
			
				
					| 
							
							
								 Klaas Freitag | 7f1d707d23 | ownCloud Theme: Do not have the oCSetupTop custom media, see #1445 | 2014-08-28 18:10:53 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Molkentin | 25c274a0bd | X11: Bring Settings window to front when launched | 2014-08-28 17:25:00 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | 0fb0f2c204 | Selective sync: start a sync when the selective sync settings changes | 2014-08-28 16:27:46 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schmidt | 6abaad1ae8 | Show crash reporter if trying to read the crash-reporter-enabled config crashes | 2014-08-28 16:23:14 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schmidt | 89aec52503 | Add checkbox to general settings to disable the crash reporter | 2014-08-28 16:19:17 +02:00 |  | 
			
				
					| 
							
							
								 Markus Goetz | b6f42a91f4 | OS X: Fix Finder bundle NVTY->OWNC | 2014-08-28 15:45:07 +02:00 |  | 
			
				
					| 
							
							
								 Markus Goetz | 2aef6a2174 | Poll URL: Don't delete from DB in case of 503 | 2014-08-28 13:44:21 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | 79f00c2a2a | Wizard:  adjust alignements | 2014-08-28 13:32:14 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | e5068e7543 | Selective sync:  if one click twice on the button in the wizard, it should keep the blacklist | 2014-08-28 12:25:44 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | 858218ac34 | Wizard:  new layout | 2014-08-28 12:18:19 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schmidt | b8e8d975aa | Add CRASHREPORTER_SUBMIT_URL to OWNCLOUD.cmake | 2014-08-28 12:08:07 +02:00 |  | 
			
				
					| 
							
							
								 Markus Goetz | 6e0330ff65 | SyncEngine: Error out if we don't have a sync dir | 2014-08-28 11:47:40 +02:00 |  | 
			
				
					| 
							
							
								 Markus Goetz | 3aa7178382 | PollJob: Increase timeout | 2014-08-28 11:27:08 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schmidt | 439bf7641e | Use include path for libcrashreporter-qt instead of lengthy relative include | 2014-08-28 11:11:42 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schmidt | 34042028b3 | Add CRASHREPORTER_SUBMIT_URL define and default it to some placeholder owncloud url | 2014-08-28 11:05:46 +02:00 |  | 
			
				
					| 
							
							
								 Markus Goetz | 2f34b046d0 | Overlay Icons: Improve OS X version, improve general feedback Now the update phase of the syncing algorithm pushes stuff the notification socket too. | 2014-08-27 19:15:43 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | a73316306d | Selective sync: new design in the wizard | 2014-08-27 19:03:11 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Molkentin | cf12a56b4c | Merge remote-tracking branch 'origin/1.7' Conflicts:
	src/gui/socketapi.cpp | 2014-08-27 18:22:07 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | 928652e4cf | Selective sync: rename the button 'choose what to sync' | 2014-08-27 17:31:57 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | 7950b49cb1 | Selective sync dialog: fix fetching sub directory when the folder is not the root folder | 2014-08-27 17:19:36 +02:00 |  | 
			
				
					| 
							
							
								 Klaas Freitag | cc6aa66ab0 | JournalDB: Do prepare the queries even if the db update failed. Also, add more logging in case SQL errors happen while db structure
update. | 2014-08-27 14:01:33 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | ea381392a7 | SocketAPI: fix the BROADCAST message | 2014-08-27 13:55:06 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | bb7f63dcfd | AccountSettings: be less verbose in the status string | 2014-08-27 13:51:14 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | 253d65727b | Socket api:  Add a VERSION command | 2014-08-27 13:51:14 +02:00 |  | 
			
				
					| 
							
							
								 Klaas Freitag | d2e1489fe7 | Propagator: Set the chunk size to 20MB as requested by Matt. | 2014-08-27 10:35:58 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schmidt | 2b4849a2fa | Add crash reporter using libcrashreporter-qt | 2014-08-26 18:15:13 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | 2356601bb3 | folder: Make sure not to pol the server if the account is disconnected Fixes #2108 | 2014-08-26 16:23:19 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | 9b88c7d3c1 | SSLButton: fix memleak | 2014-08-26 15:59:19 +02:00 |  | 
			
				
					| 
							
							
								 Olivier Goffart | 302499b483 | uploading: make sure to cast to uint64 to avoid integer overflow | 2014-08-26 15:58:55 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schmidt | 17e16f5e79 | Add "Crash" entry to systray if started with --debug | 2014-08-26 15:46:24 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schmidt | b176ff6626 | Don't use CMAKE_INSTALL_PREFIX for RPATH | 2014-08-26 15:19:46 +02:00 |  |