Alexander Kampmann
355c42cb30
Merge branch 'master' of https://github.com/friendica/friendica
...
Conflicts:
include/config.php
update.php
2012-04-05 13:39:15 +02:00
friendica
63ea378d92
document tinymce fixes/workarounds
2012-04-01 04:13:27 -07:00
friendica
03b95c9a09
translate br with extra elements
2012-03-26 16:56:44 -07:00
friendica
86d8d3f442
private file in repository
2012-03-21 00:34:12 -07:00
tony baldwin
e5c29fcc78
Merge remote branch 'upstream/master'
2012-03-21 01:36:23 -04:00
tony baldwin
cf17606d0f
added Vijay's theme from facepark.in
2012-03-21 01:33:48 -04:00
friendica
b4a2dae085
added README to mcefixes to explain what is going on.
2012-03-20 21:04:09 -07:00
friendica
f55779fd83
update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks
2012-03-20 20:47:31 -07:00
friendica
4bb280bc2f
lost changes to tinymce/bbcode
2012-03-17 22:18:21 -07:00
friendica
9e731506c2
remove admin view of local directory
2012-03-17 22:14:17 -07:00
Tobias Hößl
7868e3897b
In HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ajax-call to a php-script. Once there actually is embedded Code in the HTML, this function is called after every single keypress. Not only is making an ajax-call every keypress bandith intensive - it also made typing hard / slow. Making a lot of JavaScript-RegExp-Computation every keypress isn't exactly great either, but still performs better.
2012-03-13 21:46:57 +00:00
friendica
3da97e2393
finalise spam storage model, begin driver changes.
2012-03-05 23:20:42 -08:00
Alexander Kampmann
dd9432903d
Merge remote-tracking branch 'upstream/master'
2012-03-01 11:49:22 +01:00
Alexander Kampmann
e0c659b34b
Enabled automated doc building. Changes:
...
-build.xml, phing build file
-@package tags at acl_selector.php and db_update.php
-added documentation and some IDE files to .gitignore
-automated tool to find files that corrupt the doc build process
-removed ansi characters from SSH1.php, docBlox could not handle them
2012-03-01 11:44:33 +01:00
friendica
53412dacd4
update globaldir when page-type changes, add spam date field
2012-02-27 23:27:16 -08:00
Alexander Kampmann
9986fc1910
fixed syntax errors
2012-02-27 14:12:44 +01:00
friendica
cb9d0993f1
waitman gobble fix for escaping code blocks in tinymce
2012-02-24 20:07:57 -08:00
friendica
58a9c652de
Merge pull request #45 from annando/master
...
New HTML to BBCode converter, changes to BBCode, nginx support, ...
2012-02-22 20:21:05 -08:00
Abinoam P. Marques Jr
6e2ae7bf1e
library/OAuth1 - Friendika -> Friendica
2012-02-20 19:38:43 -03:00
root
b6d7777226
New version of markdown. Playing with stylesheet. Testing line breaks.
2012-02-19 22:47:32 +01:00
friendica
d8b82b24a4
Documentation on Friendica changes to B8 and notice of source availability in accordance with LGPL
2012-02-15 23:02:05 -08:00
fabrixxm
16f00cb73b
Merge pull request #36 from fabrixxm/master
...
Missing icons in 'quattro' and ajax events calendar
2012-02-15 03:51:44 -08:00
Fabio Comuni
22cfb77173
events: first test for full-javascript events calendar
2012-02-14 16:19:48 +01:00
friendica
803a7425ea
make hr bbtag shareable, stray quote in duepuntozero wall_item
2012-02-13 18:40:28 -08:00
Keith Fernie
2c9cfb1fe9
modified: library/slinky.php Set up tabs in code correctly.
2012-02-09 21:44:52 +00:00
Keith Fernie
955022e7dc
modified: library/slinky.php Added a custom YourLS shortener to the available shorteners
2012-02-09 20:45:38 +00:00
friendica
f57fa90228
more work on Friendica db driver for b8
2012-02-01 20:37:05 -08:00
friendica
64d0616762
add uid variable to b8 classes
2012-02-01 19:23:05 -08:00
friendica
c8c062d960
add spam engine
2012-01-31 15:54:41 -08:00
friendica
8aa2552372
add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
2012-01-18 16:21:30 -08:00
friendica
792e957842
symbolic bbcode icon
2012-01-11 18:54:10 -08:00
zottel
720787b772
Switch to jquery 1.7.1
2011-12-12 08:11:35 -08:00
friendica
335c0cddcf
diaspora reshared lists rendering as html
2011-11-23 01:44:07 -08:00
friendica
ede25aabce
check all attribute names for validity
2011-11-16 14:23:06 -08:00
friendica
ef79a7a4fc
html5 - don't set empty attribute either
2011-11-12 14:05:40 -08:00
Friendika
c9014a111f
html5 parser - numeric attribute names chucking a wobbly.
2011-11-11 14:21:52 -08:00
Fabio Comuni
00c342e13d
Merge branch 'oauthapi'
2011-11-07 17:41:23 +01:00
Fabio Comuni
10e5754e24
oauth: authorize
2011-11-07 17:36:41 +01:00
Fabio Comuni
ff7fc68382
oauthapi: authorize app
2011-10-26 17:15:36 +02:00
Fabio Comuni
6769436f3b
oembed. fix html2bbcode when oembed html contains span and utf8 chars
2011-10-21 16:26:29 +02:00
Friendika
01164c8c2f
fix various html parse errors
2011-10-20 16:48:07 -07:00
Fabio Comuni
b06588ffa1
Initial work adding oauth to api
2011-10-20 15:57:35 +02:00
Fabio Comuni
5792b3d358
Merge branch 'master' into newui
2011-09-26 11:42:48 +02:00
Friendika
deeae7bdb5
diaspora markdown changes, parse_url format change
2011-09-20 15:23:36 -07:00
Fabio Comuni
abd65e00ab
Load infos and notices via ping and show them with js popup
2011-09-05 14:01:21 +02:00
Fabio Comuni
14125ce67b
Add tipTip js tooltips
2011-09-05 11:32:40 +02:00
Friendika
82f7f33cf5
bookmarks + bug #140
2011-09-04 19:58:03 -07:00
Friendika
48ffa880f0
cleanup
2011-08-07 16:15:54 -07:00
Friendika
ad1e827169
several fixes for attachments
2011-08-03 19:18:58 -07:00
Friendika
ec52010e16
helper functions for Diaspora cert mangling
2011-07-25 19:57:17 -07:00
Fabio Comuni
1c9ed08620
show acl selector in a popup with fancybox
2011-07-20 10:00:33 +02:00
Friendika
9aeccaaa9e
we still need the source file. Don't know why.
2011-06-30 18:36:38 -07:00
Fabio Comuni
a07282ea6f
tinyMCE loads "source" version of bbcode plugin istead of "compressed" one
2011-06-30 16:44:06 +02:00
Friendika
0b221e8945
bug #96 move libraries to library - better alignment of like rotator
2011-06-28 21:11:52 -07:00
Friendika
21c48a1476
markdown parser
2011-04-11 05:59:26 -07:00
Friendika
5f2f644064
resolve file inclusion conflicts w/ multiple plugins, improve the typo checker
2011-02-21 20:19:33 -08:00
Friendika
0a485e6664
don't use openid CURL wrapper if open_basedir is set (even if safe_mode isn't)
2011-01-02 21:01:07 -08:00
Friendika
1b14c1733b
relax content-type check on yadi discovery document
2010-11-22 16:36:42 -08:00
Friendika
5e81c615a4
openid lib
2010-11-15 18:06:33 -08:00
Mike Macgirvin
5edee3c4d1
magic-envelope verification, status.net appears to do it wrong.
...
Ultimately we need to do it right (or why bother having a spec?),
and fallback to doing it wrong if we're talking to a broken system - which
ironically seems to include most of the federated social web projects.
2010-10-21 04:53:43 -07:00
Mike Macgirvin
9c10ada906
salmon-magic-public-freaking-nasty-keys
2010-10-06 21:13:15 -07:00
Mike Macgirvin
1b35018992
file needed to parse public keys to generate salmon magic-sigs.
2010-10-05 18:55:07 -07:00
Mike Macgirvin
8abac5e5c7
some tools we'll require going forward
2010-10-04 05:13:10 -07:00
Mike Macgirvin
ffb1997902
mistpark 2.0 infrasturcture lands
2010-09-08 20:14:17 -07:00
Mike Macgirvin
6348e70daa
Initial checkin
2010-07-01 16:48:07 -07:00
