Commit Graph

2606 Commits

Author SHA1 Message Date
Thomas Willingham d88e727719 Typo 2013-08-24 17:08:04 +01:00
Thomas Willingham cd21468fbf Another one. 2013-08-24 17:06:05 +01:00
Thomas Willingham c803fb90df Merge remote-tracking branch 'upstream/master' 2013-08-24 17:05:18 +01:00
Thomas Willingham 6999fb586b Generic wrapper classes makes themeing loads easier 2013-08-24 17:01:39 +01:00
Christian Vogeley c9fc8efd22 Make footers position fixed, so that its content appears 2013-08-24 14:11:46 +02:00
friendica 925b046794 premium/restricted channel connections implemented, configure at yoursite/channel/nickname - this basically redirects "follow" requests to a premium channel's sell page if it has one configured. You can still click through and create a connection request (introduction), but this provides a means for the channel owner to state their terms. If you don't abide by the terms, you will likely be blocked or the channel deleted. This facility is extensible in a number of ways. 2013-08-21 22:10:08 -07:00
friendica 6cea04eb44 progress on generic sellpage - is not yet linked from existing connect buttons and editing has not been completed 2013-08-21 20:05:55 -07:00
friendica 25fdc269be Merge pull request #101 from tuscanhobbit/master
Italian translation (Thanks!)
2013-08-20 05:07:54 -07:00
p.tacconi add03b6498 First version of Italian translation 2013-08-20 11:20:16 +02:00
p.tacconi a53a092b44 First version of Italian translation 2013-08-20 10:13:50 +02:00
friendica cd5fdbcb48 email attachments (and fix email photos) 2013-08-19 21:19:39 -07:00
friendica 2e14dc242e if changing primary hub during an import operation - remove the old xchan and create a fresh xchan pointing at this instance. Also a minor edit to increase the default photo upload limit for new sites. There aren't many cameras left that will take photos < 800k in size. 2013-08-19 17:18:13 -07:00
friendica b5efa1a63a issue #82, posted order not working - also doc update 2013-08-17 06:30:09 -07:00
friendica d0951777c0 fix import from file 2013-08-15 19:21:22 -07:00
friendica 92747366af move js from matrix page 2013-08-15 05:09:19 -07:00
friendica 7d0b1506a8 Merge pull request #96 from beardy-unixer/master
Webpages
2013-08-14 20:56:49 -07:00
friendica ac541a7d32 most of expire is now ported from friendica, but the protocol bits to push out the delete notifications for the entire batch to all recipients of the original post are not complete and will take quite a bit more work. As a consequence, expire has been completely disabled until it is fully implmented since it could result in completely un-removable posts reminiscent of the infamous "Bonnie Nadri" incident at Diaspora which we do not wish to re-live. 2013-08-14 20:09:02 -07:00
Thomas Willingham 608e04c65e More progress on pages - extend writepages widget, add pagelist widget 2013-08-14 20:46:48 +01:00
Thomas Willingham a0dfd44f91 Merge remote-tracking branch 'upstream/master' 2013-08-14 20:44:17 +01:00
friendica 6da4e41031 ru strings updated 2013-08-14 05:03:18 -07:00
friendica 499241c245 Merge pull request #95 from pixelroot/master
modified:   view/ru/messages.po
2013-08-14 05:06:20 -07:00
friendica 4888ab4d0f primitive cms functionality - provide a custom menu below your profile vcard 2013-08-13 22:14:01 -07:00
friendica 17e405cfa9 helps to include the new templates... 2013-08-13 21:01:34 -07:00
friendica 9508967c73 menu management is now functional with the exception of acl's (and of course a way to display the menus you create, and probably a bit more input sanity checking) 2013-08-13 20:57:03 -07:00
friendica 680baff73d menu management complete (as opposed to menu *content* management, which is not). As usual, this means functionally complete - as theming and presentation have been left for those more suited to the task. 2013-08-13 18:10:03 -07:00
friendica d6c6a2b144 debugging issue #58 - seems to work but needs (more) theming 2013-08-13 02:29:10 -07:00
friendica b9a8b73392 untested patch for issue #58 - will require theming if it works 2013-08-13 02:06:05 -07:00
friendica 55cb322489 a bit more work on menus 2013-08-13 01:24:02 -07:00
pixelroot b860188f71 modified: view/ru/messages.po 2013-08-12 15:46:01 +02:00
pixelroot f6ec3b5912 modified: view/ru/messages.po 2013-08-12 14:46:08 +02:00
friendica 95abc1600b theme personal menus so they look more or less like widgets 2013-08-12 01:01:28 -07:00
friendica 6191cfef2a check these in so I can go back and find out why the stylsheet is horked 2013-08-11 19:04:07 -07:00
Thomas Willingham 94335f237f Initial shot at write_pages widget 2013-08-10 22:06:30 +01:00
friendica d8d45dab76 fix string horkage 2013-08-09 04:08:01 -07:00
friendica b1dc5b827b Merge pull request #92 from pixelroot/master
modified:   view/ru/messages.po
2013-08-09 03:57:57 -07:00
pixelroot ae82c09424 modified: view/ru/messages.po 2013-08-09 12:06:20 +02:00
friendica 2dfd9dce05 Merge pull request #90 from beardy-unixer/master
Add access policy to admin panel.
2013-08-08 22:38:11 -07:00
friendica 085eec4869 malformed ru string file 2013-08-08 03:28:42 -07:00
friendica 6b7c720673 Merge pull request #91 from pixelroot/master
modified:   view/ru/messages.po
2013-08-08 03:16:26 -07:00
pixelroot 0335e0fffc modified: view/ru/messages.po 2013-08-08 11:54:03 +02:00
friendica 4cda133e89 Add public visibility setting to privacy groups (collections). This doesn't yet make them visible, but allows them to be visible (like a Cc: instead of a Bcc:) 2013-08-07 17:51:10 -07:00
Thomas Willingham 81a0683aaf Add access policy to admin panel. 2013-08-07 20:15:18 +01:00
friendica 809a53a2f8 This is an actual arrowhead, the nabla is a math operator. 2013-08-06 20:04:57 -07:00
friendica 5d7a36649e wee bit of css cleanup 2013-08-06 18:26:57 -07:00
friendica 99bd0712b6 Add a site access policy (to determine if this is really a public site or just an open site) and add an orphan flag to xchans in case all their hublocs go away. Get rid of a couple of DO NOT EDIT template messages which were still lurking in the tree. 2013-08-06 17:15:41 -07:00
friendica 687ea0ca24 ru string update 2013-08-06 16:10:37 -07:00
friendica 026c93ddf2 Merge pull request #89 from pixelroot/master
modified:   view/ru/messages.po
2013-08-06 16:12:16 -07:00
pixelroot fa297b8d6e modified: view/ru/messages.po 2013-08-06 14:37:55 +02:00
pixelroot 9f649b4d95 modified: view/ru/messages.po 2013-08-06 13:53:09 +02:00
friendica e265a943c8 js_upload is wretched, but at least fix the HTML in the template so it will work again. 2013-08-04 20:21:50 -07:00