tommy tomson
ec3ce05357
fix in navbar
2012-03-07 08:42:19 +01:00
Simon L'nu
edfa7dbac2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix photos after permissions_sql change
[privacy] rework latest fix
remove stray debugging
* master:
2012-03-06 21:33:56 -05:00
friendica
7ad2dd6565
fix photos after permissions_sql change
2012-03-06 17:52:00 -08:00
friendica
1224e256b1
Merge branch 'pull'
2012-03-06 17:22:13 -08:00
friendica
88cd5800cf
[privacy] rework latest fix
2012-03-06 17:21:14 -08:00
friendica
39a49d51e3
remove stray debugging
2012-03-06 16:28:52 -08:00
Thomas
73fc4cfc72
removed dolphin file (wtf?)
2012-03-07 00:12:24 +00:00
Thomas
30d6b4c10e
.
2012-03-07 00:08:50 +00:00
Simon L'nu
d89cd6569b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
improved smiley transparency
* master:
2012-03-06 19:06:02 -05:00
Simon
fdd269228b
Merge pull request #102 from beardy-unixer/master
...
Improved transparency smileys
2012-03-06 16:05:35 -08:00
Simon L'nu
c4c98a9988
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix in navbar
* master:
2012-03-06 18:57:52 -05:00
Thomas
dadf80f644
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
images/smiley-beard.png
2012-03-06 23:56:37 +00:00
Thomas
22624917e0
improved smiley transparency
2012-03-06 23:54:31 +00:00
tomtom84
05a52b2660
Merge pull request #101 from tomtom84/master
...
fixes in theme diabook
2012-03-06 15:49:32 -08:00
tommy tomson
49b5a1bf20
fix in navbar
2012-03-07 00:47:43 +01:00
Simon L'nu
668892b7a3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-06 18:42:00 -05:00
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
2012-03-06 15:41:45 -08:00
Simon L'nu
415ca107fd
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix html reshares when editplain in use
* master:
2012-03-06 18:38:44 -05:00
friendica
496a0ce4d1
Merge branch 'pull'
2012-03-06 15:29:18 -08:00
friendica
7431bd9509
fix html reshares when editplain in use
2012-03-06 15:28:27 -08:00
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:
2012-03-06 18:26:22 -05:00
Simon
1fae778421
Merge pull request #94 from beardy-unixer/master
...
Documentation changes
2012-03-06 15:24:15 -08:00
Simon
decc9e5798
Merge pull request #99 from tomtom84/master
...
fixes in theme diabook
2012-03-06 15:22:55 -08:00
friendica
a464e4d33f
search should be ok, but a little extra security won't hurt
2012-03-06 15:15:59 -08:00
Simon L'nu
94d4cad701
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
string update
[PRIVACY] privacy issue bug #314
* master:
2012-03-06 18:15:45 -05:00
friendica
009a826a49
Merge branch 'pull'
2012-03-06 15:10:22 -08:00
friendica
a5e7c73e67
string update
2012-03-06 15:09:57 -08:00
tommy tomson
6a5c4bab9c
messages-menu translation, add scroll-to-top and theme-bug-report in theme
2012-03-07 00:07:27 +01:00
Simon
886d825869
Merge pull request #98 from simonlnu/master
...
missed some fixes on last request
2012-03-06 15:04:50 -08:00
Simon L'nu
edd450cf06
dispy, dispy, oh what a little lispy
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-06 17:55:05 -05:00
friendica
21887a36fd
[PRIVACY] privacy issue bug #314
2012-03-06 14:53:14 -08:00
Simon L'nu
0badf3110f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
bugs #312 , #313
revup
* master:
2012-03-06 17:52:12 -05:00
friendica
8fb0ea4048
bugs #312 , #313
2012-03-06 14:27:53 -08:00
friendica
4e0524e91a
Merge branch 'pull'
2012-03-06 13:58:26 -08:00
friendica
731b19c025
revup
2012-03-06 13:57:38 -08:00
Simon
073241a77a
Merge pull request #95 from simonlnu/master
...
styling fixes in dispy; typos fixed in settings.tpl
2012-03-06 13:20:20 -08:00
Simon L'nu
bc8b014906
styling fixes in dispy. fix typos in settings.tpl
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-06 16:18:26 -05:00
Thomas
67456bad06
Fixed...merged with mainline THEN added beards.
2012-03-06 20:50:38 +00:00
Thomas
a265afe7eb
added beard smileys
2012-03-06 20:44:53 +00:00
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:
2012-03-06 14:51:14 -05:00
Thomas
7e10401ec0
doc/Account-Basics.md
2012-03-06 19:15:40 +00:00
Thomas
bab865b14e
doc/Account-Basics.md
2012-03-06 19:15:24 +00:00
Thomas
aed5a8e2e5
a
2012-03-06 19:11:24 +00:00
Thomas
6720c83a4a
doc/Remove-Account.md
2012-03-06 19:07:15 +00:00
Thomas
2772bb7f58
doc/Making-Friends.md
2012-03-06 19:04:42 +00:00
Thomas
ec1740cd40
doc/Bugs-and-Issues.md
2012-03-06 18:55:45 +00:00
Thomas
1bf9f3823c
doc/Account-Basics.md
2012-03-06 18:48:39 +00:00
fabrixxm
a9690dfe2d
Merge pull request #93 from fabrixxm/master
...
quattro: theme settings
2012-03-06 05:09:03 -08:00
friendica
eec4cff84b
remove "smilie" expansion for Diaspora logo
2012-03-06 04:28:45 -08:00
friendica
23718bfc25
prevent duplicate likes
2012-03-06 02:17:55 -08:00
