Hylke Bons
7c71c3d67f
repo git: show error when we can't rebase due to locked files
2012-11-17 19:03:37 +00:00
Hylke Bons
7165cc7cae
repo git: don't abort rebase on startup, fix conflicts instead. fixes #1058
2012-11-16 10:05:57 +00:00
Hylke Bons
94c1354a70
repo git: always use the default repo branch, even if it's not master
2012-11-12 22:47:40 +00:00
Hylke Bons
c60153b90c
repo git: temporarily set core.ignorecase=true when rebasing to prevent conflicts. fixes #721
2012-11-11 19:15:42 +00:00
Hylke Bons
9e89a92ba7
remove GNOME plugin as it isn't actually used by anyone
2012-11-10 22:00:03 +00:00
Hylke Bons
b73f422a99
fetcher git: add back warning about global gitignore
2012-11-10 12:26:47 +00:00
Hylke Bons
3a13cad422
fetcher git: explicitly convert to native line endings for .txt files (for Notepad)
2012-11-10 10:43:30 +00:00
Hylke Bons
ae90c616b2
fetcher git: typo in config setting
2012-11-08 16:02:55 +00:00
Hylke Bons
d79f093996
fetcher git: explicitly set the push strategy. fixes #1035
2012-10-26 13:43:54 +01:00
Hylke Bons
e4d8e88deb
repo git: cleanups
2012-10-22 21:41:00 +01:00
Hylke Bons
9601506d31
windows: fix for the .sparkleshare file sometimes not being hidden
2012-10-21 21:16:38 +01:00
Hylke Bons
c274e87019
fetcher git: fixes for crypto setup
2012-10-20 23:22:41 +01:00
Hylke Bons
d80abc3070
fetcher git: fix crypto salt lookup
2012-10-19 23:42:27 +01:00
Hylke Bons
3a8d7bec4f
controller: small fix for status icon text not updating sometimes
2012-10-16 22:00:35 +01:00
Hylke Bons
2c94a9938d
event log: show the last month worth of changes
2012-10-16 22:00:35 +01:00
Hylke Bons
423717bd1d
eventlog: change default size
2012-10-16 22:00:35 +01:00
Hylke Bons
a20d377192
history: implement back button
2012-10-16 22:00:34 +01:00
Hylke Bons
6f22466eac
history: fix some edge cases and general improvements
2012-10-16 22:00:34 +01:00
Hylke Bons
ef44b2ccfb
make restoring of files work
2012-10-16 22:00:34 +01:00
Hylke Bons
da0f3d53a5
early working version of history recycle logic + mac Save As dialog
2012-10-16 22:00:34 +01:00
Hylke Bons
a406a0964d
fetcher: fix support for http(s) repos. closes #1000
2012-10-05 21:55:57 +02:00
Hylke Bons
475b82f43a
crypto: use a random salt per repo, store it as a remote branch name
2012-09-29 23:57:35 +02:00
Hylke Bons
9a7b5b8827
repo git: Fix endless loop when adding empty folders. Closes #967
2012-09-23 12:10:51 +01:00
Hylke Bons
0286060d9a
repo: don't allow multiple syncs at the same time on startup. Fixes #985
2012-09-22 22:43:40 +01:00
Hylke Bons
321efb4384
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
c440b70fa2
Fix bug from too large of commit log (introduced 1c8cffd178
).
2012-09-21 19:27:26 -05:00
Hylke Bons
cb5617c300
statusicon: On sync fail, add error descriptions as submenus. Closes #874
2012-09-18 19:40:06 +01:00
Hylke Bons
284234514f
repo git: set remote.origin.url from config.xml on startup. #972
2012-09-17 11:22:42 +01:00
Hylke Bons
16446ff566
fetcher git: Add .iso to do not compress list
2012-09-08 10:41:08 +01:00
Hylke Bons
f6dc8fb3bb
fetcher git: check if git info directory exists before writing to it. Fixes #934
2012-08-27 13:54:22 +01:00
Leszek Krupinski
00971c8ddd
missing references
2012-08-13 11:22:12 +02:00
Leszek Krupinski
d443b1c6a0
Removed unnecessary entries causing warnings
2012-08-13 09:27:42 +02:00
Hylke Bons
18a98dc69b
linux ui: change AssetsPath back to static
2012-08-11 23:01:07 +01:00
Hylke Bons
ed5074aae0
mac: fix solution file
2012-08-10 19:41:40 +01:00
Hylke Bons
ae3495d388
windows: Fix build. Closes #894
2012-08-10 19:04:11 +01:00
Hylke Bons
448599e661
windows: Fix Windows build. Closes #882
2012-08-05 14:23:51 +02:00
Hylke Bons
e18c72c099
docs: Add howto to repo and use 'storage' as default user
2012-08-04 17:22:34 +02:00
Hylke Bons
f9e57dba0a
Add backend support for listing history of a file and reverting
2012-08-04 00:32:44 +02:00
Hylke Bons
161bfea8b4
Remove Helpers class, add Logger class
2012-07-28 15:58:09 +02:00
Hylke Bons
5e9d260409
Fix log parse logic
2012-07-26 20:17:01 +02:00
Hylke Bons
5290414866
build: cleanup and remove translations
2012-07-26 16:49:03 +02:00
Hylke Bons
2b4843ad24
build: move version number definition to central place, clean up build tools
2012-07-26 15:17:35 +02:00
Hylke Bons
744dcc4483
repo git: Simplify
2012-07-26 12:43:16 +02:00
Hylke Bons
942752f2e9
lib git: simplify process starting
2012-07-26 12:30:00 +02:00
Hylke Bons
351ad0df92
Fix build. Closes #876
2012-07-25 13:28:50 +02:00
Hylke Bons
687cbd4b60
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
0b500c3ef4
fetcher: code cleanup
2012-07-22 22:54:59 +02:00
Hylke Bons
ce844af1ee
Disable git-bin by default
2012-07-22 20:59:51 +02:00
Hylke Bons
471be2cd9f
repo git: code cleanup
2012-07-22 11:40:49 +02:00
Hylke Bons
126d696d5a
repo: move changeset list creation logic to base class
2012-07-19 22:21:38 +02:00
Hylke Bons
f3784ddc98
lib: code cleanup
2012-07-18 14:51:09 +02:00
Hylke Bons
accf447456
git: Use the same Unicode form on all filesystems. Closes #478
2012-07-15 21:01:06 +02:00
Hylke Bons
e61e33b47f
repo: remove unneeded try/catch block and fix up some logic
2012-07-14 17:18:29 +02:00
Hylke Bons
eaead8c87d
Some rearrangements
2012-07-14 12:45:54 +02:00
Hylke Bons
f209602f3a
Disable git-bin
2012-07-08 12:49:17 +02:00
Hylke Bons
a7d926b6fa
fetcher git: show error messages when host key has changed
2012-07-08 12:30:37 +02:00
Hylke Bons
ec2f5f36a2
Allow renaming of folders. Closes #466
2012-07-06 11:26:02 +02:00
Hylke Bons
c769f6c7a8
Calculate IDs in the fetcher and add the to the config
2012-07-05 13:38:55 +02:00
Matthias Dittrich
404ee662ac
Sparkle can now handle files with special characters
2012-07-05 13:37:18 +02:00
Hylke Bons
22fcca2fac
lib: style cleanups
2012-07-03 09:59:19 +02:00
Hylke Bons
c03bbc2fa1
repo git: Use a more descriptive flag when calling git-log
2012-07-03 09:59:18 +02:00
Hylke Bons
9692ca655e
repo git: rewrite HasLocalChanges
2012-07-03 09:59:18 +02:00
Hylke Bons
aeafa39c0d
repo git: catch IOException in ResolveConflict method
2012-07-03 09:59:18 +02:00
Hylke Bons
f28dfd0318
repo git: Fix conflict resolution
2012-07-03 09:59:18 +02:00
Hylke Bons
a7b0e775e0
repo git: refactor andf fix Rebase and FormatCommitMessage methods
2012-07-03 09:59:18 +02:00
Hylke Bons
b3040b5276
repo git: Remove some redundant lines
2012-07-03 09:59:18 +02:00
Matthias Dittrich
288317a8bb
Now filesnames with special chars will be written properly in the comments
2012-07-03 09:59:18 +02:00
Hylke Bons
aa9af2c094
lib git: Run commit with --all and deduplicate code somewhat
2012-07-03 09:59:18 +02:00
Hylke Bons
ef196d00b8
repo git: Fix coding style for #823
2012-07-03 09:59:17 +02:00
Matthias Dittrich
0be8c17a05
Found another place where the Utf8-fix is required
2012-07-03 09:59:17 +02:00
Matthias Dittrich
02487a466b
Sparkle can now handle files with special characters
2012-07-03 09:59:17 +02:00
Hylke Bons
91fdb44445
lib git: Clear git-bin cache after sync
2012-06-29 21:43:49 +01:00
Hylke Bons
865525dee2
lib git: only do remote_url check when needed
2012-06-29 17:08:12 +01:00
Hylke Bons
9dc0b6af5b
lib git: Add detection of git-bin repos
2012-06-29 16:44:02 +01:00
Hylke Bons
efccc2c1c3
fetcher git: Refactor
2012-06-29 14:00:25 +01:00
Hylke Bons
8470b06a01
fetcher git: Simplify attributes file creation
2012-06-29 13:17:59 +01:00
Hylke Bons
a4718cf100
fetcher git: Simplify install of config after clone
2012-06-29 12:53:13 +01:00
Hylke Bons
799314ceee
lib: Add separate SparkleGit and SparkleGitBin objects derived from SparkleProcess
2012-06-29 00:12:37 +01:00
Hylke Bons
4bef356142
repo git: hide .sparkleshare and .empty after a rebase. Fixes #814
2012-06-28 14:21:33 +01:00
Hylke Bons
1b04fda8f7
fetcher git: don't read output on checkout and add --quiet option
2012-06-28 12:18:00 +01:00
Hylke Bons
349410927a
repo git: don't resolve conflicts on the .sparkleshare file. See #807
2012-06-27 00:13:17 +01:00
Hylke Bons
330e80c22b
repo git: reuse git objects
2012-06-24 23:20:45 +01:00
Hylke Bons
4bee67b3d5
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
4c945e5611
lib: add folder name to debug info for each git call. Closes #796
2012-06-21 17:58:07 +01:00
Hylke Bons
090a34a3c7
lib git: treat merge commits like any other commit
2012-06-19 10:54:46 +01:00
Hylke Bons
ace1fb2c40
setup: show raw (git) error message on failed add
2012-06-17 22:57:15 +01:00
Hylke Bons
6d796f35bf
make
2012-06-17 21:56:27 +01:00
Hylke Bons
07c4d271e3
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
febd993f29
Refactor adding of (empty) repos. Fixes #773
2012-06-10 23:56:39 +01:00
Hylke Bons
fccb790a2d
repo: Simplify watch toggling mechanism
2012-06-10 11:03:03 +01:00
Hylke Bons
fe3f28d7c4
Tweak some debug output
2012-06-09 16:27:34 +01:00
Carlos Martín Nieto
a7e24dc3aa
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
43703b94f8
repo git: only squash commits by the same person
2012-05-28 00:14:00 +01:00
Hylke Bons
e1c16f0f5f
eventlog: sort changes by timestamp, not type
2012-05-27 19:24:12 +01:00
Hylke Bons
ea432c32e8
repo git: catch exceptions creating .empty files. Fixes #733
2012-05-20 12:51:09 +01:00
Hylke Bons
1a97616e38
repo: Fix edge case where ID may be empty
2012-05-19 16:15:20 +01:00
Hylke Bons
9800bcf421
Cache changesets in the backend
2012-04-29 15:19:36 +01:00
Hylke Bons
921d66baa6
Merge branch 'http'
2012-04-28 09:51:41 +01:00
Hylke Bons
8ee99fa5a0
fetcher git: override global git crlf settings. prevents some sync loops
2012-04-26 18:32:57 +01:00
Hylke Bons
b230d14d4a
Add SparkleShare.txt and .sparkleshare in a single commit
2012-04-26 16:02:59 +02:00