Commit graph

4104 commits

Author SHA1 Message Date
Hylke Bons
44fad5e828 controller: Move avatar logic to its own class 2013-06-30 16:54:04 +01:00
Hylke Bons
9d893d4fba controller: Move cloned folder deletion logic to fetcher 2013-06-30 15:48:35 +01:00
Hylke Bons
5072edf2d1 repo git: Simplify log parsing 2013-06-29 18:34:36 +01:00
Hylke Bons
6baf5a19b6 Compress image files 2013-06-29 11:50:11 +01:00
Hylke Bons
4b599dcce4 repo git: check for errors moving files when rebasing. add more debug info 2013-06-29 11:48:36 +01:00
Hylke Bons
576909ac1a fetcher: Add exclude rule for QuarkXPress temporary files. #1321 2013-06-28 21:18:03 +01:00
Hylke Bons
3844e66ecb Update News.txt 2013-06-26 10:27:26 +01:00
Hylke Bons
9a6f99c378 Fix coding style 2013-06-26 10:11:03 +01:00
Hylke Bons
e4a5d143b2 mac setup: Update comment for version check 2013-06-26 09:58:39 +01:00
Hylke Bons
fdbb7e97cb mac setup: determine hi-res display only in Lion or later 2013-06-26 09:56:34 +01:00
Hylke Bons
99755e9aff Merge pull request #1317 from jv42/master
Fixed Windows compilation.
2013-06-25 07:15:42 -07:00
Julien Villers
23a7abd323 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
c322d70a2e windows: Fixed compilation.
SparkleLib.SparkleGit => SparkleLib.Git
Added project reference.
2013-06-25 16:04:29 +02:00
Jo Shields
a47711ff14 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
e1bba3b68e Merge branch 'tortoise'
Conflicts:
	SparkleLib/Git/SparkleGit.cs
	SparkleLib/SparkleFetcherSSH.cs
	SparkleShare/SparkleControllerBase.cs
2013-06-23 10:03:09 +01:00
Hylke Bons
7c81fa1260 windows: Fix GIT_SSH path to ssh.exe 2013-06-23 09:58:55 +01:00
Hylke Bons
c69806f19e fetcher git: Catch stream errors when process has been killed by user. Fixes #1187 2013-06-20 21:44:34 +01:00
Hylke Bons
ceb2f745f6 windows: use forwards slashes whem importing key on domain account. #1263 2013-06-17 16:12:50 +01:00
Hylke Bons
d32e257589 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)
a5035388a0 Fix for compilation issue on GNU/Linux with misspelled SparkleLogger object 2013-06-16 23:38:17 +02:00
Hylke Bons
d66159938d Bump version and update news 2013-06-13 23:32:29 +01:00
Hylke Bons
7921e74e24 invites mac: Start SparkleShare after opening invites 2013-06-13 18:36:31 +01:00
Hylke Bons
c4bbce425d Fix build 2013-06-13 18:17:04 +01:00
Hylke Bons
af534ac8e0 Fix build 2013-06-13 18:11:10 +01:00
Hylke Bons
fc9c944891 Remove accidentally added file from tree 2013-06-13 18:00:14 +01:00
Hylke Bons
7dbd6c6378 invites: make temporary invite files invisible 2013-06-13 17:58:18 +01:00
Hylke Bons
795eaf463d repo: Fix a few race conditions updating the status icon 2013-06-13 17:51:38 +01:00
Hylke Bons
d645eb412c + ‘.sparkleshare’ 2013-06-13 17:25:08 +01:00
Hylke Bons
318335e97d Remove accidentally added files from tree 2013-06-13 16:57:20 +01:00
Hylke Bons
ad92394785 Merge pull request #1308 from directhex/master
Add missing / to sed in "sparkleshare open"
2013-06-13 07:29:54 -07:00
Jo Shields
1cdfc51a90 Add missing / from sed in "sparkleshare open" 2013-06-13 15:23:26 +01:00
Hylke Bons
653cb522d9 Merge pull request #1307 from directhex/master
Add missing quotes to launch script
2013-06-13 06:15:03 -07:00
Jo Shields
91d0cebed9 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
d69e9a6468 mac: Reposition the Events windows nicer when opening 2013-06-10 16:06:08 +01:00
Hylke Bons
b721aab0f1 setup: Fix path being saved where it shouldn't after closing window 2013-06-10 15:26:13 +01:00
Hylke Bons
647ce92c07 + ‘.sparkleshare’
+ ‘SparkleShare.txt’
2013-06-02 18:27:04 +01:00
Hylke Bons
8962e79b7a windows: Don't crash and show a warning when FIPS is enabled. Closes #1298 2013-06-01 20:54:01 +01:00
Hylke Bons
6e3748c44d build: Adjust version bump script to include Mac Info.plist. Closes #1297 2013-06-01 16:37:32 +01:00
Hylke Bons
4d1b603bf6 linux bubbles: Add debug info, don't fail silently. #1299 2013-06-01 11:12:44 +01:00
Hylke Bons
893be4998e 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
b6d9312bc8 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
b3f3813c4b Fix broken URLs from calling applications 2013-05-30 11:11:56 +02:00
Hylke Bons
0981e401a4 Merge pull request #1294 from mortenn/master
Hide console window when clicking invite links
2013-05-30 01:31:10 -07:00
Morten Nilsen
32cda3b20f Do not show console window when clicking links 2013-05-30 07:40:42 +02:00
Hylke Bons
f1324a75cc repo: Fix a possible race condition that can cause a double upload 2013-05-29 12:09:39 +01:00
Hylke Bons
f73673a006 build: Remove System.Web 2013-05-29 10:13:26 +01:00
Hylke Bons
ab61084959 Merge pull request #1292 from mortenn/master
Fix for issue #1285
2013-05-29 02:07:25 -07:00
Morten Nilsen
788645589c Fix for issue #1285 2013-05-29 10:38:56 +02:00
Hylke Bons
4c607b496a setup: Mention Client ID more explicitly on error page. Closes #1227 2013-05-28 00:01:18 +01:00
Hylke Bons
386ccd9ada setup: Reset plugin selection after closing window 2013-05-27 23:54:02 +01:00