Hylke Bons
|
7ea3665e30
|
Merge pull request #250 from thelightmaker/patch-1
Small german translation update ...
|
2011-06-25 04:25:44 -07:00 |
|
thelightmaker
|
6fd4c172fa
|
Small german translation update ...
|
2011-06-25 00:44:19 -07:00 |
|
Hylke
|
ee51f685ef
|
don't show a notification on new notes
|
2011-06-24 23:55:23 +01:00 |
|
Hylke
|
b9eab774dc
|
git fetch all branches
|
2011-06-24 23:43:11 +01:00 |
|
Hylke
|
52e44b2053
|
add note fetching line to config
|
2011-06-24 23:23:41 +01:00 |
|
Hylke
|
6bc6b45a8f
|
Integrate notes on linux
|
2011-06-24 22:58:20 +01:00 |
|
thelightmaker
|
ff9ef83910
|
Delete 6 whitespaces. Hope this passed.
|
2011-06-24 13:05:39 -07:00 |
|
thelightmaker
|
e086cfc94f
|
Updated contributors list
|
2011-06-24 12:43:40 -07:00 |
|
thelightmaker
|
4d2ab5ce2c
|
Updated german translation
|
2011-06-24 12:36:32 -07:00 |
|
Hylke
|
ef292b34cc
|
Merge branch 'master' into notes
Conflicts:
SparkleLib/Git/SparkleRepoGit.cs
|
2011-06-24 19:13:02 +01:00 |
|
Hylke
|
a9455c0608
|
controller: trim arguments before passing to the fetcher
|
2011-06-24 18:39:59 +01:00 |
|
wimh
|
d541f2179f
|
fix merge issues
|
2011-06-23 22:05:09 +02:00 |
|
wimh
|
0fb2bc840e
|
Merge remote branch 'upstream/master' into merge
|
2011-06-23 20:39:41 +02:00 |
|
wimh
|
8a8cba9c0f
|
Merge remote branch 'BlackHawkDesign\master' into merge
|
2011-06-23 20:39:26 +02:00 |
|
wimh
|
a97b7d9647
|
Merge commit '4f59a03a6f395b1db7d6' into merge
|
2011-06-23 20:38:21 +02:00 |
|
Hylke
|
6889b42963
|
Merge branch 'master' of github.com:hbons/SparkleShare
|
2011-06-23 15:24:08 +01:00 |
|
Hylke
|
c5a092c8a4
|
repo: don't show warning statusicon upon initial commit
|
2011-06-23 13:56:25 +01:00 |
|
Hylke Bons
|
7fc565629d
|
add todo
|
2011-06-23 12:17:24 +01:00 |
|
Hylke Bons
|
0d1f8c9ce5
|
Merge branch 'notes' of ssh://github.com/hbons/SparkleShare into notes
|
2011-06-23 01:45:34 +01:00 |
|
Hylke Bons
|
bb2987c328
|
controller: sort changeset notes
|
2011-06-23 01:44:44 +01:00 |
|
Hylke Bons
|
031c82dd59
|
Only show hand cursor on collapsed form
|
2011-06-23 01:44:44 +01:00 |
|
Hylke Bons
|
16e0775c35
|
expand changesets with notes by default
|
2011-06-23 01:44:44 +01:00 |
|
Hylke Bons
|
25e08545d2
|
continue implementing notes
|
2011-06-23 01:44:43 +01:00 |
|
Hylke Bons
|
b7c9fe4431
|
save progress on notes
|
2011-06-23 01:44:43 +01:00 |
|
Hylke Bons
|
de98e29f70
|
Add each note to its own namespace to avoid conflicts
|
2011-06-23 01:44:43 +01:00 |
|
Hylke Bons
|
a801f68340
|
fix AddNote, add Note object
|
2011-06-23 01:44:43 +01:00 |
|
Hylke Bons
|
1d5dd2a8b0
|
make adding a note work
|
2011-06-23 01:44:43 +01:00 |
|
Hylke Bons
|
f1ff61950c
|
add AddNote method
|
2011-06-23 01:44:43 +01:00 |
|
Hylke Bons
|
5c6d6c00b6
|
make jquery work
|
2011-06-23 01:44:43 +01:00 |
|
Hylke Bons
|
de2a4bafaa
|
include jQuery
|
2011-06-23 01:44:43 +01:00 |
|
Hylke Bons
|
a83f1101cd
|
more layout work
|
2011-06-23 01:44:43 +01:00 |
|
Hylke Bons
|
e0aae807fd
|
more layout stuff
|
2011-06-23 01:44:42 +01:00 |
|
Hylke Bons
|
43354e585f
|
adjust html for notes
|
2011-06-23 01:44:42 +01:00 |
|
Hylke Bons
|
b8154415c9
|
controller: catch all exceptions related to calculating folder size
|
2011-06-23 01:29:12 +01:00 |
|
Hylke Bons
|
f7dbd043dd
|
statusicon: remove warning
|
2011-06-23 01:08:09 +01:00 |
|
Hylke Bons
|
b5468553b0
|
event log: revert to All Folders when deleting a folder and said folder is displayed in the event log
|
2011-06-23 01:04:44 +01:00 |
|
Hylke Bons
|
848b1ccde1
|
event log: select All Folders when updating chooser
|
2011-06-23 00:55:01 +01:00 |
|
Hylke Bons
|
ac6e8f56df
|
controller: sort changeset notes
|
2011-06-23 00:16:31 +01:00 |
|
Hylke Bons
|
a5bdb41736
|
Only show hand cursor on collapsed form
|
2011-06-23 00:09:31 +01:00 |
|
Hylke Bons
|
8d979d4e7b
|
controller: quote key path when importing key
|
2011-06-22 23:40:43 +01:00 |
|
Hylke Bons
|
7a8602d4ef
|
expand changesets with notes by default
|
2011-06-22 23:33:47 +01:00 |
|
Hylke Bons
|
cd9c5ff78d
|
continue implementing notes
|
2011-06-22 20:38:14 +01:00 |
|
Hylke Bons
|
5fe1841992
|
Merge branch 'master' of ssh://github.com/hbons/SparkleShare
|
2011-06-22 16:02:59 +01:00 |
|
Hylke Bons
|
75afaff2cd
|
repo: ignore external watchers when watching is disabled
|
2011-06-22 16:02:38 +01:00 |
|
Hylke Bons
|
3e02724bb6
|
repo: ignore external watchers when watching is disabled
|
2011-06-22 16:02:03 +01:00 |
|
Hylke Bons
|
9c0982f06d
|
save progress on notes
|
2011-06-22 02:03:27 +01:00 |
|
Hylke Bons
|
c3e890c9fa
|
Add each note to its own namespace to avoid conflicts
|
2011-06-21 20:15:40 +01:00 |
|
Hylke Bons
|
a4acca4e4f
|
fix AddNote, add Note object
|
2011-06-21 19:37:04 +01:00 |
|
Hylke Bons
|
42d8039de6
|
make adding a note work
|
2011-06-21 01:04:21 +01:00 |
|
Hylke Bons
|
b1347297b5
|
add AddNote method
|
2011-06-20 23:55:18 +01:00 |
|