zottel
6000e7f30d
Merge remote branch 'upstream/master'
2012-05-02 08:11:52 +02:00
friendica
becdb1f508
final touches - show friends in common with total strangers from different sites
2012-05-01 21:22:27 -07:00
friendica
1fab28c413
fix size
2012-05-01 20:38:06 -07:00
friendica
e247ed3de2
cross fingers
2012-05-01 20:36:35 -07:00
friendica
594803afca
reduce the scope a bit
2012-05-01 20:33:19 -07:00
friendica
066d69b21c
add template
2012-05-01 20:22:59 -07:00
friendica
72dbc2faee
fn not found
2012-05-01 20:11:35 -07:00
friendica
91085f0969
really fat fingers today - though none of this has gone further than my own site
2012-05-01 19:24:22 -07:00
friendica
15c1850156
another one
2012-05-01 19:20:41 -07:00
friendica
1fc796b276
typo
2012-05-01 19:19:24 -07:00
friendica
8bd6e1aef9
first try common friends for visitors
2012-05-01 19:16:18 -07:00
friendica
f24ffa8ef0
improve handling of relative feed url's
2012-05-01 17:10:26 -07:00
friendica
6914bdce17
Merge https://github.com/friendica/friendica into pull
2012-05-01 15:50:14 -07:00
friendica
38ccd2e655
convert html entities to utf-8 before email header encoding
2012-05-01 15:49:22 -07:00
Thomas Willingham
671a10f5d4
More Diabook-dark touch-ups. Should *really* be useable this time...with editplain anyway.
2012-05-01 21:37:49 +01:00
Thomas Willingham
a5f78cf655
modified: images/smiley-thumbsup.gif
...
Restored some yellow where there shouldn't have been transparency.
Probably introduced by me in the first place.
2012-05-01 21:05:55 +01:00
tommy tomson
ab556857f0
diabook-themes: small fix at "community pages"-box
2012-05-01 16:46:08 +02:00
friendica
0ca4fa78c8
link socgraph to zrls
2012-05-01 01:34:47 -07:00
friendica
f8acb32961
Merge https://github.com/friendica/friendica into pull
2012-05-01 01:19:02 -07:00
friendica
584ac68ae4
adding zrl support to social graphs
2012-05-01 01:16:47 -07:00
Simon
facffe1745
Merge pull request #281 from simonlnu/master
...
font and background adjustments
2012-05-01 01:03:52 -07:00
Simon L'nu
6d3ba2825b
lighten bg and darken font on dispy light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-01 04:02:56 -04:00
Simon L'nu
5d6296b81b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
hidden plugins (add .hidden file to dir)
* master:
2012-05-01 04:02:17 -04:00
zottel
2e2bb5e8b0
Merge remote branch 'upstream/master'
2012-05-01 08:21:12 +02:00
friendica
f175af05f9
Merge https://github.com/friendica/friendica into pull
2012-04-30 23:08:31 -07:00
friendica
d48cd0f9a3
hidden plugins (add .hidden file to dir)
2012-04-30 23:07:52 -07:00
Simon
b8b0b3a87d
Merge pull request #280 from simonlnu/master
...
added a / for consistency's sake ;p
2012-04-30 22:57:28 -07:00
Simon L'nu
e245ecddf2
sub-minor change to head.tpl
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-01 01:56:21 -04:00
Simon L'nu
46558e98a8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: add "community profiles"-box to right_column
change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it
make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter
rev update
start adding tooltips to tab menus
fix join group notifications
* master:
2012-05-01 00:49:42 -04:00
tommy tomson
2c577ed90f
diabook-themes: add "community profiles"-box to right_column
2012-05-01 06:21:40 +02:00
friendica
25afec0f81
Merge pull request #279 from fermionic/generate-random-id-bug-in-statusnet-api
...
Bug in StatusNet API
2012-04-30 20:45:10 -07:00
Zach Prezkuta
a844093365
change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it
2012-04-30 20:51:22 -06:00
friendica
a3a55897e5
Merge https://github.com/friendica/friendica into pull
2012-04-30 19:04:28 -07:00
friendica
3c0cf72716
make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it
...
also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
2012-04-30 19:01:41 -07:00
tommy tomson
f35ffa9b60
diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter
2012-05-01 02:33:55 +02:00
friendica
88c77083e6
rev update
2012-04-30 17:17:19 -07:00
friendica
05df5337dd
start adding tooltips to tab menus
2012-04-30 05:15:29 -07:00
friendica
5d10672fb8
fix join group notifications
2012-04-30 04:11:42 -07:00
Simon L'nu
9b7dac6ce1
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
provide "xxx joined yyy" notifications
adding META viewport tag for better look on tablets
Update Esperanto to 100%
DE update to the strings
activitystreams schema constants for "join group"
missed a db field
typo in profile_selectors, fix remote tagging
not all profile selector choices have unique or direct translations
log db error strings in all cases
admin page to manage failed updates
improved db error logging
close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw)
* master:
2012-04-30 06:02:38 -04:00
friendica
9f18c9d664
Merge pull request #277 from mschmitt/master
...
Update Esperanto to 100%
2012-04-30 01:29:50 -07:00
friendica
6b9ac25398
Merge pull request #278 from max-weller/meta_viewport
...
adding META viewport tag for better look on tablets
2012-04-30 01:29:35 -07:00
friendica
52e4098a3d
Merge https://github.com/friendica/friendica into pull
2012-04-30 01:26:06 -07:00
friendica
3ff8fe53a2
provide "xxx joined yyy" notifications
2012-04-30 01:25:25 -07:00
Max Weller
9d8a0553ac
adding META viewport tag for better look on tablets
2012-04-30 09:48:21 +02:00
Martin Schmitt
5b9f01c3ab
Update Esperanto to 100%
2012-04-30 09:00:03 +02:00
Tobias Diekershoff
36522c4341
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-30 08:40:06 +02:00
Tobias Diekershoff
f08dc392df
DE update to the strings
2012-04-30 08:39:12 +02:00
friendica
0639f645d2
activitystreams schema constants for "join group"
2012-04-29 23:15:12 -07:00
friendica
384d28a6bd
Merge pull request #276 from tomtom84/master
...
close one menu (like notificationsmenu) when another one is opened (like when clicking somewhere else)
2012-04-29 22:39:29 -07:00
friendica
da555286d6
missed a db field
2012-04-29 22:36:26 -07:00
