This website requires JavaScript.
8f26e698e6
Merge pull request #289 from cvogeley/master
2012-05-05 05:04:05 -07:00
f9f62ee7ec
DE: new email templates translated
2012-05-05 09:11:25 +02:00
d0dd22af57
workaround to clean up orphaned filetags
2012-05-04 17:43:47 -07:00
7c6e8b30b2
only show remove category to item owner
2012-05-04 16:45:10 -07:00
3cd428152d
Merge remote branch 'upstream/master'
2012-05-05 00:54:00 +02:00
7f061c255c
Option to set theme width added. Minor layout changes
2012-05-05 00:45:35 +02:00
250bf57e1e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-04 17:43:04 -04:00
62ea9130fe
Merge pull request #288 from simonlnu/master
2012-05-04 14:13:03 -07:00
20ea1b7d4b
fix lightbox; finished dark, now on to light
2012-05-04 17:06:17 -04:00
5830c32dce
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-04 17:03:23 -04:00
dedaa301cb
Merge remote branch 'upstream/master'
2012-05-04 20:42:14 +02:00
37d4181fde
Merge https://github.com/friendica/friendica into pull
2012-05-04 06:43:24 -07:00
10754ced3e
category removal
2012-05-04 06:42:56 -07:00
2a987356c6
Merge pull request #287 from mschmitt/master
2012-05-04 03:27:48 -07:00
52f4563f30
Esperanto 100%
2012-05-04 12:02:05 +02:00
9ecd128e5e
"show more" friends in common
2012-05-04 01:46:36 -07:00
a9f825ec3f
Merge remote branch 'upstream/master'
2012-05-04 10:00:04 +02:00
00190b7faa
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-04 02:31:21 -04:00
22c8fe46a5
DE strings
2012-05-04 07:30:49 +02:00
421acee65b
implement max load average before queuing/deferring delivery and poller processes
2012-05-03 21:50:48 -07:00
15542a8690
yet another bug in remote_friends_in_common
2012-05-03 20:47:04 -07:00
f2d3039aed
string update
2012-05-03 17:20:24 -07:00
2818cb28e9
use html symbols for double quotes
2012-05-03 17:19:53 -07:00
f3e18df55d
string update
2012-05-03 16:55:03 -07:00
ff75dc4e40
Merge pull request #284 from fabrixxm/master
2012-05-03 16:45:30 -07:00
6a5e5096db
Merge pull request #286 from grossard/french_proofreading
2012-05-03 14:01:06 -07:00
1f86205ee8
proofreading the mail templates in fr fixed typo, grammar, spelling…
2012-05-03 22:35:59 +02:00
cdb73f706f
Merge pull request #285 from simonlnu/master
2012-05-03 11:39:34 -07:00
bb081e4bf5
forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv (which it includes)
2012-05-03 14:35:21 -04:00
1a13c56fef
major reworking of dispy dark. light to follow
2012-05-03 14:25:18 -04:00
4c8a82456e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-03 14:18:40 -04:00
52915c6e68
validate_url() and validate_email() validate also IP address.
2012-05-03 15:28:23 +02:00
35771a778d
Merge remote branch 'upstream/master'
2012-05-03 10:21:38 +02:00
d72db2e1aa
diabook-theme: small fix
2012-05-03 07:57:40 +02:00
2bfba93940
Merge https://github.com/friendica/friendica into pull
2012-05-02 22:38:17 -07:00
e7ff35f27d
Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely.
2012-05-02 22:33:51 -07:00
0446766f04
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-03 00:25:56 -04:00
ff2ddc319d
diabook-theme: small fix
2012-05-03 06:25:23 +02:00
3521e22333
diabook-theme: made boxes at right_aside sortable
2012-05-03 06:05:55 +02:00
e7580b71e1
use cid rather than uid in perms
2012-05-02 21:00:39 -07:00
079d954765
Merge pull request #283 from fermionic/private-events-post-correctly-in-diaspora
2012-05-02 20:49:51 -07:00
5d957c3803
Modify events_post() in mod/events.php to set the private field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others.
2012-05-02 21:12:57 -06:00
3ecde2d72f
use mysql replace on cache items
2012-05-02 16:27:19 -07:00
8e1437ca8b
fixing common friends
2012-05-02 16:15:59 -07:00
a292629215
Merge https://github.com/friendica/friendica into pull
2012-05-02 15:27:39 -07:00
3be9cddfd7
rev update
2012-05-02 15:26:57 -07:00
b9c91c3320
Merge pull request #282 from max-weller/master
2012-05-02 13:49:57 -07:00
02dc116a9c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-02 12:49:00 -04:00
f0c11cac4a
Moved Meta Viewport from global head.tpl to diabook's header
2012-05-02 16:59:58 +02:00
6875f54647
diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box
2012-05-02 16:27:01 +02:00
67471bb534
diabook-theme: tryied to improve performance a bit
2012-05-02 14:33:04 +02:00
6a9cd8cd4b
diabook-theme: fix footer/impressum
2012-05-02 12:40:51 +02:00
21e18db757
missing param
2012-05-02 02:18:54 -07:00
dc31b93941
provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc.
2012-05-02 01:45:57 -07:00
06d6ab4812
delineate the new profile changes from the rest of the text
2012-05-02 01:07:23 -07:00
35dc4202a2
how did that happen?
2012-05-02 00:58:28 -07:00
a42a475e10
shuffle results of remote_common_friends widget
2012-05-02 00:44:37 -07:00
1b1f56f556
only validate once
2012-05-01 23:16:58 -07:00
dd27328390
perform basic validation
2012-05-01 23:15:39 -07:00
6000e7f30d
Merge remote branch 'upstream/master'
2012-05-02 08:11:52 +02:00
b3680c0d26
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-02 01:54:59 -04:00
becdb1f508
final touches - show friends in common with total strangers from different sites
2012-05-01 21:22:27 -07:00
1fab28c413
fix size
2012-05-01 20:38:06 -07:00
e247ed3de2
cross fingers
2012-05-01 20:36:35 -07:00
594803afca
reduce the scope a bit
2012-05-01 20:33:19 -07:00
066d69b21c
add template
2012-05-01 20:22:59 -07:00
72dbc2faee
fn not found
2012-05-01 20:11:35 -07:00
91085f0969
really fat fingers today - though none of this has gone further than my own site
2012-05-01 19:24:22 -07:00
15c1850156
another one
2012-05-01 19:20:41 -07:00
1fc796b276
typo
2012-05-01 19:19:24 -07:00
8bd6e1aef9
first try common friends for visitors
2012-05-01 19:16:18 -07:00
c96b40ab5f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-01 21:38:33 -04:00
f24ffa8ef0
improve handling of relative feed url's
2012-05-01 17:10:26 -07:00
6914bdce17
Merge https://github.com/friendica/friendica into pull
2012-05-01 15:50:14 -07:00
38ccd2e655
convert html entities to utf-8 before email header encoding
2012-05-01 15:49:22 -07:00
671a10f5d4
More Diabook-dark touch-ups. Should *really* be useable this time...with editplain anyway.
2012-05-01 21:37:49 +01:00
a5f78cf655
modified: images/smiley-thumbsup.gif
2012-05-01 21:05:55 +01:00
ab556857f0
diabook-themes: small fix at "community pages"-box
2012-05-01 16:46:08 +02:00
0ca4fa78c8
link socgraph to zrls
2012-05-01 01:34:47 -07:00
f8acb32961
Merge https://github.com/friendica/friendica into pull
2012-05-01 01:19:02 -07:00
584ac68ae4
adding zrl support to social graphs
2012-05-01 01:16:47 -07:00
facffe1745
Merge pull request #281 from simonlnu/master
2012-05-01 01:03:52 -07:00
6d3ba2825b
lighten bg and darken font on dispy light
2012-05-01 04:02:56 -04:00
5d6296b81b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-01 04:02:17 -04:00
2e2bb5e8b0
Merge remote branch 'upstream/master'
2012-05-01 08:21:12 +02:00
f175af05f9
Merge https://github.com/friendica/friendica into pull
2012-04-30 23:08:31 -07:00
d48cd0f9a3
hidden plugins (add .hidden file to dir)
2012-04-30 23:07:52 -07:00
b8b0b3a87d
Merge pull request #280 from simonlnu/master
2012-04-30 22:57:28 -07:00
e245ecddf2
sub-minor change to head.tpl
2012-05-01 01:56:21 -04:00
46558e98a8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-01 00:49:42 -04:00
2c577ed90f
diabook-themes: add "community profiles"-box to right_column
2012-05-01 06:21:40 +02:00
25afec0f81
Merge pull request #279 from fermionic/generate-random-id-bug-in-statusnet-api
2012-04-30 20:45:10 -07:00
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
a3a55897e5
Merge https://github.com/friendica/friendica into pull
2012-04-30 19:04:28 -07:00
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
f35ffa9b60
diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter
2012-05-01 02:33:55 +02:00
88c77083e6
rev update
2012-04-30 17:17:19 -07:00
05df5337dd
start adding tooltips to tab menus
2012-04-30 05:15:29 -07:00
5d10672fb8
fix join group notifications
2012-04-30 04:11:42 -07:00
9b7dac6ce1
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-30 06:02:38 -04:00
friendica
Tobias Diekershoff
zottel
Christian Vogeley
Simon L'nu
Simon
Martin Schmitt
Ludovic Grossard
Fabio Comuni
tommy tomson
Zach Prezkuta
Max Weller
Thomas Willingham