Commit graph

3902 commits

Author SHA1 Message Date
Hylke Bons 8cf594039f repo git: Simplify log parsing 2013-06-29 18:34:36 +01:00
Hylke Bons 7a54657ee7 Compress image files 2013-06-29 11:50:11 +01:00
Hylke Bons 007f26227c repo git: check for errors moving files when rebasing. add more debug info 2013-06-29 11:48:36 +01:00
Hylke Bons 45ee5cc8f3 fetcher: Add exclude rule for QuarkXPress temporary files. #1321 2013-06-28 21:18:03 +01:00
Hylke Bons 544316f587 Update News.txt 2013-06-26 10:27:26 +01:00
Hylke Bons f858572ee1 Fix coding style 2013-06-26 10:11:03 +01:00
Hylke Bons e1b24b7ee2 mac setup: Update comment for version check 2013-06-26 09:58:39 +01:00
Hylke Bons 6741229b9e mac setup: determine hi-res display only in Lion or later 2013-06-26 09:56:34 +01:00
Hylke Bons 3e5f97d7c6 Merge pull request #1317 from jv42/master
Fixed Windows compilation.
2013-06-25 07:15:42 -07:00
Julien Villers 8b87d48f6e Removed pretty quotes that get rendered as ? in notification bubbles.
Quick fix for the 1316 issue.
2013-06-25 16:11:59 +02:00
Julien Villers ac656d90e6 windows: Fixed compilation.
SparkleLib.SparkleGit => SparkleLib.Git
Added project reference.
2013-06-25 16:04:29 +02:00
Jo Shields 0bb6e13d12 Add support for startup scanning of invites.
This commit makes SparkleShare check its config directory for
invite XML files on startup, rather than only when the Filesystem
watcher is alerted to a new file being created.
2013-06-24 15:06:21 +01:00
Hylke Bons fd163a0c93 Merge branch 'tortoise'
Conflicts:
	SparkleLib/Git/SparkleGit.cs
	SparkleLib/SparkleFetcherSSH.cs
	SparkleShare/SparkleControllerBase.cs
2013-06-23 10:03:09 +01:00
Hylke Bons ea34e96806 windows: Fix GIT_SSH path to ssh.exe 2013-06-23 09:58:55 +01:00
Hylke Bons 711811f13d fetcher git: Catch stream errors when process has been killed by user. Fixes #1187 2013-06-20 21:44:34 +01:00
Hylke Bons 064fe7f00d windows: use forwards slashes whem importing key on domain account. #1263 2013-06-17 16:12:50 +01:00
Hylke Bons b8703f587d Merge pull request #1310 from melchips/master
Compilation issue on Gnu/Linux (misspelled SparkleLogger object call)
2013-06-16 15:09:36 -07:00
Francois Truphemus (melchips) ef7489e67d Fix for compilation issue on GNU/Linux with misspelled SparkleLogger object 2013-06-16 23:38:17 +02:00
Hylke Bons ff06b617a4 Bump version and update news 2013-06-13 23:32:29 +01:00
Hylke Bons a636561bfc invites mac: Start SparkleShare after opening invites 2013-06-13 18:36:31 +01:00
Hylke Bons b74273f8c0 Fix build 2013-06-13 18:17:04 +01:00
Hylke Bons 3e8b5ed802 Fix build 2013-06-13 18:11:10 +01:00
Hylke Bons 69b3913565 Remove accidentally added file from tree 2013-06-13 18:00:14 +01:00
Hylke Bons 11f80df99f invites: make temporary invite files invisible 2013-06-13 17:58:18 +01:00
Hylke Bons 714ac3ea83 repo: Fix a few race conditions updating the status icon 2013-06-13 17:51:38 +01:00
Hylke Bons 69c6b04ecf + ‘.sparkleshare’ 2013-06-13 17:25:08 +01:00
Hylke Bons d21f0a2caf Remove accidentally added files from tree 2013-06-13 16:57:20 +01:00
Hylke Bons 6f88560c97 Merge pull request #1308 from directhex/master
Add missing / to sed in "sparkleshare open"
2013-06-13 07:29:54 -07:00
Jo Shields 59d5a55635 Add missing / from sed in "sparkleshare open" 2013-06-13 15:23:26 +01:00
Hylke Bons fdc397e3c6 Merge pull request #1307 from directhex/master
Add missing quotes to launch script
2013-06-13 06:15:03 -07:00
Jo Shields d674ccbcb7 Add quoting to invocation of sed in "sparkleshare open" to avoid
sed: -e expression #1, char 18: unknown option to `s'
2013-06-13 14:07:51 +01:00
Hylke Bons c398e3d533 mac: Reposition the Events windows nicer when opening 2013-06-10 16:06:08 +01:00
Hylke Bons 72a304436a setup: Fix path being saved where it shouldn't after closing window 2013-06-10 15:26:13 +01:00
Hylke Bons 077dc08bb5 + ‘.sparkleshare’
+ ‘SparkleShare.txt’
2013-06-02 18:27:04 +01:00
Hylke Bons 65aa964e76 windows: Don't crash and show a warning when FIPS is enabled. Closes #1298 2013-06-01 20:54:01 +01:00
Hylke Bons a95cd59f53 build: Adjust version bump script to include Mac Info.plist. Closes #1297 2013-06-01 16:37:32 +01:00
Hylke Bons 4086b951f2 linux bubbles: Add debug info, don't fail silently. #1299 2013-06-01 11:12:44 +01:00
Hylke Bons 02e6567fdc repo: Fix race condition causing the statusicon to report an error where there isn't one 2013-05-30 13:05:50 +01:00
Hylke Bons 10900d1d5b Merge pull request #1296 from mortenn/master
Fix invite url breakage in third party applications
2013-05-30 02:27:28 -07:00
Morten Nilsen ecf7066040 Fix broken URLs from calling applications 2013-05-30 11:11:56 +02:00
Hylke Bons 98a90170d8 Merge pull request #1294 from mortenn/master
Hide console window when clicking invite links
2013-05-30 01:31:10 -07:00
Morten Nilsen 92b96c2318 Do not show console window when clicking links 2013-05-30 07:40:42 +02:00
Hylke Bons 8703b82fbe repo: Fix a possible race condition that can cause a double upload 2013-05-29 12:09:39 +01:00
Hylke Bons 3fc8251a9b build: Remove System.Web 2013-05-29 10:13:26 +01:00
Hylke Bons b1c357cbd6 Merge pull request #1292 from mortenn/master
Fix for issue #1285
2013-05-29 02:07:25 -07:00
Morten Nilsen 90a7107152 Fix for issue #1285 2013-05-29 10:38:56 +02:00
Hylke Bons f82a7b9bfc setup: Mention Client ID more explicitly on error page. Closes #1227 2013-05-28 00:01:18 +01:00
Hylke Bons 384ea84f62 setup: Reset plugin selection after closing window 2013-05-27 23:54:02 +01:00
Hylke Bons d03b129476 setup controller: Remove old code 2013-05-27 23:04:30 +01:00
Hylke Bons 226bfeab5d about: Fix version check 2013-05-27 18:54:42 +01:00