This website requires JavaScript.
d89cd6569b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-06 19:06:02 -05:00
fdd269228b
Merge pull request #102 from beardy-unixer/master
2012-03-06 16:05:35 -08:00
c4c98a9988
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-06 18:57:52 -05:00
dadf80f644
Merge remote-tracking branch 'upstream/master'
2012-03-06 23:56:37 +00:00
22624917e0
improved smiley transparency
2012-03-06 23:54:31 +00:00
05a52b2660
Merge pull request #101 from tomtom84/master
2012-03-06 15:49:32 -08:00
49b5a1bf20
fix in navbar
2012-03-07 00:47:43 +01:00
668892b7a3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-06 18:42:00 -05:00
18213692db
Merge pull request #100 from simonlnu/master
2012-03-06 15:41:45 -08:00
415ca107fd
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-06 18:38:44 -05:00
496a0ce4d1
Merge branch 'pull'
2012-03-06 15:29:18 -08:00
7431bd9509
fix html reshares when editplain in use
2012-03-06 15:28:27 -08:00
a33ca0a731
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-06 18:26:22 -05:00
1fae778421
Merge pull request #94 from beardy-unixer/master
2012-03-06 15:24:15 -08:00
decc9e5798
Merge pull request #99 from tomtom84/master
2012-03-06 15:22:55 -08:00
a464e4d33f
search should be ok, but a little extra security won't hurt
2012-03-06 15:15:59 -08:00
94d4cad701
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-06 18:15:45 -05:00
009a826a49
Merge branch 'pull'
2012-03-06 15:10:22 -08:00
a5e7c73e67
string update
2012-03-06 15:09:57 -08:00
6a5c4bab9c
messages-menu translation, add scroll-to-top and theme-bug-report in theme
2012-03-07 00:07:27 +01:00
886d825869
Merge pull request #98 from simonlnu/master
2012-03-06 15:04:50 -08:00
edd450cf06
dispy, dispy, oh what a little lispy
2012-03-06 17:55:05 -05:00
21887a36fd
[PRIVACY] privacy issue bug #314
2012-03-06 14:53:14 -08:00
0badf3110f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-06 17:52:12 -05:00
8fb0ea4048
bugs #312 , #313
2012-03-06 14:27:53 -08:00
4e0524e91a
Merge branch 'pull'
2012-03-06 13:58:26 -08:00
731b19c025
revup
2012-03-06 13:57:38 -08:00
073241a77a
Merge pull request #95 from simonlnu/master
2012-03-06 13:20:20 -08:00
bc8b014906
styling fixes in dispy. fix typos in settings.tpl
2012-03-06 16:18:26 -05:00
67456bad06
Fixed...merged with mainline THEN added beards.
2012-03-06 20:50:38 +00:00
a265afe7eb
added beard smileys
2012-03-06 20:44:53 +00:00
d647dbc6af
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-06 14:51:14 -05:00
7e10401ec0
doc/Account-Basics.md
2012-03-06 19:15:40 +00:00
bab865b14e
doc/Account-Basics.md
2012-03-06 19:15:24 +00:00
aed5a8e2e5
a
2012-03-06 19:11:24 +00:00
6720c83a4a
doc/Remove-Account.md
2012-03-06 19:07:15 +00:00
2772bb7f58
doc/Making-Friends.md
2012-03-06 19:04:42 +00:00
ec1740cd40
doc/Bugs-and-Issues.md
2012-03-06 18:55:45 +00:00
1bf9f3823c
doc/Account-Basics.md
2012-03-06 18:48:39 +00:00
a9690dfe2d
Merge pull request #93 from fabrixxm/master
2012-03-06 05:09:03 -08:00
eec4cff84b
remove "smilie" expansion for Diaspora logo
2012-03-06 04:28:45 -08:00
23718bfc25
prevent duplicate likes
2012-03-06 02:17:55 -08:00
c0e0034f06
Merge branch 'pull'
2012-03-06 01:04:16 -08:00
607ee1ff9c
quattro: theme settings (a bit hackish)
2012-03-06 09:50:18 +01:00
be9985a3ae
Merge remote-tracking branch 'friendica/master'
2012-03-06 09:48:08 +01:00
d04fba7048
Merge pull request #92 from tomtom84/master
2012-03-05 23:34:24 -08:00
8b0dd349f5
add img
2012-03-06 08:31:54 +01:00
eaaf030c18
Merge remote-tracking branch 'origin/master'
2012-03-06 08:28:21 +01:00
b64b1d13a4
fixes in diabook
2012-03-06 08:27:20 +01:00
3da97e2393
finalise spam storage model, begin driver changes.
2012-03-05 23:20:42 -08:00
2a3aaca88d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-05 23:36:22 -05:00
321b651635
Merge branch 'pull'
2012-03-05 18:52:15 -08:00
23460302f5
some admin page fixes and cleanup
2012-03-05 18:51:21 -08:00
d49dc1434f
Merge pull request #91 from unary/darkzero
2012-03-05 18:21:15 -08:00
9f44dbbb48
changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero)
2012-03-05 21:10:01 -05:00
8473444242
string update
2012-03-05 16:43:44 -08:00
e5de03040e
Merge branch 'pull'
2012-03-05 15:59:28 -08:00
7b3349f38a
some testbubble stuff
2012-03-05 15:58:26 -08:00
b6765ad742
Merge pull request #90 from simonlnu/master
2012-03-05 15:19:02 -08:00
1aa2367469
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-05 18:18:04 -05:00
190650060a
forgot a small change in .field_help
2012-03-05 18:16:51 -05:00
c47bae7a5f
Merge branch 'pull'
2012-03-05 15:05:09 -08:00
c37ffd2999
can_write_wall documentation
2012-03-05 15:04:43 -08:00
4b456e2273
Merge pull request #89 from simonlnu/master
2012-03-05 14:57:51 -08:00
50824bddd0
implement more of the changes requested
2012-03-05 17:57:04 -05:00
6a0729d5a4
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-05 17:56:38 -05:00
0d9c2ca06f
Merge branch 'pull'
2012-03-05 13:38:06 -08:00
c6dce8dd6b
revup
2012-03-05 13:37:32 -08:00
a406c16581
fixes
2012-03-05 22:31:03 +01:00
fbc017cdba
added test blueprints, fixed? encoding issues
2012-03-05 22:22:10 +01:00
092115ca44
Merge pull request #88 from simonlnu/master
2012-03-05 12:57:30 -08:00
9d461846e2
multiple fixes; the jot-header works as standalone, not sure what's up.
2012-03-05 15:55:17 -05:00
7f894794e4
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-05 13:17:40 -05:00
1772037c98
Merge pull request #87 from simonlnu/master
2012-03-05 10:17:26 -08:00
02f825ca3c
tweak sizing of <section> and <aside> more; fix link in 'view contacts' in sidebar
2012-03-05 13:16:28 -05:00
e05313f88f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-05 12:23:16 -05:00
fd240687b9
Merge pull request #86 from simonlnu/master
2012-03-05 09:23:01 -08:00
ef1d02e7bd
still working on jot-header. amending <aside> and other elements
2012-03-05 12:21:50 -05:00
8cce12f28a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-05 10:56:58 -05:00
e786e4253d
Merge pull request #85 from simonlnu/master
2012-03-05 07:56:43 -08:00
65b6ec79ed
hopefully fix the overflow issue everywhere this time
2012-03-05 10:55:26 -05:00
3ab7132b64
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-05 10:17:34 -05:00
965e657c20
$name appearing on testbubble items
2012-03-05 03:10:45 -08:00
31f192bb57
Merge branch 'pull'
2012-03-05 00:54:25 -08:00
0d97799324
testbubble notifications
2012-03-05 00:53:42 -08:00
49d9dd374c
Merge pull request #84 from simonlnu/master
2012-03-04 22:09:56 -08:00
7de79a8c49
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-05 01:08:54 -05:00
fe7a6b070d
yet more ui things, and bug fixing
2012-03-05 01:08:45 -05:00
9c541dbd67
Merge pull request #83 from tomtom84/master
2012-03-04 20:15:26 -08:00
fe614b4e7c
like dislike button
2012-03-05 05:14:08 +01:00
290fdefa82
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-04 22:20:42 -05:00
04527bd0b1
Merge pull request #80 from unary/darkzero
2012-03-04 19:19:45 -08:00
3b95171824
Merge pull request #82 from simonlnu/master
2012-03-04 19:19:08 -08:00
58cdf776b6
more ui thingies with dispy - we'll get you well dispy, we promise
2012-03-04 22:16:10 -05:00
b57247d6a6
Merge branch 'pull'
2012-03-04 19:15:42 -08:00
b34dd1ca71
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-04 22:15:28 -05:00
b9bea3a549
wrap title and text for editplain in zero and TB themes
2012-03-04 19:14:03 -08:00
fba089012a
correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode
2012-03-04 18:50:32 -08:00
e52891d8ab
fixes in diabook
2012-03-05 03:08:58 +01:00
d369fcc994
Merge pull request #81 from tomtom84/master
2012-03-04 17:46:48 -08:00
Simon L'nu
Simon
Thomas
tomtom84
tommy tomson
friendica
fabrixxm
Michael Johnston
Alexander Kampmann