wimh
|
0453083424
|
Merge remote-tracking branch 'upstream/master' into windows
|
2011-10-17 21:24:41 +02:00 |
|
wimh
|
cf657259ae
|
fix errors after merge, add code to support new features
|
2011-10-17 21:20:38 +02:00 |
|
Hylke Bons
|
363209cd15
|
Fix compile error and fix some style changes for merge request 368#
|
2011-10-17 19:54:41 +02:00 |
|
Hylke Bons
|
59d4a7367f
|
Merge https://github.com/nicolaslazartekaqui/SparkleShare into ircpass
|
2011-10-17 19:43:05 +02:00 |
|
Hylke Bons
|
39ec42d167
|
git fetcher: System.Xml no longer needed here
|
2011-10-17 19:37:35 +02:00 |
|
Hylke Bons
|
537218b46e
|
git: Always use user info from global config to commit. Fixes #367
|
2011-10-17 19:34:46 +02:00 |
|
Nícolas Lazarte Kaqui
|
a3426e5ca5
|
accepting the suggestions made by hbons
|
2011-10-16 16:46:37 -02:00 |
|
Hylke Bons
|
f860e8e564
|
Add back README
|
2011-10-15 20:46:16 +01:00 |
|
wimh
|
75eb8c7f32
|
Merge remote-tracking branch 'upstream/master' into windows
Conflicts:
.gitignore
SparkleShare/SparkleStatusIcon.cs
|
2011-10-15 20:31:20 +02:00 |
|
Hylke Bons
|
806585a26b
|
Revert README to plain text version
|
2011-10-15 00:39:48 +01:00 |
|
Łukasz Jernaś
|
8c5806abda
|
Add missing file to POTFILES.in
|
2011-10-14 17:44:39 +02:00 |
|
Hylke Bons
|
ca8cd89c8b
|
Merge branch 'master' of ssh://github.com/hbons/SparkleShare
|
2011-10-13 15:05:42 +01:00 |
|
Nícolas Lazarte Kaqui
|
9a1a7f4626
|
included setting to allow or disallow access to key channels without
|
2011-10-11 12:11:12 -03:00 |
|
Łukasz Jernaś
|
221bc5bd76
|
Remove not existant fiel from POTFILES.in
|
2011-10-07 23:32:14 +02:00 |
|
Hylke Bons
|
010dedb069
|
Add Android style icons
|
2011-10-06 22:44:16 +02:00 |
|
Hylke Bons
|
984ccebb3f
|
setup: fix text field quirks
|
2011-10-06 21:02:59 +02:00 |
|
Hylke Bons
|
6f5f666a5f
|
Fix compile errors. Closes #365
|
2011-10-06 20:26:17 +02:00 |
|
Hylke Bons
|
a647223c78
|
status icon: change some terminology
|
2011-10-06 14:56:15 +02:00 |
|
Hylke Bons
|
5c3f23277c
|
setup: allow tabbing through fields on Mac. Closes #209
|
2011-10-06 12:59:10 +02:00 |
|
Hylke Bons
|
f08b47a53f
|
setup: implement descriptive error page on Mac. Closes #312
|
2011-10-06 12:27:30 +02:00 |
|
Hylke Bons
|
4021ef40c5
|
Merge branch 'master' of https://github.com/funkey/SparkleShare
|
2011-10-05 23:26:06 +02:00 |
|
Hylke Bons
|
dcd717a07b
|
New Add dialog for Mac too
|
2011-10-05 23:23:35 +02:00 |
|
Hylke Bons
|
d2d8be033c
|
Merge pull request #363 from deejay1/plugin_translations
Make plugin descriptions translatable
|
2011-10-05 02:43:38 -07:00 |
|
Łukasz Jernaś
|
7414c0e37b
|
Make plugin descriptions translatable
This includes for now only the build infrastructure,
the necessary code to actually load the translations has to be written.
|
2011-10-05 09:23:04 +02:00 |
|
Łukasz Jernaś
|
5bb3361eac
|
Update translations from Transifex
|
2011-10-05 08:22:30 +02:00 |
|
Łukasz Jernaś
|
68ddd4bc59
|
Fix Transifex URL to use HTTPS scheme
|
2011-10-05 08:20:32 +02:00 |
|
Hylke Bons
|
8ee2245f24
|
Bitbucket plugin: use git by default
|
2011-10-05 01:27:24 +02:00 |
|
Hylke Bons
|
7dcfa332b5
|
setup: select On My Own Server plugin by default
|
2011-10-05 01:21:39 +02:00 |
|
Hylke Bons
|
ca8770374f
|
setup: move logic for new Add dialolog to controller
|
2011-10-05 01:08:37 +02:00 |
|
Hylke Bons
|
8577a52e98
|
setup: use nice selection color for treeview
|
2011-10-04 16:18:20 +02:00 |
|
Jan Funke
|
73d11e0f9d
|
tcp-listener: fallback to polling instead of crashing on socket errors
|
2011-10-03 14:39:26 +02:00 |
|
wimh
|
3da25900f3
|
workaround for unexpected exception
|
2011-10-02 03:49:35 +02:00 |
|
wimh
|
dbc0fddf10
|
fix startup threading issue when Repositories is not null
|
2011-10-02 03:15:11 +02:00 |
|
wimh
|
86c84e4120
|
Merge remote-tracking branch 'tvollstaedt/issue10' into windows
|
2011-10-02 02:53:31 +02:00 |
|
wimh
|
c3a8dc4e0a
|
Copy server descriptions from old linux version
|
2011-10-02 02:31:40 +02:00 |
|
wimh
|
2dc0026e4d
|
Merge remote-tracking branch 'kozze89\windows' into windows
|
2011-10-02 02:21:55 +02:00 |
|
wimh
|
cad52d7072
|
Merge remote-tracking branch 'upstream/master' into windows, add SparkleBubbles
Conflicts:
SparkleLib/Git/SparkleRepoGit.cs
SparkleLib/SparkleListenerIrc.cs
SparkleShare/Program.cs
SparkleShare/SparkleControllerBase.cs
SparkleShare/SparkleExtensions.cs
SparkleShare/SparkleLinController.cs
SparkleShare/SparkleStatusIcon.cs
SparkleShare/SparkleUI.cs
|
2011-10-02 01:57:14 +02:00 |
|
wimh
|
9f729e5e3e
|
Merge with upstream (11a932b73e )
|
2011-10-02 00:52:21 +02:00 |
|
Hylke Bons
|
e0f7ea5d08
|
plugins: continue populating plugins when a directory wasn't found
|
2011-10-02 00:19:31 +02:00 |
|
Hylke Bons
|
528293e39d
|
build: install plugins in the right location
|
2011-10-02 00:15:57 +02:00 |
|
Hylke Bons
|
3f26071a29
|
setup: remember previous values correctly after a failed sync
|
2011-10-01 23:49:49 +02:00 |
|
Hylke Bons
|
5a9b7d4ba6
|
new Add Project dialog, powered by plugins
|
2011-10-01 23:16:25 +02:00 |
|
Jan Funke
|
1a91c6d9c2
|
do not attempt to change file attributes of symlinks
|
2011-10-01 20:08:05 +02:00 |
|
Pierre-Antoine Angelini
|
18ace1afc1
|
Update French translation from Transifex
|
2011-09-30 07:22:28 +02:00 |
|
Konstantinos Vaggelakos
|
55e7bd8daf
|
Changed the information text to something more appropriate
|
2011-09-28 12:23:45 +02:00 |
|
Konstantinos Vaggelakos
|
b76b0fa0e5
|
Added groupboxes and information for each selection when a user should add a server
|
2011-09-28 00:37:22 +02:00 |
|
Hylke Bons
|
e7c83ca06b
|
git: fix FillEmptyDirectories (somewhat)
|
2011-09-26 00:45:58 +02:00 |
|
Hylke Bons
|
3666f8fc00
|
Fix startup script
|
2011-09-25 23:22:20 +02:00 |
|
Hylke Bons
|
2081c677a1
|
fix link in README
|
2011-09-25 22:55:39 +02:00 |
|
Hylke Bons
|
2a0ef501a2
|
listener: default to the plain TCP protocol
|
2011-09-25 22:52:03 +02:00 |
|