clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,653 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

182 Commits

Author SHA1 Message Date
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
friendica e9e4fb664a allow bbcode representation of html symbols such as &copy; by wrapping in bb brackets 2012-04-23 05:42:46 -07:00
Michael Vogel 59b45f7fc1 Several improvements 2012-03-31 16:28:39 +02:00
Michael Vogel f5db142d93 Quotes with author are now having an "open/close" link 2012-03-17 12:15:59 +01:00
Michael Vogel 8a1f175df0 New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements 2012-03-17 11:07:49 +01:00
friendica 5915325367 bug #328 2012-03-10 18:52:50 -08:00
Michael 484a442f2b GIT problems ... 2012-02-23 20:59:34 +01:00
Michael 0409b5cdba Merge remote branch 'upstream/master' 
Conflicts:
	include/bbcode.php
 2012-02-23 20:53:22 +01:00
Michael 311e35731c bbcode.php: A list or quote at the beginning wasn't detected 2012-02-23 20:51:44 +01:00
friendica 3c6b127d40 nested quote check fails to account for strpos returning position 0 2012-02-22 20:58:04 -08:00
Michael 064c843119 Handling nested bbcodes. Some small design changes in html2bbcode. Change in poller.php is just for testing purposes. 2012-02-19 21:07:45 +01:00
Michael 31653aef64 Brand new html2bbcode. Some other changes in diaspora to bbcode handling 2012-02-19 20:36:59 +01:00
friendica 03171fd7de preliminary qcomment support, [nosmile] tag to disable smiley processing 2012-02-14 23:13:18 -08:00
friendica dc4420c5ec hr bbcode tag 2012-02-13 14:16:51 -08:00
friendica 85c831bcbf finish translation of 'xxxxx wrote:' 2012-02-12 20:56:44 -08:00
Abinoam P. Marques Jr 9697e82331 Merge branch 'master' into bbcode 2012-02-12 18:56:53 -08:00
Abinoam P. Marques Jr 135005571f Added [th] bbcode tag support. 2012-02-12 17:27:08 -08:00
friendica 3e85c1d330 make 'x minutes ago' fully translateable with argument ordering. string update. 2012-02-12 17:15:09 -08:00
Abinoam P. Marques Jr e575a3a02c Fixed bbcode [li] and [*] handling. 2012-02-12 17:10:06 -08:00
Abinoam P. Marques Jr 10e66d293d Added [quote=Name] bbcode support. 2012-02-12 16:18:58 -08:00
Abinoam P. Marques Jr 3a07973ffa Added [center] bbcode support. 2012-02-12 15:51:17 -08:00
Abinoam P. Marques Jr 74b529bda2 BBCode [size=50] --> font-size: 50px (with the unit px). 
This [size=number] without unit is kind of a standard.
It was being rendered like "font-size: 50" and that's not valid CSS style.
 2012-02-12 14:59:07 -08:00
Abinoam P. Marques Jr 92a585ed23 Added support to [noparse], [nobb] and [pre] as bbcode escape tags. 2012-02-12 14:35:29 -08:00
Abinoam P. Marques Jr 6a17a3a8e2 Added support for [ol] standard ordered list bbcode. 2012-02-12 12:00:23 -08:00
Abinoam P. Marques Jr 5479142efc Added support for [ul] standard unordered list bbcode. 2012-02-12 11:59:51 -08:00
Abinoam P. Marques Jr 5107ee52d3 Regexp fix for [LIST=i], [list=i], [LIST=I] and [LIST=i] bbcodes 2012-02-12 06:13:49 -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 f4b1d335a5 sql optimisation cont. 2012-01-02 18:40:38 -08:00
friendica 63f66a5a93 bug 244 multiple birthday reminders from Diaspora if profile changed repeatedly 2011-12-19 19:06:25 -08:00
friendica cb2e68c88e home_init hook 2011-12-15 01:08:19 -08:00
friendica d9e1ebfc48 wrong length in image extractor 2011-11-27 14:03:49 -08:00
friendica 1055ef3eea more readable private image extraction for bypassing preg limits 2011-11-27 13:44:45 -08:00
friendica cf7568efd7 extract private images before bbcode translation since preg has issues with large data sizes. 2011-11-27 04:09:14 -08:00
Friendika 83e55cf9f4 bbcode list styles 2011-11-09 19:32:54 -08:00
Friendika 0130052b2c bbcode lists 2011-11-03 21:30:01 -07:00
Fabio Comuni dc212de960 Merge remote-tracking branch 'friendika/master' 2011-10-26 12:15:38 +02:00
Friendika 72d74b88be some dspr fixes 2011-10-25 19:59:57 -07:00
Fabio Comuni afce790e56 oembed: wrap in iframe only html from remote service 2011-10-25 14:59:31 +02:00
Friendika 1a7badb405 use iframe for oembed - untrusted content 2011-10-24 20:10:46 -07:00
Fabio Comuni 40ea48bdab fix vimeo oembed bbcode regexp 2011-10-24 17:28:48 +02:00
Fabio Comuni ac474cf53c try to use oembed on vimeo tag 2011-10-24 14:39:39 +02:00
Fabio Comuni a9fb8e4d60 Use oembed for bookmark, audio, video, youtube 2011-10-24 14:30:11 +02:00
Friendika 557a7d0cec stuff 
- background the external network notifications (Facebook, Twitter, Statusnet)
 - add vimeo support
 - consolidate editor video options (insert video, regardless of source)
 - add "Connector Settings" page purely for configuring connectors
 - moved mailbox settings to Connectors
 - Move the "Connect/Follow" dialogue out of "find people" and move to top.
 - Add "Find People" dialogue
 - minor theme edits on duepuntozero and testbubble to make all this stuff work
 - A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.
 2011-10-11 18:24:37 -07:00
Friendika 119cd9c0ce more multiline regex fixes 2011-09-20 04:07:24 -07:00
Friendika 309df84172 again fix bbcode image sizes 2011-09-18 00:19:19 -07:00
Friendika 5f4ab62fe3 fix bbcode image size 2011-09-18 00:16:18 -07:00
Friendika 1778e4a315 bloody ampersands 2011-09-14 20:47:49 -07:00
Friendika 7a06c7c3bf bug #146 - br HTML tags showing up in events 2011-09-11 15:44:07 -07:00
Friendika b026dcb860 match bbcode multiline 2011-09-03 04:36:45 -07:00
Friendika f0c3a75ff3 youtube redirect fixes 2011-08-30 23:09:39 -07:00
Friendika 1861dc1fae don't allow fullscreen for youtube iframe - this makes it hard to visit the network page when they throw an error 2011-08-26 01:32:22 -07:00
Friendika c15c53d307 one more little tweak to linkificator 2011-08-25 20:12:56 -07:00
Friendika 5eb08d43b6 tweak to bbcode linkificator 2011-08-25 20:09:32 -07:00
Friendika 7008bec045 improved code blocks 2011-07-18 19:17:16 -07:00
Friendika e6086e2363 missed some images, table border property 2011-06-21 16:45:47 -07:00
Friendika 043bde42a6 fix banding on logo, xhtml compliant list and basic table support 2011-06-21 16:29:43 -07:00