This website requires JavaScript.
43d5876e8b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-06 03:54:09 -04:00
afd2bf031e
update to the German strings
2012-04-06 09:37:50 +02:00
b361bcea83
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-06 00:50:34 -04:00
4bee1859be
Merge branch 'pull'
2012-04-05 21:43:38 -07:00
6bc7e6e09f
add network_tabs hook
2012-04-05 21:42:47 -07:00
221726392e
pass autoname(0) test
2012-04-05 18:44:36 -07:00
34d268544e
Merge commit 'upstream/master'
2012-04-06 00:00:46 +02:00
053048af10
rev update
2012-04-05 14:37:30 -07:00
355c42cb30
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
cbf4544887
added index to config and pconfig table changed config.php to use REPLACE instead of INSERT, this removes one db hit.
2012-04-05 13:27:09 +02:00
9b6e91086b
make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php
2012-04-05 02:15:03 -07:00
b2290f4f12
Merge pull request #207 from simonlnu/master
2012-04-04 21:05:13 -07:00
df82affe2f
finish styling category tags and category input
2012-04-05 00:04:23 -04:00
9c4fca446b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-05 00:03:30 -04:00
37801dd6ed
also block outbound
2012-04-04 20:48:35 -07:00
9860d6b95c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-04 23:47:48 -04:00
9ee424c1e3
style categorytags
2012-04-04 23:47:35 -04:00
b45327b856
let's catch d* disabled at a higher level and not waste any resources on it.
2012-04-04 20:45:48 -07:00
5377683c0f
Merge pull request #206 from simonlnu/master
2012-04-04 20:35:59 -07:00
8e5489846d
update the dispy* templates
2012-04-04 23:35:07 -04:00
afe7f09b27
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-04 23:32:16 -04:00
d509a46345
Merge pull request #205 from unary/filerfix
2012-04-04 20:23:20 -07:00
da0eb2d4c9
correct some filer dialog weirdness caused by introduction of categories
2012-04-04 23:08:16 -04:00
c0a18bc2fa
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-04 22:58:32 -04:00
c4ca21a762
move alert box away from nav links
2012-04-04 19:13:41 -07:00
0c7710681c
log disabled requests
2012-04-04 18:49:39 -07:00
71671e5b9a
fix config storage of booleans
2012-04-04 17:51:59 -07:00
f63636ed14
well that was a stupid mistake...
2012-04-04 17:19:46 -07:00
145713c8e2
string update
2012-04-04 15:51:56 -07:00
62c60fd53d
bug: diaspora_enabled setting turns it on but doesn't fully turn it off.
2012-04-04 14:13:34 -07:00
51658826f9
Merge branch 'pull'
2012-04-04 02:02:50 -07:00
60c57704c6
better handling of reshares containing embeds
2012-04-04 02:02:23 -07:00
64a1367525
Merge remote branch 'upstream/master'
2012-04-04 08:56:35 +02:00
5c6c9d756f
Merge pull request #204 from simonlnu/master
2012-04-03 23:21:39 -07:00
922d690d1e
latest changes are the popup menu for notifs, fixes
2012-04-04 02:19:39 -04:00
2871e28df7
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-04 02:14:26 -04:00
8e928d101b
display settings hooks
2012-04-03 22:01:52 -07:00
466188ebd7
re-opened bug #363
2012-04-03 20:14:37 -07:00
96abee53e4
this is better
2012-04-03 19:20:39 -07:00
1e02fd8a72
Merge branch 'pull'
2012-04-03 19:16:59 -07:00
dbe16afcd4
include contact_widgets for categories_widget when doing updates
2012-04-03 19:16:02 -07:00
3db2cf76b9
remove loozah themes which fell too far behind to recover
2012-04-03 16:40:25 -07:00
f0a8ef64fe
smal fix
2012-04-03 21:45:58 +02:00
ca0795a096
Merge pull request #202 from tomtom84/master
2012-04-03 12:08:40 -07:00
cd309b69e6
german translation for right_aside
2012-04-03 21:06:57 +02:00
10c88f2a01
Merge pull request #201 from tomtom84/master
2012-04-03 12:00:24 -07:00
8a71191d6d
make right_aside translatable and provide german translation... and some css-fixes
2012-04-03 20:59:00 +02:00
4b762ff923
suppress duplicates in search
2012-04-03 02:44:29 -07:00
e5cd5aab5c
Merge remote branch 'upstream/master'
2012-04-03 09:27:46 +02:00
5d0d9f8772
make contact ssl_policy change a function since it is used in a few places
2012-04-02 23:07:26 -07:00
f4721955db
more ssl policy fixes and prevent delivery to soapbox when using local delivery
2012-04-02 21:01:19 -07:00
e1de2e3de0
don't change ssl settings on local photos for remote contact
2012-04-02 19:38:13 -07:00
06942b3654
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-02 21:55:10 -04:00
9391fc965d
bug #363 and a couple of other reported ssl link issues
2012-04-02 17:43:11 -07:00
9cb3fc226a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-02 16:53:47 -04:00
81dfb61f93
API: template for test function added
2012-04-02 22:36:05 +02:00
3dc317dcc6
Merge commit 'upstream/master'
2012-04-02 22:00:22 +02:00
6dfd55668f
diabook-themes: css-fixes
2012-04-02 20:30:27 +02:00
076b1b374b
diabook-themes: fixes in js
2012-04-02 18:16:58 +02:00
b5d57d5313
diabook-themes: fixed pageheader
2012-04-02 17:17:14 +02:00
9faa940f04
diabook-themes: bugfixes / css-fixes
2012-04-02 15:06:55 +02:00
2352e6c1cb
make the "new calendar" (javascript interactive) the default
2012-04-02 01:46:35 -07:00
62e528ba43
remove zrl from query string
2012-04-02 00:45:45 -07:00
7127626f55
Merge remote branch 'upstream/master'
2012-04-02 08:52:24 +02:00
1f74bd1b78
catch a couple more Oo smilies
2012-04-01 22:57:50 -07:00
7df6ab9a87
add page_content_top hook
2012-04-01 22:22:26 -07:00
5eca42975c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-01 23:56:13 -04:00
5d35f0d54a
add title to D* posts
2012-04-01 19:16:13 -07:00
07cfdba9c3
Merge pull request #200 from unary/categories
2012-04-01 19:03:20 -07:00
581b54c974
allow users to set categories on their posts
2012-04-01 21:28:31 -04:00
06e9a8b7a0
Merge pull request #199 from beardy-unixer/1457d6e90f36a6a7bb07df3579b6e5c0475b121d
2012-04-01 17:53:59 -07:00
c4f4715a54
Merge remote-tracking branch 'upstream/master'
2012-04-02 01:27:23 +01:00
1457d6e90f
Modified peopleyouknow to handle sites without Facebook better
2012-04-02 01:26:45 +01:00
845b123b47
Merge pull request #198 from beardy-unixer/master
2012-04-01 16:49:19 -07:00
210586eaed
Merge remote-tracking branch 'upstream/master'
2012-04-02 00:29:27 +01:00
23dc376364
diabook-themes: add link to global dir in "find friends" at right_aside
2012-04-02 01:29:20 +02:00
8406803473
modified: mod/newmember.php
2012-04-02 00:27:47 +01:00
8c9c561f6c
New user quick start.
2012-04-02 00:23:58 +01:00
f95db4382e
check for style.php existence before inclusion
2012-04-01 16:21:55 -07:00
d0ddd380e7
Moved Diaspora notes away from top, per user request
2012-04-02 00:18:03 +01:00
9472ba8d20
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-01 18:59:53 -04:00
2589feef70
Merge branch 'pull'
2012-04-01 15:44:27 -07:00
00bbb9ad36
slight improvement in handling of plaintext feeds
2012-04-01 15:43:57 -07:00
a39d8d3f02
The "vier"-theme is now working again. But there is still work needed
2012-04-02 00:08:49 +02:00
408de09f72
css-fixes
2012-04-02 00:05:49 +02:00
5409825fe7
New script that checks if a script is running
2012-04-01 20:56:27 +02:00
4cf1e5aa21
poller: An optional lockfile is used to check if the poller is already running
2012-04-01 20:52:33 +02:00
31d04d685e
Merge pull request #197 from tomtom84/master
2012-04-01 09:13:35 -07:00
f075e977fe
add new messages-layout in diabook
2012-04-01 18:12:20 +02:00
6c302e78da
Merge pull request #196 from tomtom84/master
2012-04-01 07:35:47 -07:00
ff12637ceb
fix the display of community-plugin in diabook-themes
2012-04-01 16:34:31 +02:00
9b4bef8ac4
that didn't quite work out
2012-04-01 06:46:12 -07:00
7d23149a61
Merge commit 'upstream/master'
2012-04-01 14:11:37 +02:00
bb67ca9f1c
Merge branch 'pull'
2012-04-01 04:13:58 -07:00
d1783bba17
Merge pull request #195 from tomtom84/master
2012-04-01 04:13:48 -07:00
63ea378d92
document tinymce fixes/workarounds
2012-04-01 04:13:27 -07:00
15ba0ef5d0
various bugfixes and css-fixes
2012-04-01 13:12:15 +02:00
bc283f7c5d
qcomment overflow
2012-04-01 03:37:41 -07:00
f0b8d01615
try slightly better detection of html in feeds
2012-04-01 03:19:37 -07:00
ae5e5bf1e4
Merge branch 'pull'
2012-04-01 01:03:05 -07:00
Simon L'nu
Tobias Diekershoff
friendica
Michael Vogel
Alexander Kampmann
Simon
Michael Johnston
zottel
tommy tomson
tomtom84
Thomas Willingham