Commit graph

4104 commits

Author SHA1 Message Date
Hylke Bons
7f3ec4e450 repo git: don't try to resolve conflicts when a rebase failed due to locked files 2012-11-21 09:22:55 +00:00
Hylke Bons
e4dc6fd787 Merge pull request #1074 from nicolas-raoul/patch-4
Won't build if pkgconfig is not installed
2012-11-21 00:02:06 -08:00
Nicolas Raoul
2872807686 Won't build if pkgconfig is not installed 2012-11-21 12:55:08 +09:00
Hylke Bons
45218144de repo git: fix getting stuck in conflict resolution loop when there are no conflicts 2012-11-20 20:33:02 +00:00
Hylke Bons
e72f0906be more cleanup 2012-11-19 15:47:28 +00:00
Hylke Bons
08003c5d27 clean up 2012-11-19 15:06:56 +00:00
Hylke Bons
ae1609ae9d controller: try moving projects from .tmp twice and add more debug output 2012-11-19 12:16:57 +00:00
Hylke Bons
00665d2bad repo git: reuse regex objects 2012-11-18 18:49:57 +00:00
Hylke Bons
17076431ac linux: fix compile error 2012-11-18 15:29:22 +00:00
Hylke Bons
a26dcd93a0 linux: fix compile error 2012-11-18 15:28:14 +00:00
Hylke Bons
b8e568ecbd statusicon: start on a new thread when forcing a retry 2012-11-18 15:00:34 +00:00
Hylke Bons
032996db67 statusicon: fix progress not appearing sometimes 2012-11-18 14:29:10 +00:00
Hylke Bons
bfc9c05cd5 repo git: catch any exceptions trying to parse transfer speeds 2012-11-18 11:36:09 +00:00
Hylke Bons
f3a7de1ed3 update News 2012-11-18 11:35:49 +00:00
Hylke Bons
7fe8b42f3b statusicon: rearrange and keep references to all NSObjects on mac 2012-11-18 11:18:23 +00:00
Hylke Bons
105bb4fc8a setup: keep header on one line 2012-11-17 23:57:13 +00:00
Hylke Bons
b395648185 pass transfer speeds in bytes, not strings. report both directions when needed. 2012-11-17 23:05:29 +00:00
Hylke Bons
44b252928f repo git: show error when we can't rebase due to locked files 2012-11-17 19:03:37 +00:00
Hylke Bons
c02129717d setup: word-wrap on list points when they're long. fixes #1068 2012-11-17 18:29:11 +00:00
Hylke Bons
4f6b6de2c1 statusicon: make sure mnemonics don't show up in folder names. #1066 2012-11-17 00:02:03 +00:00
Hylke Bons
8d9700e145 controller: simplify method 2012-11-16 11:07:04 +00:00
Hylke Bons
40ae31ad0d update Mac Readme 2012-11-16 11:06:36 +00:00
Hylke Bons
ddd2221e7c repo git: don't abort rebase on startup, fix conflicts instead. fixes #1058 2012-11-16 10:05:57 +00:00
Hylke Bons
5d96268b19 repo git: always use the default repo branch, even if it's not master 2012-11-12 22:47:40 +00:00
Hylke Bons
2874ef39fc bump version to 0.9.8 2012-11-11 21:33:57 +00:00
Hylke Bons
44df23a021 bubbles: make sure grammar for number of events is always correct 2012-11-11 19:16:32 +00:00
Hylke Bons
8562a6f08f repo git: temporarily set core.ignorecase=true when rebasing to prevent conflicts. fixes #721 2012-11-11 19:15:42 +00:00
Hylke Bons
e9ca4908bc remove buggy implementation of menu overflow. #1015 2012-11-11 12:39:28 +00:00
Hylke Bons
78a00caed8 eventlog: fix broken history for file names with unicode characters. #1023 2012-11-10 22:12:38 +00:00
Hylke Bons
cbfef5b70b remove GNOME plugin as it isn't actually used by anyone 2012-11-10 22:00:03 +00:00
Hylke Bons
fbaa87208b fetcher git: add back warning about global gitignore 2012-11-10 12:26:47 +00:00
Hylke Bons
2b696d736b fetcher git: explicitly convert to native line endings for .txt files (for Notepad) 2012-11-10 10:43:30 +00:00
Hylke Bons
8b28542ebf windows eventlog: fix unicode characters in file names. closes #1023 2012-11-09 22:32:21 +00:00
Hylke Bons
79b61e97e3 update News.txt 2012-11-09 19:51:30 +00:00
Hylke Bons
f3975a9652 bump version to 0.9.7 2012-11-09 19:25:09 +00:00
Hylke Bons
87a0ffa3ed update News with new git version requirement 2012-11-09 19:17:01 +00:00
Hylke Bons
994963ae2e fetcher git: typo in config setting 2012-11-08 16:02:55 +00:00
Hylke Bons
4cc5521755 setup: fix whitespace 2012-11-07 13:27:19 +00:00
Hylke Bons
ed4ae74e52 setup: advice user to choose a unique password on crypto setup. #1055 2012-11-07 13:16:34 +00:00
Hylke Bons
677ade0acd mac: only use notification center on Mountain Lion and above 2012-11-05 23:07:35 +00:00
Hylke Bons
9e16a0cf3c fix repos with '.git' in their name not syncing sometimes 2012-11-04 18:37:38 +00:00
Hylke Bons
e97b97deb3 fetcher: use different way to determine repo backend to fix a crash on windows 2012-11-04 18:20:01 +00:00
Hylke Bons
2f0f409f74 fetcher: make Snet repos use client side crypto by default 2012-11-04 17:43:29 +00:00
Hylke Bons
0456a4a4a0 update News 2012-11-04 16:36:01 +00:00
Hylke Bons
418c1a8b97 Allow using periods '.' and underscores '_' (will be replaced by spaces locally) in project names. fixes #1046 2012-11-04 16:27:39 +00:00
Hylke Bons
4c8a5cc1b8 setup: fix Show Files button for project names containing underscores 2012-11-04 15:46:49 +00:00
Hylke Bons
40efdba888 update Newx.txt 2012-11-04 15:45:50 +00:00
Hylke Bons
db0d3a09ea statusicon: swap menu items 2012-11-04 15:44:24 +00:00
Hylke Bons
1feb841142 controller: treat treat underscores in project names as spaces 2012-11-04 13:13:50 +00:00
Hylke Bons
fa4b132ed5 windows: don't set PLINK_PROTOCOL anymore. #1047 2012-11-04 11:11:48 +00:00