Commit graph

3904 commits

Author SHA1 Message Date
fabrixxm 2904a3265a Merge pull request #43 from fabrixxm/master
Add support for variable filters in template
2012-02-21 02:38:52 -08:00
Fabio Comuni 01a2791e3a template: add support for variable filters 2012-02-21 11:25:22 +01:00
friendica 5910fbf420 fill in notify msg with redirect link after we get the id 2012-02-21 00:02:42 -08:00
friendica 32d9008dd4 more cleanup of community followup detection. Remote worked well but local didn't. 2012-02-20 21:07:40 -08:00
friendica b821399f00 email notify now redirected through mod_notify, weirdness in local deliver caused by community page changes 2012-02-20 19:50:05 -08:00
friendica 6edd6d8ae1 Merge branch 'pull' 2012-02-20 18:07:16 -08:00
friendica 11871195be fix twitter title showing up occasionally 2012-02-20 18:06:43 -08:00
friendica 1cfff8fdd1 Merge pull request #42 from friendica/ka2ca-rebased
Replaced some ocurrences of Friendika --> Friendica
2012-02-20 18:02:53 -08:00
Abinoam P. Marques Jr 914169472e view/admin_remoteupdate.tpl - Friendika -> Friendica 2012-02-20 19:47:56 -03:00
Abinoam P. Marques Jr 7404d76126 util/README - Friendika -> Friendica 2012-02-20 19:47:56 -03:00
Abinoam P. Marques Jr d89a0449d0 htconfig.tpl - Friendika -> Friendica 2012-02-20 19:47:44 -03:00
Abinoam P. Marques Jr 9b2171ecee mod/match.php - Friendika -> Friendica 2012-02-20 19:41:01 -03:00
Abinoam P. Marques Jr 6797485f6e mod/dirfind.php - Friendika -> Friendica 2012-02-20 19:38:43 -03:00
Abinoam P. Marques Jr 12a8796854 mod/dfrn_request.php and templates - Friendika -> Friendica 2012-02-20 19:38:43 -03:00
Abinoam P. Marques Jr 6e2ae7bf1e library/OAuth1 - Friendika -> Friendica 2012-02-20 19:38:43 -03:00
Abinoam P. Marques Jr cec0542cdd js/fk.autocomplete.js - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr 70dedefde3 INSTALL.txt - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr 3ef6344d41 include/nav.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr fed6330ea6 include/api.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr 19fea9c2ce poller.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr 7ed1e3f177 acl_selectors.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr 03834b2433 text.php - Friendika -> Friendica (just to prepare for deprecate the friendika.png at the future) 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr 0bca36109a Scrape.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr 2219c1b581 friendica.svg - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
friendica 4fbd93f7e7 revup 2012-02-20 13:29:46 -08:00
fabrixxm 2507d09682 Merge pull request #41 from fabrixxm/master
fix connection request in mod/ping
2012-02-20 11:44:58 -08:00
Fabio Comuni dd09c2d125 use info() for successfull dfrn confirmation instead of notice() 2012-02-20 20:39:19 +01:00
Fabio Comuni edac27c791 ping: return all introductions detail when there are more than one 2012-02-20 20:21:34 +01:00
Michael 3a7695ded1 Fetched some missing styles from testbubble. 2012-02-20 15:11:27 +01:00
Michael e2f276881e Some testing stuff 2012-02-20 11:15:22 +01:00
friendica 15e9933ddf include item links in web notification messages 2012-02-19 20:27:32 -08:00
Michael 0fb22e1284 API is now working on my nginx server. 2012-02-20 01:53:22 +01:00
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