Commit graph

3882 commits

Author SHA1 Message Date
fabrixxm
d5adb67ef4 Merge pull request #46 from fabrixxm/master
more work on quattro theme and less html in php
2012-02-23 02:52:04 -08:00
Fabio Comuni
cbc60d525e quattro post preview, style contacts pages, style for "shiny" class, fix contacts list in profile aside.
remove html from viewcontacts.php and contacts.php
use contact_template.tpl to print contacts also in viewcontacts
2012-02-23 11:22:32 +01:00
85d09f48d0 fix img tag with size attribute 2012-02-23 11:12:36 +01:00
friendica
d9e9fd0359 Merge branch 'master' into notify 2012-02-23 00:30:17 -08:00
friendica
fd43e2c563 more theme notify fixes 2012-02-23 00:28:26 -08:00
734cdcef28 Merge branch 'master' of https://github.com/friendica/friendica 2012-02-23 09:04:00 +01:00
56f3c00eec quattro: added styling to pivate message view 2012-02-23 09:02:40 +01:00
friendica
41636a50aa new notify sort of working in testbubble 2012-02-22 23:34:30 -08:00
Michael Vogel
e1ecf48b8b README file shortened because this was for my branch only. 2012-02-23 07:55:56 +01:00
Michael Vogel
9f92bbb04c Removed the export of markdown articles. That was for testing purposes only. 2012-02-23 07:53:45 +01:00
friendica
808b886a3e Merge branch 'master' into notify 2012-02-22 22:36:07 -08:00
friendica
3c6b127d40 nested quote check fails to account for strpos returning position 0 2012-02-22 20:58:04 -08:00
friendica
d75d49a4c1 restore poller normal operation 2012-02-22 20:31:33 -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
friendica
8b2189f67f Merge branch 'pull' 2012-02-22 19:58:01 -08:00
friendica
f9eddad44f allow forum posts by followers on Diaspora 2012-02-22 19:56:28 -08:00
Michael
e34a648cad German translation more gender friendly. Some more logging in poller.php 2012-02-22 15:20:49 +01:00
friendica
700b8d2031 Merge pull request #44 from simonlnu/master
minor doc fix. there will be more ;)
2012-02-22 03:59:37 -08:00
Simon L'nu
4e3506fce3 clean up Groups help file. there was a stray 'Freindika' in it
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-02-22 06:05:48 -05:00
friendica
390eb15e7d never enough documentation 2012-02-22 01:50:06 -08:00
friendica
a19ddb48ee waitman gobble media upload via api patch 2012-02-21 23:35:50 -08:00
friendica
91c3349025 escape smiley conversion in code and pre blocks 2012-02-21 23:13:03 -08:00
friendica
9fe12d1724 some cleanup of tb notifications 2012-02-21 20:22:09 -08:00
friendica
53d3ee8852 new notifications 2012-02-21 19:03:55 -08:00
friendica
3f2497ad20 add full email link to notification 2012-02-21 18:10:15 -08:00
friendica
f03aaf554e mark all notifications read 2012-02-21 16:59:57 -08:00
friendica
3e69b86bc1 Merge branch 'pull' 2012-02-21 14:32:17 -08:00
friendica
a97cb88b65 logger_debug was used as string instead of constant 2012-02-21 14:15:10 -08:00
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