Commit graph

843 commits

Author SHA1 Message Date
Hylke Bons 15bd9d77a4 git: return to setting author on local repository, specifying in the command causes issues. Fixes #678 2012-06-24 19:14:52 +01:00
Hylke Bons 4a6a0c5dbb lib: add folder name to debug info for each git call. Closes #796 2012-06-21 17:58:07 +01:00
Hylke Bons 4e0ee26e35 linux: fix build 2012-06-19 15:59:54 +01:00
Hylke Bons 6569ae6200 lib git: treat merge commits like any other commit 2012-06-19 10:54:46 +01:00
Hylke Bons f28fd55fdc Remove some unused code 2012-06-19 10:43:30 +01:00
Hylke Bons c17ad92a73 setup: show raw (git) error message on failed add 2012-06-17 22:57:15 +01:00
Hylke Bons 10c6e2f5b3 make 2012-06-17 21:56:27 +01:00
Hylke Bons 3cd210d44c mac eventlog: make window resizable 2012-06-17 00:24:30 +01:00
Hylke Bons a7ab23da72 Simplify command line argument parsing 2012-06-15 13:08:13 +01:00
Hylke Bons febc13d4f4 Allow apostrophes and single quotes in folder names, but don't allow double quotes. Fixes #787 2012-06-14 13:54:59 +01:00
Hylke Bons 1720984e5a Refactor adding of (empty) repos. Fixes #773 2012-06-10 23:56:39 +01:00
Hylke Bons 92fdcbec17 repo: more cleanup 2012-06-10 11:57:31 +01:00
Hylke Bons e0ee50d392 repo: Simplify watch toggling mechanism 2012-06-10 11:03:03 +01:00
Hylke Bons 0a01b90a32 repo: Simplify local change detection code using a single thread 2012-06-10 01:16:28 +01:00
Hylke Bons a51e30e486 Tweak some debug output 2012-06-09 16:27:34 +01:00
Carlos Martín Nieto 896abe97da SparkleLib: Use rev-parse HEAD to determine latest commit
While `git log -1 --format=%H` does show the same data, it needs to
start up the revision walking machinery just to show the latest
commit's hash. `git rev-parse HEAD` tells us this commit's hash
without doing all the extra work.
2012-06-07 15:42:59 +02:00
Hylke Bons e42344256f listener: set port 80 as the default 2012-05-28 00:51:37 +01:00
Hylke Bons 3a30a62654 Only fetch gravatars once, fix some UI blocking 2012-05-28 00:14:45 +01:00
Hylke Bons b8743236cd repo git: only squash commits by the same person 2012-05-28 00:14:00 +01:00
Hylke Bons 5388621033 Remove unneeded reference 2012-05-27 19:25:14 +01:00
Hylke Bons 0280f7481e eventlog: sort changes by timestamp, not type 2012-05-27 19:24:12 +01:00
Hylke Bons 47b7c4fcd7 setup: Fix page logic 2012-05-20 17:16:14 +01:00
Hylke Bons 9068b02ee7 listener tcp: Catch more exceptions and increase poll/ping interval. Fixes #734 2012-05-20 14:28:14 +01:00
Hylke Bons 900130bf8b repo git: catch exceptions creating .empty files. Fixes #733 2012-05-20 12:51:09 +01:00
Hylke Bons 106dc4ece3 repo: fix whitespace 2012-05-19 16:17:09 +01:00
Hylke Bons 6dd657a086 repo: Fix edge case where ID may be empty 2012-05-19 16:15:20 +01:00
Hylke Bons ca0ffda638 Fix crashes with unavailable notification service 2012-05-14 23:35:59 +01:00
Hylke Bons b236806a83 fetcher base: be more specific about ignoring OS X's Icon files 2012-05-14 21:34:16 +01:00
Hylke Bons 2302b31f6f Cache changesets in the backend 2012-04-29 15:19:36 +01:00
Hylke Bons 5ad0168717 mac: Remove unused graphic from project 2012-04-28 17:19:21 +01:00
Hylke Bons aa5092f672 Merge branch 'http' 2012-04-28 09:51:41 +01:00
Hylke Bons 31efab0974 Remove some debug rules used for crypto feature 2012-04-26 18:48:18 +01:00
Hylke Bons 2f6431f193 fetcher git: override global git crlf settings. prevents some sync loops 2012-04-26 18:32:57 +01:00
Hylke Bons ede2f02274 Add SparkleShare.txt and .sparkleshare in a single commit 2012-04-26 16:02:59 +02:00
Hylke Bons 0c7cc6d4e2 Implement encryption using OpenSSL's AES + Mac UI 2012-04-26 16:02:58 +02:00
Hylke Bons a85954d15e fetcher git: accept HTTP(S) addresses 2012-04-26 14:58:05 +02:00
Luke Fitzgerald 802bf0b615 Allow paths containing spaces 2012-04-26 01:34:28 +01:00
Hylke Bons 34dfbdc16e windows lib: Put back reference for #705 2012-04-19 14:59:04 +02:00
Hylke Bons 53cb859cd8 windows lib: always use latest .NET version. Fixes #705 2012-04-19 14:20:01 +02:00
Hylke Bons 7340558a78 config: return HomePath enum directly. #705 2012-04-18 16:33:48 +02:00
Hylke Bons bd8c9a3dbb fetcher git: also dispose git process on dispose 2012-04-18 11:52:45 +02:00
Hylke Bons 9ec482b3d3 repo git: Don't follow symlinks when preparing the tree. Fixes #701 2012-04-17 19:00:05 +02:00
Hylke Bons 1981705100 git: write error outputs to the debug.log for easier debugging 2012-04-17 11:05:51 +02:00
Hylke Bons 54bc9cbe6c repo git: quote urls to allow push/pull with urls that contain spaces. Fixes #703 2012-04-16 23:26:33 +02:00
Hylke Bons d24cec58c2 fetcher: Add exclude rule for *.autosave files 2012-04-16 23:26:33 +02:00
Hylke Bons 3255f1b818 config: allow to specify a custom path for each folder. Closes #680 2012-04-15 19:03:36 +02:00
Hylke Bons a3f67b39e1 config: remove old and unused methods 2012-04-15 16:58:39 +02:00
Hylke Bons bf5f542a11 fetcher: more friendly message about the accepted host key 2012-04-15 12:35:17 +02:00
Hylke Bons 6acf096735 repo git: on conflicts, put timestamp before file extension. Fixes #699 2012-04-15 11:50:03 +02:00
Hylke Bons 7017bbcf01 Verify known host fingerprints and warn about new ones 2012-04-13 00:44:31 +02:00
Hylke Bons 7aded56777 fetcher: Fix some url creations errors 2012-04-11 23:10:02 +02:00
Hylke Bons ca2970eb6a fetcher: don't add duplicates to known_hosts 2012-04-11 21:31:18 +02:00
Hylke Bons 3612942649 Manually add host key to know_hosts, don't mess with the user's SSH config. Closes #497 2012-04-11 20:07:34 +02:00
Hylke Bons 14b96299a2 fetcher: Close on cancel too 2012-04-11 13:04:42 +02:00
Hylke Bons 0a2f5929b6 fetcher: Add debug info for #692 2012-04-11 12:51:53 +02:00
Hylke Bons 9c64c3fb50 config: Remove commented out code 2012-04-11 12:03:34 +02:00
Hylke Bons 26ef2173bb repo git: add debug info for #677 2012-04-10 23:19:33 +02:00
Hylke Bons 1f934e2fd1 windows: add missing source file to fix build 2012-04-05 13:57:50 +01:00
Hylke Bons 513febcf1a repo: basic support for quota detection 2012-04-04 23:45:20 +01:00
Hylke Bons bad4bf9a46 Add option to add projects without full history (git: --depth=1) 2012-03-29 01:44:26 +01:00
Hylke Bons 6d1b6adbf8 repo git: don't hang on large rebase outputs. Should fix #663 2012-03-28 23:11:41 +01:00
Hylke Bons 774db39599 Use .sparkleshare file for the repo ID, instad of the first commit hash 2012-03-26 00:41:52 +01:00
Hylke Bons 50dbcac22a fetcher: add exclude rule for LibreOffice lock files 2012-03-22 21:10:43 +00:00
Tijl Vercaemer 7952b006e5 Added System.Xml reference to SparkleLib 2012-03-21 12:34:48 +01:00
Hylke Bons d5fd131a3a repo git: ignore global gitconfig options when parsing the git log 2012-03-20 17:26:47 +00:00
Hylke Bons 4e4a2fa207 repo git: ignore global gitconfig options when parsing the git log 2012-03-20 17:20:28 +00:00
Hylke Bons 023b87e875 windows: set version manually 2012-03-18 20:16:52 +00:00
Travis Glenn Hansen 82ebe7e497 fixing HomePath on linux 2012-03-17 17:15:35 -06:00
Hylke Bons 6b8c7fc456 listener tcp: catch some potential exceptions 2012-03-17 19:16:53 +00:00
Hylke Bons 059c87b344 windows setup: Reverse button order 2012-03-17 01:44:27 +00:00
Hylke Bons 49943910f2 mac: Fix build 2012-03-16 18:42:13 +00:00
Hylke Bons 7afdaabc68 repo: Fix false 'Not everything is synced' messages after succesful conflict resolution 2012-03-16 01:53:23 +00:00
Hylke Bons ae61d47be8 remove some TODOs 2012-03-15 23:54:18 +00:00
Hylke Bons d4985ad4c4 windows: Add migration code to use ~/SparkleShare instead of ~/My Documents/SparkleShare 2012-03-15 03:56:10 +00:00
Hylke Bons 15ff139bf5 setup controller: refactor some order logic. Fixes #627 #630 2012-03-14 03:26:42 +00:00
Hylke Bons 2f350f5905 listener tcp: don't ping anymore when we've disconnected but haven't noticed. Fixes #629 2012-03-13 18:07:03 +00:00
Hylke Bons f6698520c6 repo git: add catch block to PrepareDirectories method 2012-03-12 19:56:06 +00:00
Hylke Bons e895e8cd61 windows: don't care about the commit hash in the version number 2012-03-11 23:44:40 +00:00
Hylke Bons 69c1697123 window: Move to .NET 4.0 2012-03-11 13:17:53 +00:00
Hylke Bons 75d7244707 remove SparkleNote class 2012-03-11 02:54:52 +00:00
Hylke Bons 30b1b4a1bf Remove the notes feature 2012-03-10 20:51:37 +00:00
Hylke Bons ae907e54f4 window setup: implement warning about global gitignore 2012-03-09 04:04:16 +00:00
Hylke Bons 5080e036ee Fix some instances of 'could not load backend' 2012-03-08 23:27:49 +00:00
Hylke Bons b540d331aa windows: some small fixes 2012-03-08 14:55:44 +00:00
Hylke Bons eec7276a59 Replace tabs with spaces in project 2012-03-08 03:35:24 +00:00
Hylke Bons 8a798d675d xplicitly hide supposed to be hidden files. Closes #605 2012-03-08 03:34:45 +00:00
Hylke Bons cc0072b341 windows: fix some status icon issue 2012-03-08 02:55:30 +00:00
Hylke Bons b1493c74fb save work on windows 2012-03-06 01:18:45 +00:00
Hylke Bons e2d984daa9 windows: remove sparkleabout resource files 2012-03-03 16:53:44 +00:00
Hylke Bons e147c62dcc windows: clean up statusicon somewhat 2012-03-03 00:43:29 +00:00
serras 35c167722f Adapt Windows build to a separate Git DLL. 2012-03-02 22:05:05 +01:00
Hylke Bons d40b387004 setup: Create a reusable plugin for each succesfully used host. Closes #547 2012-03-01 23:57:12 +00:00
Hylke Bons 57ade79173 Fix progress delay when there was an error 2012-03-01 17:48:05 +00:00
Hylke Bons 2eaefb452c sparklelib: use a nice SparkleLib.Git namespace 2012-03-01 17:02:52 +00:00
Hylke Bons 561bd34ee6 Merge branch 'backend-dlls' of https://github.com/shish/SparkleShare into shish 2012-03-01 16:34:45 +00:00
serras a4426e0049 Add default version when compiling without Git installed 2012-03-01 14:55:17 +00:00
Shish f0f00b97de wibble automake to build the extra backend 2012-02-28 14:34:23 +00:00
Shish 3aa614565c get the backend to load the shared library 2012-02-28 13:34:15 +00:00
Shish 390f31e97d don't compile backend into sparklelib 2012-02-28 13:30:09 +00:00
Hylke Bons 32a696e696 Merge branch 'gettext-cs' of https://github.com/serras/SparkleShare into windows 2012-02-27 16:34:58 +00:00
serras c8d1fa3583 - Move Windows libraries to special lib folder
- Change references to new positions
2012-02-27 13:21:13 +01:00
serras 927098b846 - Add new project files
- Chnage Windows views to keep them in sync with controllers
2012-02-27 12:55:16 +01:00
serras ab6765868d Merge branch 'master' into gettext-cs
Conflicts:
	SparkleLib/SparkleListenerTcp.cs
2012-02-27 10:04:28 +01:00
Hylke Bons 9190988597 fetcher git: don't simulate progress when clone command failed 2012-02-26 15:58:09 +00:00
Hylke Bons 91d62ac7e7 Allow invites and plugins to set a custom <announcements_url>. Closes #562 2012-02-24 18:50:05 +01:00
Hylke Bons fad54067ba Point to the right location for the avatars on Linux 2012-02-23 01:30:28 +01:00
Hylke Bons 70d33e190a Fix Linux build 2012-02-19 21:33:25 +01:00
Hylke Bons 910a05ae0b fetcher: always finish the progress reporting animation smoothly to 100% 2012-02-18 23:16:25 +01:00
Hylke Bons c1d54929a4 invites: upload the user's pubkey on invite accept 2012-02-17 21:26:13 +01:00
Hylke Bons 85d33dd135 fetcher git: add FIXME 2012-02-17 02:48:41 +01:00
Hylke Bons 419ad68a8d Merge branch 'invites' 2012-02-17 00:52:24 +01:00
Hylke Bons ef3f15ebcf repo git: adjust commit message for notes 2012-02-16 22:43:41 +01:00
Hylke Bons 7080a115e6 repo: don't recurse into first .git folder 2012-02-14 20:34:03 +01:00
Hylke Bons 87111a8606 Refactor the invite system, warn if cloning's taking place already 2012-02-12 22:25:20 +01:00
serras dff0b80ab8 Update projects to use new files 2012-02-12 16:51:28 +01:00
serras 8c26969335 Merge branch 'master' into gettext-cs
Conflicts:
	SparkleLib/Git/SparkleFetcherGit.cs
2012-02-12 16:24:12 +01:00
Hylke Bons 301fa1a421 listener: rename some methods 2012-02-11 20:23:38 +01:00
Hylke Bons 93f9b7f777 event log: remove '.empty' files from rename entries of folders 2012-02-11 14:29:23 +01:00
Hylke Bons 39b4a8e335 listener tcp: fix some small issues 2012-02-10 14:26:33 +01:00
Hylke Bons 34a754f55d listener tcp: Improve reconnect logic to work in after system sleeps and handle more errors 2012-02-09 23:43:47 +01:00
Hylke Bons c3a08768aa repo: Fix compile error. Closes #571 2012-02-09 12:54:23 +01:00
Hylke Bons 06f70c5f2e More cleanup of SparkleLib API 2012-02-09 02:46:25 +01:00
Hylke Bons a4678941f4 Clean up SparkleLib API 2012-02-08 20:42:29 +01:00
Hylke Bons 54e1210909 Remove outdated help/ and man/ 2012-02-08 13:30:46 +01:00
Hylke Bons f5c433f327 Merge branch 'disconnect'. Fixes #508
Conflicts:
	SparkleLib/SparkleListenerBase.cs
	SparkleLib/SparkleListenerTcp.cs
2012-02-08 02:24:02 +01:00
Hylke Bons 383d02aacf listener: detect when system has woken up from sleep. disconnect when that happens 2012-02-08 02:17:34 +01:00
Hylke Bons 6a19f3bb35 Fix ping on timeout. Fixes broken reconnect 2012-02-08 01:44:56 +01:00
Hylke Bons 40127b849a repo: change CheckForRemoteChanges method to HasRemoteChanges property 2012-02-06 15:02:41 +01:00
Hylke Bons e8b3ea2892 repo: set stricter access rights for members 2012-02-06 14:58:43 +01:00
Hylke Bons edacb8ca5d Remove SparkleBackend crap 2012-02-06 14:43:31 +01:00
Hylke Bons aa9b67ffa5 Clean up and remove unneeded references 2012-02-06 14:11:08 +01:00
Hylke Bons bdea5f5c25 remove unneeded file SparkleOptions.cs 2012-02-06 13:48:16 +01:00
Hylke Bons b09c66af65 listener: move classes to separate files 2012-02-06 13:45:20 +01:00
Hylke Bons a33a75939a listener factory: allow setting of a global notification service for all the folders 2012-02-06 13:33:00 +01:00
Hylke Bons 84d468652b listener: update comments 2012-02-06 12:54:04 +01:00
Hylke Bons 5784e2c37f listener: add some comments and cleanups 2012-02-05 23:05:47 +01:00
Hylke Bons f46abaa6f4 tcp listener: remove some unneeded references 2012-02-05 23:00:28 +01:00
Hylke Bons 795910223f Add some debug output 2012-02-05 22:28:06 +01:00
serras d76a7b524a Solved issues when compiling in Windows latest version
Change executable output to Windows so no command line is shown
Remove version from SparkleShare setup name
2012-02-05 19:50:38 +01:00
serras 22d40fd3ea Merge branch 'master' into gettext-cs
Conflicts:
	SparkleLib/Git/SparkleRepoGit.cs
2012-02-05 18:54:32 +01:00
Hylke Bons e750f2e7b8 windows: don't show terminal window when running commands 2012-02-05 12:05:47 +01:00
Hylke Bons 6ec2caa507 listener: fix potential endless loop 2012-02-01 22:17:48 +00:00
Hylke Bons 8c0d4e852d listener: Use ping mechanism through te socked, instead of an external one 2012-02-01 22:04:58 +00:00
Hylke Bons f539810677 listener: Rework disconnect algorithm 2012-02-01 16:28:57 +00:00
Hylke Bons 578d1147aa listener: more code cleanup 2012-01-31 23:27:13 +00:00
Hylke Bons 8e886d5c29 listener: more code cleanup 2012-01-31 23:23:52 +00:00
Hylke Bons 747eac768f listener: more code cleanup 2012-01-31 23:08:23 +00:00
Hylke Bons 62e53ca4bd listener: code cleanup 2012-01-31 22:39:09 +00:00
Hylke Bons 8af28f3b9f fetcher: move exclude rules to base class. Closes #564 2012-01-31 21:30:23 +00:00
Hylke Bons 2fdad29e0e controller: fix repo loading 2012-01-29 20:33:12 +00:00