Alexander Kampmann
f84c191f8d
added some tests
9 years ago
Alexander Kampmann
2e3116a11e
added library and include to .htaccess
9 years ago
Alexander Kampmann
fbd7e8f8ba
excludes reports from git
9 years ago
Alexander Kampmann
185fcd0701
better tests
9 years ago
Alexander Kampmann
4690d00141
Merge branch 'master' of git://github.com/friendica/friendica
9 years ago
Alexander Kampmann
b2df1205ef
merged
9 years ago
tomtom84
dd2ff7c796
Merge pull request #103 from tomtom84/master
fixes in theme diabook
9 years ago
tommy tomson
ec3ce05357
fix in navbar
9 years ago
friendica
7ad2dd6565
fix photos after permissions_sql change
9 years ago
friendica
1224e256b1
Merge branch 'pull'
9 years ago
friendica
88cd5800cf
[privacy] rework latest fix
9 years ago
friendica
39a49d51e3
remove stray debugging
9 years ago
Simon
fdd269228b
Merge pull request #102 from beardy-unixer/master
Improved transparency smileys
9 years ago
Thomas
dadf80f644
Merge remote-tracking branch 'upstream/master'
Conflicts:
images/smiley-beard.png
9 years ago
Thomas
22624917e0
improved smiley transparency
9 years ago
tomtom84
05a52b2660
Merge pull request #101 from tomtom84/master
fixes in theme diabook
9 years ago
tommy tomson
49b5a1bf20
fix in navbar
9 years ago
Simon
18213692db
Merge pull request #100 from simonlnu/master
fix up the beards so text.php has the right smiley- prefix for them. make one of them transparent and .png
9 years ago
Simon L'nu
415ca107fd
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
fix html reshares when editplain in use
* master:
9 years ago
friendica
496a0ce4d1
Merge branch 'pull'
9 years ago
friendica
7431bd9509
fix html reshares when editplain in use
9 years ago
Simon L'nu
a33ca0a731
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
search should be ok, but a little extra security won't hurt
messages-menu translation, add scroll-to-top and theme-bug-report in theme
Fixed...merged with mainline THEN added beards.
added beard smileys
doc/Account-Basics.md
doc/Account-Basics.md
a
doc/Remove-Account.md
doc/Making-Friends.md
doc/Bugs-and-Issues.md
doc/Account-Basics.md
* master:
9 years ago
Simon
1fae778421
Merge pull request #94 from beardy-unixer/master
Documentation changes
9 years ago
Simon
decc9e5798
Merge pull request #99 from tomtom84/master
fixes in theme diabook
9 years ago
friendica
a464e4d33f
search should be ok, but a little extra security won't hurt
9 years ago
Simon L'nu
94d4cad701
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
string update
[PRIVACY] privacy issue bug #314
* master:
9 years ago
friendica
009a826a49
Merge branch 'pull'
9 years ago
friendica
a5e7c73e67
string update
9 years ago
tommy tomson
6a5c4bab9c
messages-menu translation, add scroll-to-top and theme-bug-report in theme
9 years ago
Simon
886d825869
Merge pull request #98 from simonlnu/master
missed some fixes on last request
9 years ago
Simon L'nu
edd450cf06
dispy, dispy, oh what a little lispy
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
9 years ago
friendica
21887a36fd
[PRIVACY] privacy issue bug #314
9 years ago
Simon L'nu
0badf3110f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
bugs #312 , #313
revup
* master:
9 years ago
friendica
8fb0ea4048
bugs #312 , #313
9 years ago
friendica
4e0524e91a
Merge branch 'pull'
9 years ago
friendica
731b19c025
revup
9 years ago
Simon
073241a77a
Merge pull request #95 from simonlnu/master
styling fixes in dispy; typos fixed in settings.tpl
9 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>
9 years ago
Thomas
67456bad06
Fixed...merged with mainline THEN added beards.
9 years ago
Thomas
a265afe7eb
added beard smileys
9 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:
9 years ago
Thomas
7e10401ec0
doc/Account-Basics.md
9 years ago
Thomas
bab865b14e
doc/Account-Basics.md
9 years ago
Thomas
aed5a8e2e5
a
9 years ago
Thomas
6720c83a4a
doc/Remove-Account.md
9 years ago
Thomas
2772bb7f58
doc/Making-Friends.md
9 years ago
Thomas
ec1740cd40
doc/Bugs-and-Issues.md
9 years ago
Thomas
1bf9f3823c
doc/Account-Basics.md
9 years ago
fabrixxm
a9690dfe2d
Merge pull request #93 from fabrixxm/master
quattro: theme settings
9 years ago
friendica
eec4cff84b
remove "smilie" expansion for Diaspora logo
9 years ago