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
|
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
|
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
|
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
|
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
|
3496bfba75
|
Some rearrangements
|
2012-07-14 12:45:54 +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
|
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
|
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 |
|