friendica
39a49d51e3
remove stray debugging
10 years ago
friendica
496a0ce4d1
Merge branch 'pull'
10 years ago
friendica
7431bd9509
fix html reshares when editplain in use
10 years ago
Simon
1fae778421
Merge pull request #94 from beardy-unixer/master
...
Documentation changes
10 years ago
Simon
decc9e5798
Merge pull request #99 from tomtom84/master
...
fixes in theme diabook
10 years ago
friendica
a464e4d33f
search should be ok, but a little extra security won't hurt
10 years ago
friendica
009a826a49
Merge branch 'pull'
10 years ago
friendica
a5e7c73e67
string update
10 years ago
tommy tomson
6a5c4bab9c
messages-menu translation, add scroll-to-top and theme-bug-report in theme
10 years ago
Simon
886d825869
Merge pull request #98 from simonlnu/master
...
missed some fixes on last request
10 years ago
Simon L'nu
edd450cf06
dispy, dispy, oh what a little lispy
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
friendica
21887a36fd
[PRIVACY] privacy issue bug #314
10 years ago
Simon L'nu
0badf3110f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
bugs #312 , #313
revup
* master:
10 years ago
friendica
8fb0ea4048
bugs #312 , #313
10 years ago
friendica
4e0524e91a
Merge branch 'pull'
10 years ago
friendica
731b19c025
revup
10 years ago
Simon
073241a77a
Merge pull request #95 from simonlnu/master
...
styling fixes in dispy; typos fixed in settings.tpl
10 years ago
Simon L'nu
bc8b014906
styling fixes in dispy. fix typos in settings.tpl
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
Thomas
67456bad06
Fixed...merged with mainline THEN added beards.
10 years ago
Thomas
a265afe7eb
added beard smileys
10 years ago
Simon L'nu
d647dbc6af
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
remove "smilie" expansion for Diaspora logo
prevent duplicate likes
quattro: theme settings (a bit hackish)
add img
fixes in diabook
finalise spam storage model, begin driver changes.
fixes
template proc: add variable filters
* master:
10 years ago
Thomas
7e10401ec0
doc/Account-Basics.md
10 years ago
Thomas
bab865b14e
doc/Account-Basics.md
10 years ago
Thomas
aed5a8e2e5
a
10 years ago
Thomas
6720c83a4a
doc/Remove-Account.md
10 years ago
Thomas
2772bb7f58
doc/Making-Friends.md
10 years ago
Thomas
ec1740cd40
doc/Bugs-and-Issues.md
10 years ago
Thomas
1bf9f3823c
doc/Account-Basics.md
10 years ago
fabrixxm
a9690dfe2d
Merge pull request #93 from fabrixxm/master
...
quattro: theme settings
10 years ago
friendica
eec4cff84b
remove "smilie" expansion for Diaspora logo
10 years ago
friendica
23718bfc25
prevent duplicate likes
10 years ago
friendica
c0e0034f06
Merge branch 'pull'
10 years ago
Fabio Comuni
607ee1ff9c
quattro: theme settings (a bit hackish)
10 years ago
Fabio Comuni
be9985a3ae
Merge remote-tracking branch 'friendica/master'
10 years ago
tomtom84
d04fba7048
Merge pull request #92 from tomtom84/master
...
fixes in theme diabbook
10 years ago
tommy tomson
8b0dd349f5
add img
10 years ago
tommy tomson
eaaf030c18
Merge remote-tracking branch 'origin/master'
10 years ago
tommy tomson
b64b1d13a4
fixes in diabook
10 years ago
friendica
3da97e2393
finalise spam storage model, begin driver changes.
10 years ago
Simon L'nu
2a3aaca88d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
some admin page fixes and cleanup
changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero)
string update
some testbubble stuff
can_write_wall documentation
* master:
10 years ago
friendica
321b651635
Merge branch 'pull'
10 years ago
friendica
23460302f5
some admin page fixes and cleanup
10 years ago
Simon
d49dc1434f
Merge pull request #91 from unary/darkzero
...
changed bg color around comment box from white to match page background,...
10 years ago
Michael Johnston
9f44dbbb48
changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero)
10 years ago
friendica
8473444242
string update
10 years ago
friendica
e5de03040e
Merge branch 'pull'
10 years ago
friendica
7b3349f38a
some testbubble stuff
10 years ago
Simon
b6765ad742
Merge pull request #90 from simonlnu/master
...
field_help tweak
10 years ago
Simon L'nu
1aa2367469
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
10 years ago
Simon L'nu
190650060a
forgot a small change in .field_help
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago