This website requires JavaScript.
de3b9e9584
send zrl after dfrn_request homecoming for manual entries
2012-04-08 17:28:36 -07:00
7cf946e004
Merge remote branch 'upstream/master'
2012-04-09 02:20:34 +02:00
63c881b50d
Merge branch 'pull'
2012-04-08 16:29:54 -07:00
977625a53b
fix to wall_upload photos default permissions to use cid rather than uid.
2012-04-08 16:19:45 -07:00
0d60dbef31
added exceptions to dba class added exception handling to index.php, please mind that there is no recovery at the moment added transactions to db update. Please mind that they might not be supported by db table engines. added admin email on failed updates
2012-04-09 00:45:10 +02:00
06c0447342
Merge pull request #215 from tomtom84/master
2012-04-08 15:04:59 -07:00
7d018f651d
fixed z-index of youtube-vids fixed bug to hide right_side
2012-04-09 00:02:48 +02:00
315d496290
Merge remote branch 'upstream/master'
2012-04-08 21:50:41 +02:00
269f21ddc1
API: Added Public Timeline
2012-04-08 20:19:14 +02:00
f1db690786
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-08 13:49:52 -04:00
763729f11a
API: Now mentions could work as well - only my client doesn't really work
2012-04-08 17:51:05 +02:00
944f897d30
API: Basic support of the identica client added.
2012-04-08 17:23:38 +02:00
5c04469755
prepare for using a master theme_init()
2012-04-08 06:20:57 -07:00
741a5dba57
provide theme_init() functions
2012-04-08 05:52:00 -07:00
3afc9915e3
rev updates
2012-04-08 05:24:11 -07:00
c3867f4ce4
Merge pull request #214 from annando/master
2012-04-08 05:19:54 -07:00
aaf5a81365
Merge remote branch 'upstream/master'
2012-04-08 10:33:32 +02:00
ce0eac44b5
Merge commit 'upstream/master'
2012-04-08 10:07:39 +02:00
e3b2ac0735
Merge pull request #213 from simonlnu/master
2012-04-07 20:47:37 -07:00
01961f7caa
minor dispy* fixes
2012-04-07 23:46:47 -04:00
cb4c7cdb3e
API: API is now enhanced. mentions, repeat and destroy now works.
2012-04-08 00:02:25 +02:00
cee3608747
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-07 14:47:02 -04:00
f931d5c918
diabook-themes: small fix
2012-04-07 19:56:00 +02:00
17d097124c
"vier": Some design stuff
2012-04-07 18:35:37 +02:00
cb05801a90
Merge commit 'upstream/master'
2012-04-07 18:35:29 +02:00
0fa3b7f348
Merge pull request #212 from tomtom84/master
2012-04-07 07:41:23 -07:00
1c0700f371
changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section
2012-04-07 16:39:43 +02:00
1440786c31
ignore utf8 offset error for unit tests
2012-04-07 02:31:41 -07:00
e575d67969
had arg order backwards
2012-04-07 02:23:11 -07:00
7a7102618b
try assertContains
2012-04-07 02:21:55 -07:00
cf2d8ef7a6
tag tests cont.
2012-04-07 02:11:56 -07:00
f30146b521
fix autonamenegativelength test
2012-04-07 01:20:38 -07:00
3a1c78bd75
some work on tests
2012-04-07 01:04:45 -07:00
bc69a957dc
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-07 03:10:09 -04:00
7308dbae28
"vier": Bookmarks now look better.
2012-04-07 01:19:07 +02:00
ecabe1d505
ignore removed plugins
2012-04-06 05:21:42 -07:00
533e215a96
Merge branch 'pull'
2012-04-06 05:12:18 -07:00
13dfb40128
fix messed up config tables w/ duplicate entries
2012-04-06 05:11:09 -07:00
9cff2e36cf
Merge pull request #211 from tomtom84/master
2012-04-06 04:33:26 -07:00
75bcf42caa
Merge remote-tracking branch 'origin/master'
2012-04-06 13:29:20 +02:00
adf3ad5fd6
Merge pull request #210 from tomtom84/master
2012-04-06 04:29:01 -07:00
0cb2407c94
Merge remote-tracking branch 'origin/master'
2012-04-06 12:58:41 +02:00
4f9588d9ee
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-06 12:43:44 +02:00
eb6370fa41
small fixes for the German strings
2012-04-06 12:43:20 +02:00
0731c177eb
fix bad sql update
2012-04-06 03:25:01 -07:00
52d5ef905e
Merge remote-tracking branch 'origin/master'
2012-04-06 12:24:05 +02:00
91906b1b74
Merge branch 'pull'
2012-04-06 03:12:02 -07:00
665b2c8107
revert config changes, we're getting duplicate keys
2012-04-06 03:10:46 -07:00
f980b79edc
new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox...
2012-04-06 11:19:12 +02:00
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
friendica
zottel
Alexander Kampmann
tomtom84
tommy tomson
Michael Vogel
Simon L'nu
Simon
Tobias Diekershoff
Michael Johnston