Commit graph

7364 commits

Author SHA1 Message Date
Tobias Diekershoff
e441f3286c DE: update to the strings 2012-12-21 13:09:33 +01:00
Michael Vogel
d7073f7884 Vier: All optical glitches should be removed now. 2012-12-21 13:02:39 +01:00
Michael Vogel
293a794973 "vier": More icons replaced 2012-12-21 03:53:07 +01:00
Michael Vogel
7c7d3fe5de "share" - now the attribut value for the "author" is escaped 2012-12-21 02:10:26 +01:00
Michael Vogel
f4bc5c57f3 New option to enable and disable the "share" element
Changes to "vier" to use more "font awesome" icons
2012-12-21 00:08:58 +01:00
Michael Vogel
8e194cb411 Vier: switching some more icons to "font awesome" 2012-12-20 12:13:37 +01:00
friendica
898f68938a Merge pull request #546 from annando/master
Bugfix in mail import - use of the "share" element in ostatus and diaspora items
2012-12-19 22:54:53 -08:00
friendica
8ad5c93156 Merge pull request #547 from oohlaf/smoothly
Smoothly Theme
2012-12-19 22:54:34 -08:00
Michael Vogel
a8aa992102 Vier: Design issues with preview fixed 2012-12-20 04:19:02 +01:00
Michael Vogel
330960f8f7 Vier: Now there are buttons for inserting bbcode elements in the comments 2012-12-20 03:33:36 +01:00
Thomas Willingham
68a9386e03 Rename quickstart files to make them obviously related to each other. 2012-12-19 19:28:14 +00:00
Olaf Conradi
d9d7eb89ed Fix alignment of photo menu
Remove duplicate definitions
Align menu button to be exactly the same width as the photo
2012-12-19 19:15:39 +01:00
Olaf Conradi
ee5d2acd42 Fix alignment of location 2012-12-19 19:04:18 +01:00
Olaf Conradi
98c5b6e73b Text box alignment in Smoothly theme
Make sure comment text boxes stay within their surrounding box.
2012-12-19 18:27:50 +01:00
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
Tobias Diekershoff
a8df4cf04b PL: update to the strings 2012-12-17 11:14:26 +01:00
Tobias Diekershoff
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
Tobias Diekershoff
5a634f3d9b NB_NO: update to the strings 2012-12-04 11:09:48 +01:00