Commit graph

3822 commits

Author SHA1 Message Date
friendica
2fe479034c revup 2012-02-19 14:37:01 -08:00
root
b6d7777226 New version of markdown. Playing with stylesheet. Testing line breaks. 2012-02-19 22:47:32 +01: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
8c8efbdf64 README added 2012-02-19 20:41:55 +01:00
Michael
31653aef64 Brand new html2bbcode. Some other changes in diaspora to bbcode handling 2012-02-19 20:36:59 +01:00
Michael
4713069e68 Many small changes 2012-02-19 20:11:36 +01:00
Michael
cafd400352 Merge remote branch 'upstream/master'
Conflicts:
	view/theme/vier/style.css
2012-02-19 20:09:42 +01:00
ike
73e0e4d783 New theme "vier" derives from "quattro" 2012-02-19 20:05:51 +01:00
Abinoam P. Marques Jr.
a9ed5915ce Merge pull request #40 from simonlnu/newsmilies
add :headdesk and fix doc/Pages.md to remove the absolute URL to /
2012-02-19 09:58:41 -08:00
Abinoam P. Marques Jr.
f81e9ee3b2 Merge pull request #39 from abinoam/logfile
Logfile
2012-02-19 09:56:14 -08:00
Simon L'nu
49179f9033 add :headdesk and fix doc/Pages.md to remove the absolute URL to /
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-02-19 05:17:26 -05:00
Abinoam P. Marques Jr
dedfc300a0 Fixed log file issues on a freshly installed Friendica.
* Check to see if log file exists.
* After trying to open it, check to see if it went ok.
* So, check to see if the file size != 0 (fread error with size = 0)
2012-02-18 14:19:35 -08:00
friendica
5734d5f357 change notify messages for web 2012-02-18 03:18:20 -08:00
friendica
1b9c03f6fc new notifications - implement storage 2012-02-18 02:57:42 -08:00
friendica
4222f506a8 deprecating two-char smilies 2012-02-17 23:44:25 -08:00
friendica
75acc1ed96 support plaintext on editpost, editorinit called before all buttons laid out 2012-02-17 11:49:27 -08:00
friendica
184f6165fc Merge branch 'pull' 2012-02-17 10:13:34 -08:00
friendica
346b44fbf6 revup 2012-02-17 10:13:06 -08:00
fabrixxm
5bbc2e820b Merge pull request #38 from fabrixxm/master
Revert changes to oembed
2012-02-17 06:36:38 -08:00
Fabio Comuni
7bd43613fa oembed: revert changes from 48f5bd492d 2012-02-17 15:34:05 +01:00
friendica
8ff6cb8406 a couple more items to make sure forum delegates can't access if the forum login is shared with the site admin account 2012-02-16 23:58:07 -08:00
friendica
0500fc2826 do not under any circumstances allow a delegated forum admin to access the site admin page. 2012-02-16 23:50:57 -08:00
friendica
48f5bd492d naked link with no protocol being passed from Diaspora 2012-02-16 23:14:36 -08:00
friendica
2abbd81ce1 a few fixes for offsite community members 2012-02-16 18:29:09 -08:00
friendica
6f6d4471d8 Merge branch 'pull' 2012-02-16 15:16:04 -08:00
friendica
7dcef67492 facepalm smiley 2012-02-16 15:15:28 -08:00
Abinoam P. Marques Jr.
7b59ad6148 Merge pull request #37 from abinoam/oex
Oexchange Small Fix
2012-02-16 04:53:37 -08:00
Tobias Diekershoff
652622894f de strings 2012-02-16 11:55:52 +01:00
Abinoam P. Marques Jr
4ac001663e oexchange small fix [_POST -> _REQUEST] 2012-02-16 02:52:35 -08:00
friendica
c8704040d3 improvements in newmember page 2012-02-16 01:57:59 -08:00
friendica
1b445d511b another sql typo 2012-02-16 00:08:38 -08:00
friendica
ada2a555dc sql typo in auto-friend with D* 2012-02-15 23:58:28 -08: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
friendica
b1d31aca51 quick comments 2012-02-15 18:13:41 -08:00
friendica
d054426101 encode email headers on message deliveries 2012-02-15 15:28:32 -08:00
friendica
c965074e53 Merge branch 'pull' 2012-02-15 14:13:20 -08:00
friendica
18b307f983 revup 2012-02-15 14:12:35 -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
73bee08ac2 enable ajax calendar with $a->config['experimentals']['new_calendar']=1 2012-02-15 12:47:50 +01:00
Fabio Comuni
fe3e8ee854 quattro: icons for attachments 2012-02-15 11:10:02 +01:00
friendica
07ca8d6574 starred/bookmark searches only returning conversation head without comments 2012-02-14 23:29:24 -08:00
friendica
03171fd7de preliminary qcomment support, [nosmile] tag to disable smiley processing 2012-02-14 23:13:18 -08:00
friendica
f865939653 localise links to private photos inside messages 2012-02-14 18:07:13 -08:00
friendica
134fdda75f refactor smilie code to allow for extensions and generation of a table of the entire list 2012-02-14 15:31:08 -08:00
friendica
cbabf9d7ef Merge branch 'pull' 2012-02-14 13:57:12 -08:00
friendica
7697bde0ca revup 2012-02-14 13:56:43 -08:00
Vasudev Kamath
8022a46907 Merge pull request #35 from copyninja/master
:'( :-! :-/ 8-) :-[ smiley's are mapped.
2012-02-14 09:43:05 -08:00
Vasudev Kamath
e4b1c07727 cry, foot in mouth, cool, undecided and embarassed smiley's are mapped 2012-02-14 23:10:11 +05:30
Fabio Comuni
7140e56d1f events js: pass only first line of desc as title; item.desc and item.location as html 2012-02-14 16:48:34 +01:00
Fabio Comuni
549c920e6f events js: don't modify rendered item if not autor specified 2012-02-14 16:28:10 +01:00