Michael Vogel
0a29927e6d
Mail: real threading now works with outgoing mails.
2012-12-19 16:31:06 +01:00
Michael Vogel
a86baa372a
Mailimport is now realized like a wall-to-wall-post
2012-12-19 15:58:38 +01:00
Michael Vogel
cb3586a280
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
view/de/strings.php
2012-12-19 12:24:02 +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
friendica
ac18d7289b
Merge https://github.com/friendica/friendica into pull
2012-12-19 03:16:18 -08:00
friendica
0f13995035
rev update
2012-12-19 03:15:48 -08:00
friendica
ecc55221af
Merge pull request #545 from annando/master
...
New bbcode: "share", caching of photos and some changes to "vier"
2012-12-19 03:13:42 -08:00
Michael Vogel
9ab34f8857
mail: "reply-to" now triggers the "sender"-header instead of the "reply-to"-header.
2012-12-18 00:47:55 +01:00
Michael Vogel
fc816feb6d
mailimport: Bug that prevented mails to be imported
2012-12-17 21:39:52 +01:00
Michael Vogel
4164257cb2
vier: The alt-pager and the birthday- and eventreminder is optically improved
2012-12-17 21:12:11 +01:00
a8df4cf04b
PL: update to the strings
2012-12-17 11:14:26 +01:00
1353e8ef4c
DE: update to the strings
2012-12-17 11:11:32 +01:00
Michael Vogel
a6b1275f16
Merge remote-tracking branch 'upstream/master'
2012-12-17 10:32:53 +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
friendica
0f1592547e
Merge https://github.com/friendica/friendica into pull
2012-12-16 17:59:15 -08:00
friendica
3f63a69d7a
divide by zero on incorrectly specified oembed thumbnail size
2012-12-16 17:58:12 -08:00
friendica
ca16302111
Merge pull request #543 from fabrixxm/master
...
template_processor: add filter support to variables
2012-12-16 14:52:40 -08:00
Thomas Willingham
babbcd890e
Merge pull request #544 from oohlaf/nginx
...
Nginx
2012-12-16 08:38:27 -08:00
Olaf Conradi
c490074589
Typos
2012-12-15 16:43:24 +01:00
Olaf Conradi
30b5e08eb6
Fix rewrite rules to pass arguments
...
Fix location regex for extensions to end with $
Add more comments
2012-12-15 16:21:50 +01:00
Olaf Conradi
b38b62f759
Modify nginx sample to a real config file
2012-12-15 16:01:20 +01:00
Michael Vogel
d253d59668
vier: Added Delegations and optical changes.
2012-12-15 14:39:37 +01:00
Michael Vogel
a61ac769a0
vier: Expanding and collapsing now works
2012-12-15 11:25:52 +01:00
Michael Vogel
46c5a97a20
New caching system for photos
2012-12-14 22:47:30 +01:00
Fabrixxm
71751ecb8c
template_processor: add filter support to variables
2012-12-14 10:10:33 -05:00
friendica
6b36863dd8
prune all dead/blocked contacts from allowed permissions, ok to keep them in "deny" lists -
...
Contacts will be pruned when creating the editor. They can't be added with the ACL selector,
but we won't prevent them from being added through other means.
Allowed groups will be pruned on item submit.
2012-12-13 21:02:14 -08:00
friendica
6faadc9662
anybody can see the "remove category" link, though it doesn't do anything if you aren't the owner. Can't believe this has gone so long without being reported.
2012-12-13 14:15:18 -08:00
friendica
6fb49a4de9
nginx config update
2012-12-12 19:44:59 -08:00
friendica
5d757b0668
add sample nginx config from Olaf Conradi to mods directory
2012-12-12 15:54:13 -08:00
friendica
bc3a704e02
bug #517 - ensure wall owner can always comment on walltowall posts to their own wall, this seems to have been lost during the objectification of conversations
2012-12-09 13:44:48 -08:00
friendica
4793ebb141
change profile photo link on profile edit page
2012-12-07 16:02:40 -08:00
friendica
6e7e41360f
rev update
2012-12-07 15:58:42 -08:00
friendica
376bf517a4
bug #516 - set writable on first poll
2012-12-06 13:59:20 -08:00
friendica
dacda667d9
Merge https://github.com/friendica/friendica into pull
2012-12-04 14:09:14 -08:00
friendica
d193093106
rev update
2012-12-04 14:08:55 -08:00
5a634f3d9b
NB_NO: update to the strings
2012-12-04 11:09:48 +01:00
62d4034a5a
RU: update to the strings
2012-12-04 11:06:02 +01:00
fc8c01750b
PT-BR: update to the strings
2012-12-04 11:03:23 +01:00
friendica
8ab24858fb
fix "insert web link" for those without richtext feature enabled
2012-12-03 16:31:28 -08:00
friendica
8b5288d0f7
Merge pull request #540 from Leberwurscht/master
...
Cross site request forgery hole
2012-12-03 13:40:29 -08:00
friendica
1ad4f5247c
default bbcode - don't check editor pref
2012-12-03 01:05:10 -08:00
friendica
531fbff90b
Merge https://github.com/friendica/friendica into pull
2012-12-03 00:44:37 -08:00
friendica
8bb0f08c6c
default to bbcode format when uploading photos, since default editor is now plaintext
2012-12-03 00:43:06 -08:00
71054f1483
RU: update to the strings
2012-12-03 09:35:07 +01:00
23c873fc51
Merge pull request #542 from annando/master
...
Some minor changes to "vier"
2012-12-02 23:49:06 -08:00
108e77e1ed
Merge pull request #541 from vn971/patch-1
...
added translations where they were empty
2012-12-02 23:47:32 -08:00
Michael Vogel
5635fe250c
Merge remote-tracking branch 'upstream/master'
2012-12-03 08:30:49 +01:00
Michael Vogel
d548d1943f
vier: maximum width of comments defined
2012-12-03 08:29:41 +01:00
friendica
fa90f27b53
Merge https://github.com/friendica/friendica into pull
2012-12-02 13:50:50 -08:00
friendica
79fb5509ed
bug #511 - if birth year supplied but not a month or day, force a sane default. PHP datetime functions don't handle zero very well.
2012-12-02 13:47:41 -08:00
