Michael
|
18679111f5
|
Merge remote branch 'upstream/master'
|
2012-02-27 00:03:51 +01:00 |
|
friendica
|
6ddd444afd
|
Merge pull request #49 from CatoTH/master
Bugfix for del_config
|
2012-02-26 14:49:56 -08:00 |
|
Michael
|
fe3dfbee56
|
Mail: New options for actions after importing mails.
|
2012-02-26 23:39:29 +01:00 |
|
friendica
|
bdb14d5aad
|
relative link redirects
|
2012-02-26 14:34:01 -08:00 |
|
Michael
|
437e18d7a7
|
Merge remote branch 'upstream/master'
|
2012-02-26 21:47:47 +01:00 |
|
Tobias Hößl
|
4b1de0f538
|
Avoid some notices
|
2012-02-26 20:43:51 +00:00 |
|
Tobias Hößl
|
ac86407fdf
|
Bugfix
|
2012-02-26 20:43:35 +00:00 |
|
Tobias Hößl
|
cbc6ca642a
|
1 Bugfix (missing $ character) and avoid some notices
|
2012-02-26 20:41:41 +00:00 |
|
root
|
aa92901b11
|
Wrong variable name
|
2012-02-26 14:29:17 +00:00 |
|
friendica
|
5f7858a688
|
show experimental and unsupported theme status on theme admin page
|
2012-02-26 04:17:02 -08:00 |
|
Abinoam P. Marques Jr
|
f3a225437b
|
Comment notifications by e-mail now are threaded
|
2012-02-25 16:59:44 -08:00 |
|
Abinoam P. Marques Jr
|
bcfac6c72f
|
include/items.php pass 'parent' to notification
|
2012-02-25 16:59:44 -08:00 |
|
friendica
|
2c7da5d0de
|
scale external images
|
2012-02-25 14:22:51 -08:00 |
|
Michael
|
1cf1870512
|
poller.php: Test for moving to archive, vier-style: notifications fixed
|
2012-02-25 19:40:05 +01:00 |
|
Michael
|
dccefb3c36
|
"vier": The contacts are now working again. Line break before closing bbcodes removed.
|
2012-02-25 11:00:35 +01:00 |
|
friendica
|
18bf5d1402
|
theme info (like plugin info)
|
2012-02-25 00:30:14 -08:00 |
|
friendica
|
9441ff5142
|
string update for 2.38
|
2012-02-24 22:47:43 -08:00 |
|
friendica
|
a3cf563b68
|
update author name across items if changed.
|
2012-02-24 20:40:09 -08:00 |
|
friendica
|
f5c5da742d
|
attribution issue - don't take author name from contact if available from item.
|
2012-02-24 20:03:13 -08:00 |
|
Michael
|
01301a6169
|
Bug fixed where mails where nearly empty. HTML mails can now be received.
|
2012-02-25 02:37:39 +01:00 |
|
Michael
|
a74b0746b1
|
multipart messages complete, message-id conversion done.
|
2012-02-25 01:10:45 +01:00 |
|
Michael
|
0ba45eb745
|
Sending mail as multipart/alternative (html and plain text) (very basic by now)
|
2012-02-24 08:50:42 +01:00 |
|
Michael
|
f6320f3319
|
Encoding for incoming mails. Fixed invalid message id (with side effect at the moment). Sending mail as text mail. Encoding name when importing mail contact.
|
2012-02-24 07:11:26 +01: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 |
|
Tobias Diekershoff
|
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 |
|
friendica
|
41636a50aa
|
new notify sort of working in testbubble
|
2012-02-22 23:34:30 -08: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
|
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
|
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
|
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 |
|
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 |
|
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 |
|