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