Hylke Bons
bff9eb0e5c
hook up linux event log to new controller
2011-07-23 16:57:46 +01:00
Hylke Bons
83ef70e069
add some comments
2011-07-23 15:27:35 +01:00
Hylke Bons
6de6a8b3c3
Merge pull request #296 from ways/master
...
Rewritten autocomplete
2011-07-23 06:06:22 -07:00
Lars Falk-Petersen
29d1dcfdb5
FolderPaths
2011-07-22 22:27:16 +02:00
wimh
0862fa2a72
Merge remote-tracking branch 'upstream/master' into windows
2011-07-22 20:27:59 +02:00
wimh
617ea687ab
fix bug in CheckForChanges
2011-07-22 20:09:18 +02:00
Hylke Bons
c7c035e11f
Squash events per day+user+folder
2011-07-22 02:12:09 +01:00
wimh
48ed8dcd88
revert to vs2008
2011-07-21 18:20:20 +02:00
wimh
0b605aca44
Merge remote-tracking branch 'upstream/master' into windows
2011-07-21 11:26:09 +02:00
Hylke Bons
683dc5a635
Fix notifications
...
The check wether it was a new commit always returned false
2011-07-21 00:49:16 +01:00
Hylke Bons
bc79205308
Fix bug where large amounts of files aren't being added/commited/pushed (process class hung on the large outputs)
2011-07-21 00:02:21 +01:00
wimh
8959c060ee
convert to vs2010, fix about dialog background
2011-07-19 23:54:07 +02:00
wimh
4150ed7845
Merge remote-tracking branch 'upstream/master' into windows
...
Conflicts:
.gitignore
SparkleShare/SparkleIntro.cs
SparkleShare/SparkleShare.cs
SparkleShare/SparkleUI.cs
2011-07-19 23:20:21 +02:00
Hylke Bons
d199e5135a
ignore note adds in the log
2011-07-17 01:37:36 +01:00
Hylke Bons
8cef98a010
fix notes
2011-07-17 01:22:39 +01:00
Hylke Bons
03d547e0c7
notes: stop using git-notes, use files instead
2011-07-16 23:30:46 +01:00
Hylke Bons
69fd26b3bc
Fix css and add Show All N feature
2011-07-16 19:41:37 +01:00
Hylke Bons
94880e5552
Update project and make files
2011-07-08 22:53:03 +01:00
Hylke
c3d2c87e18
intro config: we want to prefill a host only once
2011-07-02 17:20:54 +01:00
Hylke
290b8917de
UI is not allowed to access config. go via controller and talk about hosts
2011-07-02 17:10:57 +01:00
Hylke
cb4a1e1a5b
config: get urls in a simpler way and clean up
2011-07-02 17:05:05 +01:00
Hylke
245b7d57b0
Merge https://github.com/ways/SparkleShare into bookmarks
2011-07-02 16:53:01 +01:00
Lars Falk-Petersen
48a692355e
Formatting and removing of comments.
2011-07-02 14:56:42 +02:00
Lars Falk-Petersen
98953bf54f
Formatting and removing of comments.
2011-07-02 14:55:56 +02:00
Lars Falk-Petersen
373c3c876f
Strip ssh:// and git:// from urls.
2011-07-02 14:46:08 +02:00
Lars Falk-Petersen
80db6b691d
Added GetUrls
2011-07-02 13:29:37 +02:00
Lars Falk-Petersen
1dbdadd2ca
Removed PrevServer, PrevFolder
2011-07-02 12:37:04 +02:00
wimh
7bf7059b32
change platform to x86 because gtk# does not support x64
2011-07-02 10:24:33 +02:00
Hylke Bons
ce536774d7
Fix tcp listener (needed newlines at the end of messages)
2011-07-02 02:24:12 +01:00
Hylke Bons
ee3d42d6f3
adjust tcp listener to work with nodejs server (subscribing doesn't work yet)
2011-07-02 02:13:33 +01:00
Lars Falk-Petersen
5e18aad8b0
If options don't exist in config, create them!
2011-07-01 09:58:51 +02:00
Lars Falk-Petersen
e53ecbf90e
Problems with missing options in earlier config.
2011-07-01 02:10:13 +02:00
Lars Falk-Petersen
69edd942f5
Added PrevFolder to config.
2011-07-01 01:43:55 +02:00
lars
a7782d66bf
Added saving of last used server.
2011-06-30 23:31:55 +02:00
Alex Hudson
577c2f4069
Project Evil: allow SparkleShare to take full http(s) URIs without choking.
2011-06-30 12:53:05 +01:00
Alex Hudson
8028736858
Put in XML fragment parsing - listener now basically works over tcp
2011-06-29 23:36:18 +01:00
Alex Hudson
995f39fdb7
Convert JSON commands to TCP server into XML fragments.
2011-06-29 23:36:18 +01:00
Alex Hudson
889eac6aaf
Remove IRC listener code from TCP version
2011-06-29 23:36:18 +01:00
Alex Hudson
6f07272fda
Make tcp listener startup-able
2011-06-29 23:36:18 +01:00
Alex Hudson
a4bb32f607
Fix bpbb on git callout
2011-06-29 22:40:34 +01:00
Hylke Bons
0944efe992
repo git: don't hang on huge command outputs
2011-06-29 20:45:37 +01:00
Hylke Bons
c498347931
repo: add a property that shows the currenly unsynced paths (to hook up with the badger)
2011-06-29 20:28:49 +01:00
wimh
698a057104
fix compile problem on windows x64
2011-06-29 16:28:00 +02:00
Hylke
6af7fdf1e8
Fix nullreference exception when adding new files before starting sparkleshare
2011-06-28 20:54:47 +01:00
Hylke
f4c2a3e951
repo: create watch after initial change set
2011-06-28 20:06:04 +01:00
Hylke
3d8c124e74
repo git: sync up initial commit
2011-06-28 20:03:10 +01:00
Alex Hudson
8160e5efcd
Change 'notification' language to 'announcement'
2011-06-28 20:03:10 +01:00
Alex Hudson
e49992a1da
Make listener type configurable from config file
2011-06-28 20:03:10 +01:00
Alex Hudson
87d0e20678
Simplify some config functions, add a notification server entry
2011-06-28 20:03:10 +01:00
wimh
f0cdc89f46
C:\msysgit\msysgit -> C:\msysgit, see also 7631edc6f9
2011-06-27 18:04:28 +02:00
Hylke Bons
dca0706fc5
remove some TODOs
2011-06-26 02:41:00 +01:00
Hylke Bons
80eadff9e1
Move translations initialization to SparkleUI and add translations to Mac UI
2011-06-26 02:00:53 +01:00
Hylke Bons
741910c8ad
note: don't push notes to read only repos
2011-06-25 22:39:53 +01:00
Hylke
46140fb8d8
fetch notes periodically
2011-08-25 16:02:34 +01:00
Hylke
350cdbad1f
avatars: save to buffer instead of file: less blinking of event log, simpler, so fewer bugs
2011-08-25 15:36:26 +01:00
Hylke
b467b1937b
don't show a notification on new notes
2011-06-24 23:55:23 +01:00
Hylke
5e5d7481af
git fetch all branches
2011-06-24 23:43:11 +01:00
Hylke
907d8e429d
add note fetching line to config
2011-06-24 23:23:41 +01:00
Hylke
02ec2faf93
Merge branch 'master' into notes
...
Conflicts:
SparkleLib/Git/SparkleRepoGit.cs
2011-06-24 19:13:02 +01:00
wimh
d01512b910
fix merge issues
2011-06-23 22:05:09 +02:00
wimh
642fb34389
Merge remote branch 'upstream/master' into merge
2011-06-23 20:39:41 +02:00
wimh
42db1ac7d4
Merge commit '4f59a03a6f395b1db7d6' into merge
2011-06-23 20:38:21 +02:00
Hylke
eaebd1a9b2
Merge branch 'master' of github.com:hbons/SparkleShare
2011-06-23 15:24:08 +01:00
Hylke
1428f486b1
repo: don't show warning statusicon upon initial commit
2011-06-23 13:56:25 +01:00
Hylke Bons
bb7fe1d888
continue implementing notes
2011-06-23 01:44:43 +01:00
Hylke Bons
268d5c8027
save progress on notes
2011-06-23 01:44:43 +01:00
Hylke Bons
17110efe4b
Add each note to its own namespace to avoid conflicts
2011-06-23 01:44:43 +01:00
Hylke Bons
ebc49fe540
fix AddNote, add Note object
2011-06-23 01:44:43 +01:00
Hylke Bons
14aba962e4
make adding a note work
2011-06-23 01:44:43 +01:00
Hylke Bons
ad8c96e2f4
add AddNote method
2011-06-23 01:44:43 +01:00
Hylke Bons
904a7052b2
repo: ignore external watchers when watching is disabled
2011-06-22 16:02:38 +01:00
wimh
7d0c9d6262
windows: locate texttransform.exe
2011-06-18 23:45:30 +02:00
Hylke Bons
1ed6b0e651
Add a TCP based listener
2011-06-18 22:42:34 +01:00
Hylke Bons
41f2241457
Fix timzones in timestamps, again...
2011-06-15 00:34:29 +01:00
Hylke Bons
9cfc42e812
repo: Move watcher to its own subclass
2011-06-14 23:14:03 +01:00
Hylke Bons
5f89e76232
update NEWS and version
2011-06-14 19:08:28 +01:00
Hylke Bons
6315af9b7d
fetcher: create .ssh if it's not there
2011-06-14 14:48:18 +01:00
Hylke Bons
16b73f82d0
repo base: disable watching by using the existing method instead
2011-06-14 14:25:25 +01:00
Hylke Bons
4f59a03a6f
repo base: disable watching when syncing down
2011-06-13 18:57:56 +01:00
Alex Hudson
fe861e5e5e
Merge branch 'master' of https://github.com/hbons/SparkleShare
2011-06-13 13:30:11 +01:00
Alex Hudson
d51ebff650
Attempt to merge the smartirc4net references into single build reference
2011-06-13 13:27:48 +01:00
Hylke Bons
37e20be1b7
repo base: make polling intervals setting a bit more readable
2011-06-12 02:56:01 +01:00
wimh
63dc37cad3
fix portability issue in OnFileActivity
2011-06-12 01:53:38 +01:00
wimh
5d8f5ffa00
fix portability issue in OnFileActivity
2011-06-11 22:35:06 +02:00
wimh
c16623715c
reset to upstream/master, add windows files and fixes
2011-06-11 21:52:41 +02:00
Hylke Bons
410cd2a7c4
repo git: strip quotes from git commit message
2011-06-11 18:51:39 +01:00
Hylke Bons
78e8a7aa41
default disconnected polling interval is 3min
2011-06-11 18:51:39 +01:00
Hylke Bons
01f266c21a
repo git: strip quotes from git commit message
2011-06-10 21:40:13 +01:00
Hylke Bons
711de7b85b
default disconnected polling interval is 3min
2011-06-10 11:08:03 -07:00
Hylke Bons
c2a38157ab
Save work
2011-06-10 00:01:45 +01:00
Hylke Bons
057c96c288
repo: don't poll every 10sec when disconnected
2011-06-09 23:59:56 +01:00
Hylke Bons
a5ac4ab5fa
changeset: Add a Folder property
2011-06-09 21:25:36 +01:00
Hylke Bons
b17e91e132
repo base: poll continously even when connected (but not as frequent)
2011-06-09 21:20:57 +01:00
Hylke Bons
96c54807c5
repo base: add some properties to be used for the manual polling
2011-06-09 18:53:36 +01:00
Travis Glenn Hansen
3073d9d038
removing is_polling completely
2011-06-09 10:21:55 -06:00
Travis Glenn Hansen
0bbc2e67ad
Merge branch 'master' of git://github.com/hbons/SparkleShare into fixes
...
Conflicts:
SparkleLib/SparkleConfig.cs
2011-06-09 10:20:15 -06:00
Hylke Bons
33d8f2ed5b
about: remove references to SparkleLib
2011-06-08 22:37:29 +01:00
Hylke Bons
5eb0d3d707
config: Only trim user name if it isn't null
2011-06-08 21:40:12 +01:00
Travis Glenn Hansen
9fb504b7f9
Merge branch 'master' of git://github.com/hbons/SparkleShare into fixes
2011-06-07 19:39:34 -06:00
Hylke Bons
0a845a336f
Work with repos on host names with a dash in them
2011-06-08 02:04:54 +01:00
Hylke Bons
2a6d7f18f3
config: never let user name be null or empty
2011-06-08 01:30:01 +01:00
Hylke Bons
e5cc414b54
listener irc: Fix race condition joining channel when not connected
2011-06-08 01:30:01 +01:00
Travis Glenn Hansen
724d52a48a
fixing upstream issue 200
2011-06-07 14:39:35 -06:00
Hylke Bons
27b651696b
config: never let username be empty
2011-06-06 21:00:06 +01:00
Hylke Bons
bd80631a1c
listener irc: adjust ping interval and timeout
2011-06-05 23:08:17 +01:00
Hylke Bons
47225ed1d7
Detect the correct .shh path on Windows
2011-06-05 19:59:48 +01:00
Hylke Bons
cf7372a94c
fetcher base: check if thread exists before disposing it
2011-06-05 17:35:22 +01:00
Hylke Bons
7b0a359005
config: get default username depending on platform
2011-06-05 17:22:40 +01:00
Hylke Bons
f6ef625d16
Move OS detection code to the backend
2011-06-05 17:07:33 +01:00
Hylke Bons
307a3d964e
Don't check for root user on non-unix systems.
2011-06-05 01:47:45 +01:00
Hylke Bons
0e7f1e5491
controller: add a Initialize () method, instead of doing everything in the constructor
2011-06-04 18:16:00 +01:00
Hylke Bons
e63b1c64e2
paths: Use more the more crossplatform Environment.SpecialFolder enumeration to determine used paths.
2011-06-04 15:16:32 +01:00
Hylke Bons
209a30c0ab
repo base: only emit NewChangeSet event when SyncDown was successful
2011-06-03 01:33:41 +01:00
Hylke Bons
1dcecf13a6
Code cleanup
2011-06-03 00:35:51 +01:00
Hylke Bons
987127f5ec
Update out of date SparkleShare tagline
2011-06-02 00:08:05 +01:00
Hylke Bons
79bdddc85c
listener irc: only join a channel once
2011-06-01 23:59:18 +01:00
Hylke Bons
8457204cc5
Use custom folder watcher on Mac
2011-05-31 21:02:08 +01:00
Hylke Bons
e7da511b77
fetcher git: fix url construction
2011-05-31 18:30:28 +01:00
Hylke Bons
21181c34e4
Move url forming logic to the fetcher
2011-05-31 02:28:23 +01:00
Hylke Bons
9d1058186b
comment out debug rule
2011-05-30 16:22:09 +01:00
Hylke Bons
99cf47e45c
repo git: only disable emable watching once
2011-05-30 16:20:25 +01:00
Hylke Bons
db71ae2ce9
listener: get announcement server url from the config file
2011-05-30 02:19:58 +01:00
Hylke Bons
496c4662a2
listener: add Dispose method
2011-05-29 20:01:56 +01:00
Hylke Bons
1659387fb0
repo git: convert commit timestamps by converting them to utc, then converting them to our timezone
2011-05-29 17:47:40 +01:00
Hylke Bons
b5c8332e15
repo: normalise timezones for the log
2011-05-29 16:48:47 +01:00
Hylke Bons
2ae578db39
repo base: don't call AnyDifferences on changes in .git or .hg
2011-05-29 13:53:09 +01:00
Hylke Bons
d47435573c
listener: move reconnect timer from repo. rename channelmessage event. add debuginfo
2011-05-29 00:52:46 +01:00
Hylke Bons
aab6e36e4d
repo: remove obsolete static IsRepo method
2011-05-28 20:23:33 +01:00
Hylke Bons
ad0fa98e6b
controller, backend: determine repo backend type in a cleaner way
2011-05-28 19:29:16 +01:00
Hylke Bons
de0a53e60e
config: user Unknown as default username instead of empty string
2011-05-28 17:52:50 +01:00
Hylke Bons
857cf4e57d
config: add url as part of the folder config xml
2011-05-26 23:41:55 +01:00
Hylke Bons
865582eef6
Fix configuration issues
2011-05-26 20:46:49 +01:00
Hylke Bons
160485cff7
repo base: move method for consistency
2011-05-26 02:05:30 +01:00
Hylke Bons
800f70b3ac
repo base: use new config scheme to get the user name's and email
2011-05-26 01:44:10 +01:00
Hylke Bons
fe1628ce2d
Use new XML based config scheme
2011-05-25 21:46:46 +01:00
Hylke Bons
aa25e37933
Move the default backend initialisation to SparkleBackend
2011-05-25 20:24:25 +01:00
Hylke Bons
b14814c60a
hg: fix compile error
2011-05-25 20:20:20 +01:00
Hylke Bons
cd114ab82f
lib: Fix makefile whitespace
2011-05-25 20:15:15 +01:00
Hylke Bons
d538cb668a
hg: remove some debug output
2011-05-25 20:13:26 +01:00
Hylke Bons
4c764816e3
backend: don't be inheritable explictly
2011-05-25 20:07:13 +01:00
Hylke Bons
9a38781691
config: remove debug output
2011-05-25 19:38:25 +01:00
Hylke Bons
91553a0884
config: fix RemoveFolder method
2011-05-25 19:36:43 +01:00
Hylke Bons
a288b706a7
save scp backend work
2011-05-25 19:33:45 +01:00
Hylke Bons
5e0742f30e
config: fix style
2011-05-25 01:22:02 +01:00
Hylke Bons
67cfffc4d4
config: throw exception whenever config file doesn't exist
2011-05-25 01:20:37 +01:00
Hylke Bons
83ca2008e8
config add exception when config file is not found
2011-05-25 01:15:30 +01:00
Hylke Bons
d66a075b91
config: add a default static SparkleConfig
2011-05-25 01:00:32 +01:00
Hylke Bons
c75b081eff
Add SparkleConfig class to deal with configuration
2011-05-25 00:46:55 +01:00
Hylke Bons
803e551dca
hg: implement event logs for Mercurial
2011-05-23 21:16:21 +01:00
Hylke Bons
0bc64a297b
defines: remove unused OPEN_COMMAND
2011-05-23 19:42:28 +01:00
Hylke Bons
7977ce90c0
rough Mercurial log implementation and crash fixes on empty repo
2011-05-23 04:06:07 +01:00
Hylke Bons
fcef8df9c1
repo: fix listener connecting
2011-05-23 01:18:10 +01:00
Hylke Bons
866f97908a
don't watch for addition of ~/SparkleShare subfolders
2011-05-22 23:51:12 +01:00
Hylke Bons
cda21e52a4
lib: update csproj file
2011-05-22 19:22:13 +01:00
Hylke Bons
b496d5c774
lib: update csproj file
2011-05-22 19:21:20 +01:00
Hylke Bons
5b064f065b
Do host name checking the same way in back- and frontend
2011-05-22 19:08:14 +01:00
Hylke Bons
e307bf0ebe
repo git: turn off garbage collection by default
2011-05-22 18:54:47 +01:00
Hylke Bons
5002e19fa0
listener base: code cleanup
2011-05-22 18:52:50 +01:00
Hylke Bons
3a42d1c1de
repo: set HasUnsyncedChanges to true after a resolved conflict, so we'll push them later
2011-05-22 18:49:04 +01:00
Hylke Bons
09a8fb6021
repo, listener base: make syncdown queue handle multiple channels
2011-05-22 18:37:36 +01:00
Hylke Bons
ee2f21f2ac
repo: also announce changes after a syncup->down->up
2011-05-22 18:12:40 +01:00
Hylke Bons
cdefa6dc95
repo base: Syncup after a SyncDownBase triggered by an initial SyncUpBase. leave it to the remote_timer to push afterwards
2011-05-22 18:06:28 +01:00
Hylke Bons
3efe9060c2
repo: do a full SyncUpBase after a git rebase
2011-05-22 17:51:58 +01:00
Hylke Bons
f93983bd57
add debug info
2011-05-22 16:38:34 +01:00
Hylke Bons
d78ad40397
repo git: fix compile error
2011-05-22 16:29:23 +01:00
Hylke Bons
a6735b7cdb
repo git: push changes after conflict resolution
2011-05-22 16:27:06 +01:00
Hylke Bons
3b9cb28fea
repo: get the remote changes if detected on a first connect
2011-05-22 16:05:35 +01:00
Hylke Bons
aaabfe7bb1
helpers: make debug info easier to read by using whitespace
2011-05-22 16:04:28 +01:00
Hylke Bons
8a35a4a490
repo: tweak algorithm
2011-05-22 15:46:24 +01:00
Hylke Bons
f8f7ffa88a
build: fix build system
2011-05-22 12:42:22 +01:00
Hylke Bons
1da17be25d
build: move backend classes into subfolders
2011-05-22 12:28:14 +01:00
Hylke Bons
7c3c5edd13
use shorter Hg as class names instead of Mercurial
2011-05-22 01:15:46 +01:00
Hylke Bons
fd3e0b5191
listener: use one connection with multiple channels per server
2011-05-22 01:02:16 +01:00
Hylke Bons
749d83c832
Rework and abstract the backend. Add basic Mercurial support
2011-05-20 01:55:49 +01:00
Hylke Bons
0826a8287d
save work
2011-05-19 17:07:42 +01:00
Hylke Bons
e8dfc7b940
listener: only reference relevant libs
2011-05-19 16:51:49 +01:00
Hylke Bons
ccf21a658b
listener: fix message queueing of last rework
2011-05-19 16:44:01 +01:00
Hylke Bons
88c9ae7c91
listener: move more logic from Irc to Base
2011-05-19 16:41:46 +01:00
Hylke Bons
9ca01e6633
Edited SparkleLib/SparkleListenerBase.cs via GitHub
2011-05-19 08:14:50 -07:00
Hylke Bons
500313cf21
repo: abstract syncdown parts
2011-05-18 23:18:11 +01:00
Hylke Bons
5ca058862a
repo: block on commands in methods instead of starting in a new thread afterwards
2011-05-18 19:57:52 +01:00
Hylke Bons
483a5b9a72
repo: move some member declarations up
2011-05-18 19:31:43 +01:00
Hylke Bons
e81d1111d0
repo: give more members accessors
2011-05-18 19:12:45 +01:00
Hylke Bons
7f1fa32ec7
repo: rename RemoteOriginUrl to the more git agnostic Url
2011-05-18 17:00:02 +01:00
Hylke Bons
0081abe588
repo: rename and reduce number of enums in SyncStatus. ditch IsSyncing member
2011-05-18 16:34:31 +01:00
Hylke Bons
5c46430b72
repo: use accessors for HasUnsyncedChanges
2011-05-18 14:03:50 +01:00
Hylke Bons
dd4e020da2
repo: list up to 20 changes in the commit message
2011-05-17 22:37:22 +01:00
Hylke Bons
8849ad849e
repo: fix whitespace in commit messages and remove some useless debuginfo
2011-05-17 20:40:14 +01:00
Hylke Bons
dd7491be5d
repo: fix bug where the first commit hash wasn't used for the channel name
2011-05-17 13:15:44 +01:00
Hylke Bons
706885a615
Use 'revision' instead of 'hash'
2011-05-17 11:43:02 +01:00
Hylke Bons
c1b7c6b064
repo: add Status member that gets updates dynamically
2011-05-17 02:54:38 +01:00
Hylke Bons
2ff19486c3
repo: remove IsFetching and IsPushing members
2011-05-17 02:51:25 +01:00
Hylke Bons
e55a5a8e76
repo: rename CurrentHash to Revision
2011-05-17 01:29:51 +01:00
Hylke Bons
aa31b9934a
repo: remove CommitEndedUpEmpty event
2011-05-17 01:17:40 +01:00
Hylke Bons
6b154f9e2f
changeset: rename DateTime to Timestamp
2011-05-17 00:59:08 +01:00
Hylke Bons
7be4718324
build: remove obsolete SparkleEvents class
2011-05-17 00:51:43 +01:00
Hylke Bons
cc975eab80
repo: controller: use more git agnostic naming
2011-05-17 00:49:01 +01:00
Hylke Bons
ba2e74928e
repo: replace multiple events by one SyncStatusChanged event + enum
2011-05-17 00:15:23 +01:00
Hylke Bons
3a21d4e5b2
repo: remove unused Added event
2011-05-16 23:41:35 +01:00
Hylke Bons
39b12f6d0b
repo: remove unused Commited event handler
2011-05-16 23:30:45 +01:00
Hylke Bons
2a092c1ad9
fetcher: remove unused arguments for the events
2011-05-16 23:16:56 +01:00
Hylke Bons
0a2b664e51
fetchergit: remove TODO
2011-05-16 21:24:51 +01:00
Hylke Bons
3be31fbcb6
Split up the fetcher code into FetcherBase and FetcherGit
2011-05-16 21:19:58 +01:00
Hylke Bons
c7f5545886
listener: use protected members instead of public and use base.x to access them
2011-05-16 21:19:19 +01:00
Hylke Bons
8829c2145e
repo: use the first commit hash as an id for the repo and use that as the channel name' did not match any files
2011-05-14 18:11:31 +01:00
Hylke Bons
9d3fd8888d
Replace abstract out Listener by ListenerBase + ListenerIrc
2011-05-14 18:10:24 +01:00
Hylke Bons
9707481f42
repo: push changes after resolving a conflict
2011-05-14 03:18:38 +01:00
Hylke Bons
9fc70ac197
helpers: fix whitespace and coding style
2011-05-11 20:29:43 +01:00
Hylke Bons
4cb799c08e
controller: fetcher: Use and xml based config file and add temporary migration method
2011-05-10 00:30:33 +01:00
Hylke Bons
ae20120723
backend: Add IsUsablePath method and adjust related TODOs
2011-05-09 00:44:40 +01:00
Hylke Bons
d7b488f2ff
Add new backend class and a default backend. Add backend member to repo.
2011-05-09 00:04:53 +01:00
Hylke Bons
7dcd1c9745
repo: fix coding style for private members
2011-05-08 23:01:07 +01:00
Hylke Bons
a42292cbe9
events: fix more whitespace
2011-05-08 20:43:12 +01:00
Hylke Bons
dc0b047cf8
events: fix whitespace
2011-05-08 20:40:08 +01:00
Hylke Bons
0d9de8bc0b
events: listener: code cleanup
2011-05-08 20:35:43 +01:00
Hylke Bons
4e9e766499
controller: dispose the fetcher when we're done so it can be garbage collected
2011-05-08 20:35:26 +01:00
Hylke Bons
3a240ce864
fetcher: prepare for multibackend
2011-05-08 18:25:55 +01:00
Hylke Bons
93c55170af
repo: add debug info about conflict type when resolving
2011-05-07 13:08:56 +01:00
Hylke Bons
5b7566898f
update AUTHORS, and don't go on the slippery slope of using implicit typing
2011-05-05 00:07:02 +01:00
Gabriel Burt
281870f8df
repo: speed up by re-using Regex objects
2011-05-04 23:33:17 +01:00
Hylke Bons
f40f2d80b9
fetcher: remove the Cloning prefix from the events to make more sense grammatically
2011-05-03 18:30:51 +01:00
Hylke Bons
f4ace4ea9e
fetcher: ignore file permission changes in new checkouts
2011-05-01 17:25:42 +02:00
Hylke Bons
8584604677
Fix coding style and whitespace of all of SparkleLib
2011-05-01 15:40:46 +02:00
Hylke Bons
11928a211b
repo: resolve any kind of rebase conflict
2011-04-30 02:42:48 +02:00
Hylke Bons
cafa0f9a35
use absolute paths to move our version of conflicting file
2011-04-29 00:32:16 +02:00
Hylke Bons
9ab60210e7
save work on conflict resolution fix
2011-04-28 13:49:14 +02:00
Hylke Bons
4131958a0e
repo: don't fetch changes when we're busy adding files
2011-04-27 18:44:59 +02:00
Hylke Bons
ef89629e7c
repo: add support for renames and names with spaces in FormatCommitMessage method
2011-04-27 12:04:51 +02:00
Hylke Bons
7bcefc9831
[repo] Add a simple notification queue when disconnected, and send them when reconnected.
2011-04-23 15:56:05 +02:00
Hylke Bons
e609c0b3a4
[repo] add back empty repo check without Git#
2011-04-21 23:14:44 +02:00
Hylke Bons
949e2ed464
Use unicode for standardoutput. Fixes weird characters in logs but needs the latest mono
2011-04-21 19:45:11 +02:00
Bertrand Lorentz
111bef36d8
Remove GitSharp from the build and delete submodule
2011-04-21 17:15:32 +02:00
Hylke Bons
aef32e64ab
Uncomment out conflict event. Fixes build errors
2011-04-21 16:49:26 +02:00
Hylke Bons
34983c28e7
Remote last bits of Git# code and comment out broken conflict resolution code
2011-04-21 15:46:46 +02:00
Hylke Bons
c6d189f028
Don't rely on Git# for FormatCommitMessage ()
2011-04-21 14:25:28 +02:00
Hylke Bons
1c5e05685a
remove unneeded gitsharp.* libs
2011-04-20 16:43:10 +02:00
Hylke Bons
493e39dabe
[repo] add todo
2011-04-20 16:40:17 +02:00
Hylke Bons
97f419666d
[repo] don't rely on Git# for username, email and remote url
2011-04-20 16:32:34 +02:00
Hylke Bons
8a93f69892
[repo] don't rely on Git# Directory property
2011-04-20 16:23:02 +02:00
Hylke Bons
d7b2a3ed08
[repo] Fix whitespace
2011-04-20 15:02:20 +01:00
Hylke Bons
780d8ccc61
tmp
2011-04-17 12:22:20 +01:00
Hylke Bons
dc11211a00
Use git command for committing instead of GitSharp
2011-04-17 00:30:57 +01:00
Hylke Bons
9604be2a53
Use git command for getting the current hash instead of GitSharp
2011-04-17 00:19:42 +01:00
Hylke Bons
d4bdea0be6
[repo] pull before pushing in every situation
2011-04-15 01:28:42 +01:00
Hylke Bons
42f461b507
[repo] get remote changes beffore pushing changes that weren't pushed due to a disconnect
2011-04-15 00:56:02 +01:00
Hylke Bons
4c9216a8a2
Fix quit method
2011-03-27 13:56:36 +01:00
Hylke Bons
68f0610979
[repo] Fix the GetCommits regex to also parse GMT-n timezones
2011-03-24 00:50:08 +00:00
Hylke Bons
1e4ef90ef5
[paths] change the way git lookup is done
2011-03-23 23:14:50 +00:00
Hylke Bons
6410633c12
Merge branch 'master' of ssh://github.com/hbons/SparkleShare
2011-03-22 22:50:25 +00:00
Hylke Bons
7a722f52be
[lib] Allow disabling of central notification server and fallback to own
2011-03-22 13:44:52 +00:00
Hylke Bons
c983d4a067
[osx] quickly fix the git path
2011-03-20 19:24:57 +00:00
Hylke Bons
3cb52d217b
[commit] remove unneeded member
2011-03-20 16:26:56 +00:00
Hylke Bons
5959f1db5f
[log] remove 'IsFileDump' workaround and move message code to controller
2011-03-20 14:59:35 +00:00
Hylke Bons
6c5bf06558
New thread + spinner instead of freeze when opening big logs
2011-03-16 15:13:14 +00:00
Hylke Bons
0dfac3279f
Show menu item icons on Fedora too
2011-03-16 00:01:37 +00:00
Hylke Bons
53eca6e848
[watcher] ignore files in .git/
2011-03-13 22:26:01 +00:00
Hylke Bons
538bdf0dd0
Fix notifications
2011-03-13 02:07:47 +00:00
Hylke Bons
10b05898dd
[statusicon] update icons and add icons for pressed state syncing animation
2011-03-13 01:21:49 +00:00
Hylke Bons
d79fcce3a2
[osx] Pop up a warning when the backend (git) isn't found.
2011-03-13 00:15:19 +00:00
Hylke Bons
be2edd8866
Fix cloning problem and better debuginfo
2011-03-12 19:39:42 +00:00
Hylke Bons
db0af9dbda
[repo] add todo
2011-03-12 18:58:04 +00:00
Hylke Bons
c000f8cb0c
Use SparkleLib.IsRepo for folder checking
2011-03-12 18:36:03 +00:00
Hylke Bons
e8ae8198ff
Merge branch 'fetcher-fix'
...
Conflicts:
SparkleLib/SparkleFetcher.cs
2011-03-12 17:58:53 +00:00
Hylke Bons
fa4e7dd368
[fetcher] Fix InstallConfiguration method
2011-03-12 17:53:49 +00:00
Hylke Bons
ced6065c18
[fetcher] no need to keep error message in memory
2011-03-12 16:18:36 +00:00
Hylke Bons
b1bd01b86a
Merge branch 'master' of https://github.com/palango/SparkleShare into palango-master
2011-03-12 16:10:24 +00:00
Hylke Bons
4fb08eae64
[fetcher] set core.ignorecase to false for each folder
2011-03-12 15:38:49 +00:00
Hylke Bons
68d7d99f1e
[repo] quick fix to re-push changes after encountering a non fast-forward to origin master
2011-03-09 06:23:24 -08:00
Hylke Bons
b4d2b47cb7
Add SparkleAbout to .csproj
2011-03-08 23:55:21 +00:00
Hylke Bons
d5dced649b
[repo] align regexes
2011-03-06 15:29:36 +00:00
Paul Lange
9f31bc23e2
Add some error messages
2011-03-06 16:07:16 +01:00
Hylke Bons
c67277c079
[listener] Use SparkleShare's dedicated notification server instead of irc.gnome.org
2011-03-04 18:31:02 +00:00
Hylke Bons
03db068505
Add some TODO's
2011-03-04 17:03:29 +00:00
Hylke Bons
0d867a8c30
[repo] Not everything is file dumping
2011-03-04 16:50:41 +00:00
Hylke Bons
5e84a9cfe0
Fix hang on commit logs > 4096 bytes
2011-03-04 15:57:22 +00:00
Hylke Bons
17d07bb2eb
[repo] Replace gitsharp's AnyDifferences by own implementation
2011-03-04 14:01:29 +00:00
Hylke Bons
91f629b5d5
[fetcher] Ignore Omnigraffle autosave files
2011-03-04 05:30:11 -08:00
Hylke Bons
4e62d010e8
Remove NotifySsharp from solution
2011-03-04 09:05:15 +00:00
Hylke Bons
5a055597d5
remove debug line
2011-03-03 12:08:50 +00:00
Hylke Bons
7431e49fc9
Support showing merge commits in logs (and fix crashes caused by them being missing)
2011-03-03 12:06:25 +00:00
Hylke Bons
9c5a38f352
[repo] fix crash caused by GetCommits(n) returning n-1 entries
2011-03-02 22:07:05 +00:00
Hylke Bons
b22fabf5c6
[repo] also push changes the user makes whilst we're syncing
2011-03-02 21:20:25 +00:00
Hylke Bons
a8b0fc1a3e
remove some leftover debug messages
2011-03-02 00:24:18 +00:00
Hylke Bons
9375f2706c
[repo] Fix NewCommit event not being fired
2011-03-01 23:42:00 +00:00
Hylke Bons
dc521e4ffd
[notifications] Reconnect to the IRC server after a disconnect
2011-03-01 23:13:43 +00:00
Hylke Bons
a35b203406
Redo GetCommits method withoug GitSharp. hopefully solves memory problem
2011-02-27 18:50:42 +00:00
Hylke Bons
c717d5efb1
change wording a bit
2011-02-27 01:01:13 +00:00
Hylke Bons
51c0de4d5c
Tweak irc notifications
2011-02-27 00:53:14 +00:00
Hylke Bons
fa3997beff
[repo] Make time from event to push 5x shorter by using folder size checking
2011-02-26 23:57:48 +00:00
Hylke Bons
8d5cf4ab5d
[repo] only rely on exclude rules to add/ignore changes
2011-02-26 18:46:08 +00:00
Hylke Bons
53294eb351
[repo] massive cleanup, use GitSharp and SparkleGit
2011-02-26 14:20:32 +00:00
Hylke Bons
de69954bc0
[listener] use a SHA-1 sum for the nick so no user info is shared
2011-02-24 01:43:06 +00:00
Hylke Bons
11589748c4
[repo] state is polling when checking for remote changes
2011-02-24 01:42:13 +00:00
Hylke Bons
5ad2d09851
[repo] Fix compilation issue
2011-02-23 01:13:54 +00:00
Hylke Bons
0e0bc1c062
[repo] forgot to create commit message before rebasing
2011-02-23 00:21:30 +00:00
Hylke Bons
d07d6c71cd
[repo] Always commit before rebasing fetched changes in case something changed
2011-02-23 00:09:44 +00:00
Hylke Bons
ad2c87356f
[paths] look for git using whereis
2011-02-22 22:58:01 +00:00
Hylke Bons
c02ec224f1
[repo] Fix pushing bug
2011-02-13 00:02:07 +00:00
Hylke Bons
fe0e951d0e
[log] Add a default buddy icon and prettify the event log
2011-02-13 00:02:06 +00:00
Hylke Bons
f412b6e9b9
[repo] Run 'git gc' about every 10 commits
2011-02-13 00:02:06 +00:00
Hylke Bons
b0a7fd8892
[fetcher] Add more handy exclude rules
2011-02-12 23:55:27 +00:00
Hylke Bons
f274ffac4d
[controller] Disable SSH host key checking temporarily for cloning
2011-02-06 01:10:15 +00:00
Hylke Bons
2e8715fb13
Merge branch 'master' of https://github.com/kristi/SparkleShare into integration
2011-02-05 16:35:47 +00:00
Hylke Bons
d959a5a78f
[fetcher] adjust gitignore that is to be added adter cloning
2011-02-05 16:22:38 +00:00
Kristi
90b009ddf7
Start processes after adding delegates to avoid duplicate pull messages.
2011-02-01 23:39:50 -08:00
Kristi
48b1d956b1
Fix whitespace
2011-02-01 01:38:56 -08:00
Kristi
e7ed9e04c4
Fix bug when syncing a empty repository with no commits
2011-02-01 01:20:30 -08:00
Hylke Bons
7e8d155715
[osx] Hook things up
2010-12-18 01:01:43 +01:00
Łukasz Jernaś
52ef7f8bf1
Get data root dif info from configure
...
Also fixes the path to the about dialog pixmap.
2010-12-02 22:31:35 +01:00
Hylke Bons
2b274c6140
[paths] Add a SparklePath for git
2010-11-27 21:24:34 +00:00
Hylke Bons
e6f16e640b
[repo] Combine paths properly
2010-11-27 21:24:34 +00:00
Hylke Bons
9d8ec7bf88
[controller] Make OpenSparkleShareFolder abstract and implement a linux version
2010-11-27 21:24:34 +00:00
Hylke Bons
b95e8eae11
[repo] clean up comment a bit
2010-11-27 21:24:34 +00:00
wimh
9c2c6b2be0
fix SparkleRepo.FormatCommitMessage ()
2010-11-27 21:24:34 +00:00
Hylke Bons
41c52661a7
[repo][controller] Abstract GetCommits method
2010-11-27 21:24:34 +00:00
Hylke Bons
da831f3449
Remove double space type crime in license headers
2010-11-27 21:24:33 +00:00
Hylke Bons
050b6f4b5b
[listener] Prevent irc nick from becoming null
2010-11-27 21:24:33 +00:00
Hylke Bons
a58c450ade
[listener] Fix nick not being set
2010-11-27 21:24:32 +00:00
Hylke Bons
faafe0dc93
Move more logic from [intro] to [controller]
2010-11-27 21:24:31 +00:00
Hylke Bons
f90ad36bc4
Create a working Mac solution file and add some temporary workarounds
2010-11-27 21:24:31 +00:00
Hylke Bons
9dde45bc5d
Create a working Mac solution file and add some temporary workarounds
2010-11-27 21:24:30 +00:00
Hylke Bons
5e35cb74d7
[listener] Fix crash due to empty username
2010-11-16 00:56:21 +00:00
Hylke Bons
600948d3ed
[build] Make SS build and run on OSX
2010-11-13 22:30:00 +00:00
Hylke Bons
81854f610a
[log] pass avatars to the new webkit view
2010-11-07 23:59:07 +01:00
Hylke Bons
cde668fe77
[notifications] restructure and make commit messages translatable
2010-11-02 10:45:37 +00:00
Hylke Bons
264af48a54
[fetcher] allow spaces in folders and urls by adding quotes
2010-11-02 10:45:37 +00:00
Bertrand Lorentz
e9774facef
[build] Fix handling of additional dependencies of GitSharp
...
The bundled assemblies are in srcdir, so we need to get them from there.
2010-10-21 21:31:07 +02:00
Bertrand Lorentz
2e4986b07e
[build] Fix build and installation of GitSharp assemblies
...
Improve the GitSharp autotools stuff and move it to its own file,
included in the top-level Makefile.
A system-installed nant is now required to build GitSharp, instead of
using the in-tree copy.
All the files we really need to build GitSharp are now included in the
tarball, including the binary deps. I see weeping packagers...
But "make distcheck" doesn't work, mostly because GitSharp insists on
writing to the source dir during compilation. As distcheck builds with a
read-only source tree, this fails horribly.
2010-10-21 20:51:03 +02:00
Hylke Bons
69ffde27b0
Restructure to be more MVC like
2010-10-16 23:48:50 +01:00
Hylke Bons
372aea1298
[fetcher] fix comments
2010-10-10 23:07:07 +01:00
Hylke Bons
b12d1f5e63
[repo] port some more lines to git# and clean up
2010-10-10 23:04:08 +01:00
Hylke Bons
43cfef51ad
[repo] port GetCommits to git#
2010-10-10 22:39:00 +01:00
Hylke Bons
d5dc2cdfee
[repo] do the timezone offsetting in a less hacky way
2010-10-10 20:33:43 +01:00
Hylke Bons
4191fb2b16
[repo] port CurrentHash to git#
2010-10-10 17:19:28 +01:00
Hylke Bons
aaf48504a3
[repo] port RemoteOriginUrl to git#
2010-10-10 17:13:51 +01:00
Hylke Bons
13e749fdc0
[repo] port FormatCommitMessage method to git#
2010-10-10 17:11:01 +01:00
Hylke Bons
7918c83f99
[repo] port ls-remote (but not yet implemented)
2010-10-10 16:43:54 +01:00
Hylke Bons
88c53b7be4
[repo] port UserEmail and UserName properties to use GitSharp
2010-10-10 16:12:01 +01:00
Hylke Bons
45e6cd19b5
[repo] port Commit method to use GitSharp
2010-10-10 15:57:12 +01:00
Bertrand Lorentz
b504a8f074
[build] Integrate GitSharp into the solution
2010-10-10 15:12:01 +02:00
Bertrand Lorentz
9a8e4dd7e4
[build] Update sln and csproj files
2010-10-10 15:01:47 +02:00
Hylke Bons
90485bfddf
[repo] include unsynced changes check in the remote timer
2010-10-09 17:36:51 +01:00
Hylke Bons
341dd10747
[repo] add TODO
2010-10-08 17:52:03 +01:00
Hylke Bons
71771b09d6
[repo][ui] Add fetchingfailed events
2010-10-07 22:46:11 +01:00
Hylke Bons
5d291cdef4
[repo][log] Add an infobar message for when fetching fails
2010-10-07 22:31:48 +01:00
Hylke Bons
70c718c3c7
[statusicon] new icon by lapo and improve error state handling
2010-10-07 22:08:13 +01:00
Hylke Bons
9d5561ceae
[log] update when pushing has finished and fetch/push on a reconnect
2010-10-07 20:40:23 +01:00
Hylke Bons
71f1252157
[log][repo][statusicon] add notices and icons when there are unpushed changes
2010-10-07 00:54:42 +01:00
Hylke Bons
78669d5825
[repo] look for remote changes immediately after irc is dropped and [listener] tweak timeout values
2010-10-04 10:21:20 +01:00
Hylke Bons
2ef39dd26f
update README and [listener] extend retry intervals
2010-10-03 22:15:51 +01:00