Matthew Exon
4df162d929
Explicitly list protocols that are allowed, rather than using their initials. Also, add cid, which I need for my mailstream plugin to work.
2013-03-09 15:57:40 +08:00
friendica
f07df4f667
merge
2013-03-02 15:46:54 -08:00
friendica
5205a374ee
block injection vector
2013-02-26 17:33:18 -08:00
Michael Vogel
3e58060b30
API: beautify the output of repeated items
...
Vier: Birthday reminder looks better
2013-02-15 20:14:45 +01:00
Michael Vogel
fdee002f73
Several improvements for performance measuring
2013-01-26 18:35:39 +01:00
Michael Vogel
4e3d0018c6
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
boot.php
include/items.php
update.php
2013-01-20 14:07:57 +01:00
friendica
30f1fb2c4d
provide a date indication in reshared content
2013-01-15 14:58:50 -08:00
Michael Vogel
8cef0fa80d
Mentions are now displayed much faster. Attention: The related database update can last more than one minute.
...
bbcode: The generated HTML is now cleaned up every time (using the DOM) since it happened that bad html broke the network page.
2013-01-13 09:37:15 +01:00
friendica
a5755b59a8
preserve multiple newlines - see discussion at https://github.com/friendica/friendica/pull/570
2013-01-04 15:21:05 -08:00
Michael Vogel
6f6b1f95c8
vier: With IE there are no borders around images anymore
...
bbcode: Multiple new lines are now reduced
2012-12-28 11:31:30 +01:00
Michael Vogel
7c7d3fe5de
"share" - now the attribut value for the "author" is escaped
2012-12-21 02:10:26 +01:00
Michael Vogel
f4bc5c57f3
New option to enable and disable the "share" element
...
Changes to "vier" to use more "font awesome" icons
2012-12-21 00:08:58 +01:00
Michael Vogel
c22f65bafa
repeated items from ostatus and diaspora are now using the share-element.
...
Some design changes to repeated items in "vier".
2012-12-19 12:18:52 +01:00
Michael Vogel
9c0de28622
bbcode: New element "share" for shared content
...
mail: Now mails connected via subject line if there isn't an appropriate header.
vier: Improvents to the theme so that shared messages are looking fine
2012-12-17 03:01:40 +01:00
Michael Vogel
4c389eb73b
Merge remote branch 'upstream/master'
2012-09-20 08:32:33 +02:00
Zach Prezkuta
1aa111387a
-- Fix Diaspora profile update avatar bugs
...
-- Protect BBCode tags inside of [pre] from space re-formatting
-- More information in email poll logging
-- Frost/Frost Mobile bug fixes
2012-09-19 20:35:39 -06:00
Michael Vogel
f6818ab243
Merge remote branch 'upstream/master'
2012-09-02 17:50:25 +02:00
Zach Prezkuta
f7a1999c15
manually fix escaped underscores in links
2012-08-28 20:12:41 -06:00
Zach Prezkuta
72712175b5
regular expressions were grabbing too much
2012-08-26 14:56:34 -06:00
friendica
6bc48b58d8
algorithm for crypt tag
2012-08-19 00:35:39 -07:00
Michael Vogel
d40f25ae08
bbcode: Function for cleaning CSS commands (not yet in function)
...
items.php: The detection if a rss/atom-title is identically to the body is improved.
2012-08-17 07:59:21 +02:00
friendica
b8df47e97c
bbcode quote display
2012-08-15 04:52:18 -07:00
friendica
e81f15b28d
crypt bbcode tag
2012-08-12 04:29:26 -07:00
Zach Prezkuta
d8a13d6e8d
allow themes to change the size of embedded videos
2012-08-06 09:59:57 -06:00
Michael Vogel
bed99674d2
bbcode: two new bbcode elements (style, class) for CSS
2012-08-02 00:13:37 +02:00
Michael Vogel
c8f99a8a66
Merge remote branch 'upstream/master'
2012-07-18 21:03:57 +02:00
friendica
749ae9b297
filter the protocol specifier in bbcode links.
2012-07-17 18:33:04 -07:00
Michael Vogel
4e9086f9b0
Changes in the bbcode to markdown converter to make it more compatible with Diaspora
2012-07-15 12:47:24 +02:00
Michael Vogel
8d7d46ae7a
Bugfix: multiple linefeeds were generated when items where written in the editor. The existing fix didn't really work
2012-07-14 19:54:27 +02:00
Michael Vogel
bfca7f47ef
Merge remote branch 'upstream/master'
...
Conflicts:
include/bb2diaspora.php
2012-07-13 23:39:51 +02:00
Michael Vogel
db2f0f7919
Bugfix: API: No extra encoding for the status text - makes it more compatible to statusnet
...
Bugfix: BBCode: Fixed charset problems.
2012-07-08 18:27:11 +02:00
Zach Prezkuta
da2ccebed8
fix bugs
2012-07-07 18:50:33 -06:00
Zach Prezkuta
173b3a1b9a
allow more than one embedded private photo
2012-07-07 16:24:20 -06:00
Michael Vogel
dafc84390d
Improvments of the HTML to make a better bb2markdown conversion (nested lists, youtube, vimeo, ...)
2012-07-05 23:36:00 +02:00
Zach Prezkuta
041aeaf4a1
fix small bug in lists and revert Diaspora list processing to non-Markdownify version
2012-07-05 12:54:52 -06:00
friendica
5589bca1e0
fix !@#$ tinymce linebreaks for the thousandth time
2012-07-04 17:15:43 -07:00
friendica
ced0a208d8
fix double lines
2012-07-02 16:34:01 -07:00
friendica
315784444a
try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up to harder stuff
2012-07-02 01:11:19 -07:00
Zach Prezkuta
cd9ce0ecb3
fix logic for nested lists--should be OR, not AND
2012-06-27 21:21:26 -06:00
friendica
a4b407eb54
stray s
2012-06-25 22:01:32 -07:00
friendica
0f0ffce1b6
change required doco
2012-06-25 21:27:34 -07:00
friendica
359a98cd22
change event behaviour so that title is required but description is not
2012-06-25 21:20:08 -07:00
friendica
fbaca4b742
event summary/title
2012-06-25 20:55:27 -07:00
friendica
fad2679c7e
Merge https://github.com/friendica/friendica into pull
...
Conflicts:
include/bbcode.php
2012-06-25 16:05:42 -07:00
friendica
b044cd922d
typos in bbcode, add service class restrictions to jot uploads
2012-06-25 16:03:46 -07:00
Simon L'nu
939ebe16f8
fix typo and syntax error
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-25 18:49:36 -04:00
Zach Prezkuta
4293de7554
allow nested [ol] and [ul] lists too
2012-06-25 08:26:00 -06:00
Michael Vogel
cc56f33b80
New option in the bbcode parser to disable oembed.
2012-06-18 01:29:08 +02:00
friendica
4978ee12d1
webfinger profile linker
2012-06-02 18:05:23 -07:00
Thomas Willingham
7a5c85f628
[quote=somebody] was appearing as an extended spoiler tag.
2012-06-01 23:31:07 +01:00
