Commit graph

1067 commits

Author SHA1 Message Date
fabrixxm
58e0129433 Merge branch 'master' of github.com:fabrixxm/friendika 2011-02-01 18:46:28 +01:00
Fabio Comuni
042aa2e169 Merge remote branch 'friendika-master/master' 2011-02-01 10:17:27 +01:00
Fabio Comuni
1151124fee Merge branch 'master' of github.com:fabrixxm/friendika 2011-02-01 10:17:19 +01:00
Friendika
89313235d2 it's a bbcode editor, not an html editor 2011-01-31 23:23:37 -08:00
Friendika
9d561d4471 oembed contsant name, fix dfrnpubdeliver, add 'code' editor button 2011-01-31 23:06:45 -08:00
fabrixxm
0bec0fc5fb Merge branch 'friendika-master' 2011-02-01 07:18:23 +01:00
Friendika
7dbdf8e6fa let there be purple! ;-) 2011-01-31 20:52:23 -08:00
Friendika
2cd1da5462 readjust name length limits - acl selector 2011-01-31 19:53:40 -08:00
Friendika
e2544abd50 truncate names in acl selector 2011-01-31 19:49:56 -08:00
Friendika
837cce8a75 email cc recipients (front end) 2011-01-31 19:07:13 -08:00
Friendika
8965db24cc post to email recips (backend) 2011-01-31 18:18:28 -08:00
Friendika
082909fe1a Merge branch 'fabrixxm-oembed' 2011-01-31 15:26:02 -08:00
Friendika
fc20fb17c2 force text paste in editor 2011-01-31 14:21:23 -08:00
Friendika
1908c7ad82 deliver up to 150 contacts per person using dfrn - in case hub is whacked 2011-01-31 14:01:38 -08:00
Fabio Comuni
bdbbfe17b0 cache oembed request 2011-01-31 17:23:55 +01:00
Fabio Comuni
3dbca2a804 delete old cache in poller.php 2011-01-31 17:16:35 +01:00
Fabio Comuni
6efc78e0e4 add cache table 2011-01-31 17:10:36 +01:00
Fabio Comuni
49ea05b8ff use microformat to mark html from [embed] tag, convert html with oembed microformat to [embed] tag 2011-01-31 16:45:58 +01:00
Fabio Comuni
6ea87223d3 Add 'system''no_oembed' config option 2011-01-31 11:00:35 +01:00
Fabio Comuni
23d1b994cc Move [embed] bbtag from oembed plugin to core 2011-01-31 10:38:49 +01:00
Fabio Comuni
e962561f8d Merge remote branch 'friendika-master/master' 2011-01-31 09:54:08 +01:00
Friendika
d8877b88d6 limit privacy ACL's to networks which can handle privacy 2011-01-30 22:45:02 -08:00
Friendika
6935d34e76 disable "take me home" hotkey, different on FF (shift-home), IE ($). 2011-01-30 19:49:26 -08:00
Friendika
3eefe8b500 more ssl_policy cleanup, allow manual feed update per contact when hub is whacked, log feed parse errors 2011-01-30 19:38:03 -08:00
Friendika
a598f17e6d wrong ref in ssl policy 2011-01-30 18:25:41 -08:00
Friendika
e8d52d879b more debugging to see if the google push hub is even trying to publish our content. 2011-01-30 15:28:50 -08:00
Friendika
c012843282 identify email-only contacts 2011-01-29 23:47:40 -08:00
Friendika
8673b08c1c even more cleanup prior to push 2011-01-29 22:41:01 -08:00
Friendika
a362dc46e3 cleanup ssl_policy implementation 2011-01-29 22:38:58 -08:00
Friendika
f970d9ab4d implement SSL redirection policy (none, full, selfsign) 2011-01-29 22:35:11 -08:00
Friendika
45bbf1cd3f document poormancron as alternative in INSTALL.txt 2011-01-29 01:25:46 -08:00
fabrixxm
e7d87e4ab3 Merge branch 'master' of github.com:fabrixxm/friendika 2011-01-29 10:14:14 +01:00
fabrixxm
5b35ceefb9 Merge branch 'friendika-master' 2011-01-29 09:39:38 +01:00
Friendika
26cc2e02fe Merge branch 'fabrixxm-master'
Conflicts:
	boot.php
2011-01-28 18:50:20 -08:00
Fabio Comuni
302acda089 updated poormancron plugin 2011-01-28 14:04:40 +01:00
Fabio Comuni
ef33ca6750 modded scripts to be runned in cli so they can be included and executed in main program 2011-01-28 14:04:18 +01:00
Fabio Comuni
517d6812da cal proc_run hook before string escape 2011-01-28 14:01:50 +01:00
Fabio Comuni
bf8dadb970 Merge remote branch 'friendika-master/master' 2011-01-28 10:08:39 +01:00
fabrixxm
8257b1b684 Merge branch 'friendika-master' 2011-01-28 07:26:57 +01:00
Friendika
5d77bd9489 tag finder tweak 2011-01-27 21:24:21 -08:00
Friendika
33037754d8 removed java photo uploader from mainline. Photo uploaders are now plugins, but a single item upload is available by default. 2011-01-27 18:45:19 -08:00
Friendika
ebba294189 remote links 2011-01-27 14:34:11 -08:00
Friendika
58309829a1 Merge branch 'omigeot-master' 2011-01-27 13:10:43 -08:00
Friendika
1d9f677438 Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master 2011-01-27 13:09:58 -08:00
olivierm
bfe6380d90 More translation 2011-01-27 16:50:39 +01:00
olivierm
8c6319394c Done head.tpl 2011-01-27 16:48:54 +01:00
olivierm
e93385a355 French translation : Done strings.php, started template files. 2011-01-27 16:44:55 +01:00
Friendika
620aae5b50 still not quite ready for the big photos rollover 2011-01-27 03:55:40 -08:00
Friendika
076c25e103 Revert "Revert "roll version - now in alpha 2.1""
This reverts commit e8a3166fa9.
2011-01-27 03:52:18 -08:00
Friendika
e8a3166fa9 Revert "roll version - now in alpha 2.1"
This reverts commit df4f77dadd.
2011-01-27 03:50:56 -08:00