aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-08-2414-8961/+6322
|\
| * Make footers position fixed, so that its content appearsChristian Vogeley2013-08-241-0/+2
| |
| * premium/restricted channel connections implemented, configure at ↵friendica2013-08-212-0/+31
| | | | | | | | 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.
| * progress on generic sellpage - is not yet linked from existing connect ↵friendica2013-08-213-0/+15
| | | | | | | | buttons and editing has not been completed
| * Merge pull request #101 from tuscanhobbit/masterfriendica2013-08-202-8956/+6225
| |\ | | | | | | Italian translation (Thanks!)
| | * First version of Italian translationp.tacconi2013-08-202-5/+5
| | |
| | * First version of Italian translationp.tacconi2013-08-202-8954/+6223
| | |
| * | email attachments (and fix email photos)friendica2013-08-193-3/+33
| | |
| * | if changing primary hub during an import operation - remove the old xchan ↵friendica2013-08-191-1/+1
| |/ | | | | | | 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.
| * issue #82, posted order not working - also doc updatefriendica2013-08-171-0/+1
| |
| * fix import from filefriendica2013-08-151-1/+1
| |
| * move js from matrix pagefriendica2013-08-151-0/+9
| |
| * Merge pull request #96 from beardy-unixer/masterfriendica2013-08-142-4/+8
| |\ | | | | | | Webpages
| * | most of expire is now ported from friendica, but the protocol bits to push ↵friendica2013-08-141-0/+4
| | | | | | | | | | | | 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.
* | | Generic wrapper classes makes themeing loads easierThomas Willingham2013-08-246-14/+20
| |/ |/|
* | More progress on pages - extend writepages widget, add pagelist widgetThomas Willingham2013-08-141-4/+5
| |
* | Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-08-1410-457/+593
|\|
| * ru strings updatedfriendica2013-08-141-154/+158
| |
| * Merge pull request #95 from pixelroot/masterfriendica2013-08-141-301/+317
| |\ | | | | | | modified: view/ru/messages.po
| | * modified: view/ru/messages.popixelroot2013-08-121-11/+11
| | |
| | * modified: view/ru/messages.popixelroot2013-08-121-297/+313
| | |
| * | primitive cms functionality - provide a custom menu below your profile vcardfriendica2013-08-131-0/+3
| | |
| * | helps to include the new templates...friendica2013-08-132-0/+39
| | |
| * | menu management is now functional with the exception of acl's (and of course ↵friendica2013-08-133-3/+3
| | | | | | | | | | | | a way to display the menus you create, and probably a bit more input sanity checking)
| * | menu management complete (as opposed to menu *content* management, which is ↵friendica2013-08-133-2/+23
| | | | | | | | | | | | not). As usual, this means functionally complete - as theming and presentation have been left for those more suited to the task.
| * | debugging issue #58 - seems to work but needs (more) themingfriendica2013-08-132-1/+13
| | |
| * | untested patch for issue #58 - will require theming if it worksfriendica2013-08-131-0/+4
| | |
| * | a bit more work on menusfriendica2013-08-131-0/+16
| | |
| * | theme personal menus so they look more or less like widgetsfriendica2013-08-122-2/+12
| | |
| * | check these in so I can go back and find out why the stylsheet is horkedfriendica2013-08-111-0/+11
| | |
* | | Initial shot at write_pages widgetThomas Willingham2013-08-101-0/+3
|/ /
* | fix string horkagefriendica2013-08-092-109/+103
| |
* | Merge pull request #92 from pixelroot/masterfriendica2013-08-091-422/+379
|\| | | | | modified: view/ru/messages.po
| * modified: view/ru/messages.popixelroot2013-08-091-422/+379
| |
* | Merge pull request #90 from beardy-unixer/masterfriendica2013-08-081-0/+1
|\ \ | | | | | | Add access policy to admin panel.
| * | Add access policy to admin panel.Thomas Willingham2013-08-071-0/+1
| | |
* | | malformed ru string filefriendica2013-08-081-532/+532
| | |
* | | Merge pull request #91 from pixelroot/masterfriendica2013-08-081-533/+533
|\ \ \ | | |/ | |/| modified: view/ru/messages.po
| * | modified: view/ru/messages.popixelroot2013-08-081-533/+533
| | |
* | | Add public visibility setting to privacy groups (collections). This doesn't ↵friendica2013-08-073-43/+67
| |/ |/| | | | | yet make them visible, but allows them to be visible (like a Cc: instead of a Bcc:)
* | This is an actual arrowhead, the nabla is a math operator.friendica2013-08-062-3/+3
| |
* | wee bit of css cleanupfriendica2013-08-063-297/+102
| |
* | Add a site access policy (to determine if this is really a public site or ↵friendica2013-08-064-11/+15
| | | | | | | | 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.
* | ru string updatefriendica2013-08-061-1901/+1385
| |
* | Merge pull request #89 from pixelroot/masterfriendica2013-08-061-6559/+4136
|\| | | | | modified: view/ru/messages.po
| * modified: view/ru/messages.popixelroot2013-08-061-10/+10
| |
| * modified: view/ru/messages.popixelroot2013-08-061-6559/+4136
| |
* | js_upload is wretched, but at least fix the HTML in the template so it will ↵friendica2013-08-041-1/+1
| | | | | | | | work again.
* | Template boo-booThomas Willingham2013-08-041-5/+1
| |
* | connect link in directoryfriendica2013-08-031-0/+3
| |