Hylke Bons
aabf323860
remove GNOME plugin as it isn't actually used by anyone
2012-11-10 22:00:03 +00:00
Hylke Bons
f4c6e50a15
fetcher git: add back warning about global gitignore
2012-11-10 12:26:47 +00:00
Hylke Bons
ac2066f7f4
fetcher git: explicitly convert to native line endings for .txt files (for Notepad)
2012-11-10 10:43:30 +00:00
Hylke Bons
51d4b6a28c
fetcher git: typo in config setting
2012-11-08 16:02:55 +00:00
Hylke Bons
abe94a0bfc
fetcher git: explicitly set the push strategy. fixes #1035
2012-10-26 13:43:54 +01:00
Hylke Bons
acab0e1c85
repo git: cleanups
2012-10-22 21:41:00 +01:00
Hylke Bons
49a30a823b
windows: fix for the .sparkleshare file sometimes not being hidden
2012-10-21 21:16:38 +01:00
Hylke Bons
a4a48865dc
fetcher git: fixes for crypto setup
2012-10-20 23:22:41 +01:00
Hylke Bons
6ffda9388b
fetcher git: fix crypto salt lookup
2012-10-19 23:42:27 +01:00
Hylke Bons
1009227aff
controller: small fix for status icon text not updating sometimes
2012-10-16 22:00:35 +01:00
Hylke Bons
2d3f351523
event log: show the last month worth of changes
2012-10-16 22:00:35 +01:00
Hylke Bons
8857634e64
eventlog: change default size
2012-10-16 22:00:35 +01:00
Hylke Bons
73d0f496d2
history: implement back button
2012-10-16 22:00:34 +01:00
Hylke Bons
3c74466898
history: fix some edge cases and general improvements
2012-10-16 22:00:34 +01:00
Hylke Bons
651033b9b8
make restoring of files work
2012-10-16 22:00:34 +01:00
Hylke Bons
d4ac1fe93e
early working version of history recycle logic + mac Save As dialog
2012-10-16 22:00:34 +01:00
Hylke Bons
a02bd278b0
fetcher: fix support for http(s) repos. closes #1000
2012-10-05 21:55:57 +02:00
Hylke Bons
a7c39b3a35
crypto: use a random salt per repo, store it as a remote branch name
2012-09-29 23:57:35 +02:00
Hylke Bons
34df1996cf
repo git: Fix endless loop when adding empty folders. Closes #967
2012-09-23 12:10:51 +01:00
Hylke Bons
4118f1949c
repo: don't allow multiple syncs at the same time on startup. Fixes #985
2012-09-22 22:43:40 +01:00
Hylke Bons
05101acf28
Merge pull request #984 from brandondahler/master
...
Too large commit log causes git to hang
2012-09-22 05:37:34 -07:00
Brandon Dahler
efd642253a
Fix bug from too large of commit log (introduced 1c8cffd178).
2012-09-21 19:27:26 -05:00
Hylke Bons
bb67a05e56
statusicon: On sync fail, add error descriptions as submenus. Closes #874
2012-09-18 19:40:06 +01:00
Hylke Bons
7c6e4c4980
repo git: set remote.origin.url from config.xml on startup. #972
2012-09-17 11:22:42 +01:00
Hylke Bons
d790d1b003
fetcher git: Add .iso to do not compress list
2012-09-08 10:41:08 +01:00
Hylke Bons
caa79a9dca
fetcher git: check if git info directory exists before writing to it. Fixes #934
2012-08-27 13:54:22 +01:00
Leszek Krupinski
1f0635caf0
missing references
2012-08-13 11:22:12 +02:00
Leszek Krupinski
c592fb9016
Removed unnecessary entries causing warnings
2012-08-13 09:27:42 +02:00
Hylke Bons
0b4c4851c8
linux ui: change AssetsPath back to static
2012-08-11 23:01:07 +01:00
Hylke Bons
1f00cdceae
mac: fix solution file
2012-08-10 19:41:40 +01:00
Hylke Bons
e7e3b8603f
windows: Fix build. Closes #894
2012-08-10 19:04:11 +01:00
Hylke Bons
ded0595335
windows: Fix Windows build. Closes #882
2012-08-05 14:23:51 +02:00
Hylke Bons
e8f645147e
docs: Add howto to repo and use 'storage' as default user
2012-08-04 17:22:34 +02:00
Hylke Bons
c65e800d2e
Add backend support for listing history of a file and reverting
2012-08-04 00:32:44 +02:00
Hylke Bons
c9e4218358
Remove Helpers class, add Logger class
2012-07-28 15:58:09 +02:00
Hylke Bons
b4126d11b1
Fix log parse logic
2012-07-26 20:17:01 +02:00
Hylke Bons
5fddddbe21
build: cleanup and remove translations
2012-07-26 16:49:03 +02:00
Hylke Bons
e17cda8a38
build: move version number definition to central place, clean up build tools
2012-07-26 15:17:35 +02:00
Hylke Bons
ff89044289
repo git: Simplify
2012-07-26 12:43:16 +02:00
Hylke Bons
a90390b22f
lib git: simplify process starting
2012-07-26 12:30:00 +02:00
Hylke Bons
6ced798b3f
Fix build. Closes #876
2012-07-25 13:28:50 +02:00
Hylke Bons
34edbbb99e
lib: Check if we're in the middle on a rebase on startup, if so: abort
2012-07-25 11:41:51 +02:00
Hylke Bons
5bef8dd3cc
fetcher: code cleanup
2012-07-22 22:54:59 +02:00
Hylke Bons
1d8e8eb810
Disable git-bin by default
2012-07-22 20:59:51 +02:00
Hylke Bons
d1eba721ca
repo git: code cleanup
2012-07-22 11:40:49 +02:00
Hylke Bons
d812c4c146
repo: move changeset list creation logic to base class
2012-07-19 22:21:38 +02:00
Hylke Bons
e8af571c2b
lib: code cleanup
2012-07-18 14:51:09 +02:00
Hylke Bons
3bd2630a13
git: Use the same Unicode form on all filesystems. Closes #478
2012-07-15 21:01:06 +02:00
Hylke Bons
0839657282
repo: remove unneeded try/catch block and fix up some logic
2012-07-14 17:18:29 +02:00
Hylke Bons
3496bfba75
Some rearrangements
2012-07-14 12:45:54 +02:00
Hylke Bons
e58bd78148
Disable git-bin
2012-07-08 12:49:17 +02:00
Hylke Bons
430b7f7a4b
fetcher git: show error messages when host key has changed
2012-07-08 12:30:37 +02:00
Hylke Bons
2122b79ab5
Allow renaming of folders. Closes #466
2012-07-06 11:26:02 +02:00
Hylke Bons
d244f12459
Calculate IDs in the fetcher and add the to the config
2012-07-05 13:38:55 +02:00
Matthias Dittrich
49fd14ebdb
Sparkle can now handle files with special characters
2012-07-05 13:37:18 +02:00
Hylke Bons
aa87519cc6
lib: style cleanups
2012-07-03 09:59:19 +02:00
Hylke Bons
08649a9aae
repo git: Use a more descriptive flag when calling git-log
2012-07-03 09:59:18 +02:00
Hylke Bons
34376dacf8
repo git: rewrite HasLocalChanges
2012-07-03 09:59:18 +02:00
Hylke Bons
cf84864911
repo git: catch IOException in ResolveConflict method
2012-07-03 09:59:18 +02:00
Hylke Bons
e439d53a7b
repo git: Fix conflict resolution
2012-07-03 09:59:18 +02:00
Hylke Bons
1c8cffd178
repo git: refactor andf fix Rebase and FormatCommitMessage methods
2012-07-03 09:59:18 +02:00
Hylke Bons
62c7a797f9
repo git: Remove some redundant lines
2012-07-03 09:59:18 +02:00
Matthias Dittrich
dc21e9a285
Now filesnames with special chars will be written properly in the comments
2012-07-03 09:59:18 +02:00
Hylke Bons
bb2a6b8662
lib git: Run commit with --all and deduplicate code somewhat
2012-07-03 09:59:18 +02:00
Hylke Bons
4ab153eb1f
repo git: Fix coding style for #823
2012-07-03 09:59:17 +02:00
Matthias Dittrich
b02d57d727
Found another place where the Utf8-fix is required
2012-07-03 09:59:17 +02:00
Matthias Dittrich
c5c63636e2
Sparkle can now handle files with special characters
2012-07-03 09:59:17 +02:00
Hylke Bons
618b0b520c
lib git: Clear git-bin cache after sync
2012-06-29 21:43:49 +01:00
Hylke Bons
8df73d9bee
lib git: only do remote_url check when needed
2012-06-29 17:08:12 +01:00
Hylke Bons
e320edfb7f
lib git: Add detection of git-bin repos
2012-06-29 16:44:02 +01:00
Hylke Bons
eb543fef5e
fetcher git: Refactor
2012-06-29 14:00:25 +01:00
Hylke Bons
a2353405dd
fetcher git: Simplify attributes file creation
2012-06-29 13:17:59 +01:00
Hylke Bons
7ebc93f40e
fetcher git: Simplify install of config after clone
2012-06-29 12:53:13 +01:00
Hylke Bons
a3d60412ee
lib: Add separate SparkleGit and SparkleGitBin objects derived from SparkleProcess
2012-06-29 00:12:37 +01:00
Hylke Bons
063b38ff28
repo git: hide .sparkleshare and .empty after a rebase. Fixes #814
2012-06-28 14:21:33 +01:00
Hylke Bons
8f95a38e26
fetcher git: don't read output on checkout and add --quiet option
2012-06-28 12:18:00 +01:00
Hylke Bons
c957a97296
repo git: don't resolve conflicts on the .sparkleshare file. See #807
2012-06-27 00:13:17 +01:00
Hylke Bons
9538781dd3
repo git: reuse git objects
2012-06-24 23:20:45 +01:00
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
6569ae6200
lib git: treat merge commits like any other commit
2012-06-19 10:54:46 +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
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
e0ee50d392
repo: Simplify watch toggling mechanism
2012-06-10 11:03:03 +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
b8743236cd
repo git: only squash commits by the same person
2012-05-28 00:14:00 +01:00
Hylke Bons
0280f7481e
eventlog: sort changes by timestamp, not type
2012-05-27 19:24:12 +01:00
Hylke Bons
900130bf8b
repo git: catch exceptions creating .empty files. Fixes #733
2012-05-20 12:51: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
2302b31f6f
Cache changesets in the backend
2012-04-29 15:19:36 +01:00
Hylke Bons
aa5092f672
Merge branch 'http'
2012-04-28 09:51:41 +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
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
