Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2013-08-24 | 14 | -8961/+6322 |
|\ | |||||
| * | Make footers position fixed, so that its content appears | Christian Vogeley | 2013-08-24 | 1 | -0/+2 |
| | | |||||
| * | premium/restricted channel connections implemented, configure at ↵ | friendica | 2013-08-21 | 2 | -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 ↵ | friendica | 2013-08-21 | 3 | -0/+15 |
| | | | | | | | | buttons and editing has not been completed | ||||
| * | Merge pull request #101 from tuscanhobbit/master | friendica | 2013-08-20 | 2 | -8956/+6225 |
| |\ | | | | | | | Italian translation (Thanks!) | ||||
| | * | First version of Italian translation | p.tacconi | 2013-08-20 | 2 | -5/+5 |
| | | | |||||
| | * | First version of Italian translation | p.tacconi | 2013-08-20 | 2 | -8954/+6223 |
| | | | |||||
| * | | email attachments (and fix email photos) | friendica | 2013-08-19 | 3 | -3/+33 |
| | | | |||||
| * | | if changing primary hub during an import operation - remove the old xchan ↵ | friendica | 2013-08-19 | 1 | -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 update | friendica | 2013-08-17 | 1 | -0/+1 |
| | | |||||
| * | fix import from file | friendica | 2013-08-15 | 1 | -1/+1 |
| | | |||||
| * | move js from matrix page | friendica | 2013-08-15 | 1 | -0/+9 |
| | | |||||
| * | Merge pull request #96 from beardy-unixer/master | friendica | 2013-08-14 | 2 | -4/+8 |
| |\ | | | | | | | Webpages | ||||
| * | | most of expire is now ported from friendica, but the protocol bits to push ↵ | friendica | 2013-08-14 | 1 | -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 easier | Thomas Willingham | 2013-08-24 | 6 | -14/+20 |
| |/ |/| | |||||
* | | More progress on pages - extend writepages widget, add pagelist widget | Thomas Willingham | 2013-08-14 | 1 | -4/+5 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2013-08-14 | 10 | -457/+593 |
|\| | |||||
| * | ru strings updated | friendica | 2013-08-14 | 1 | -154/+158 |
| | | |||||
| * | Merge pull request #95 from pixelroot/master | friendica | 2013-08-14 | 1 | -301/+317 |
| |\ | | | | | | | modified: view/ru/messages.po | ||||
| | * | modified: view/ru/messages.po | pixelroot | 2013-08-12 | 1 | -11/+11 |
| | | | |||||
| | * | modified: view/ru/messages.po | pixelroot | 2013-08-12 | 1 | -297/+313 |
| | | | |||||
| * | | primitive cms functionality - provide a custom menu below your profile vcard | friendica | 2013-08-13 | 1 | -0/+3 |
| | | | |||||
| * | | helps to include the new templates... | friendica | 2013-08-13 | 2 | -0/+39 |
| | | | |||||
| * | | menu management is now functional with the exception of acl's (and of course ↵ | friendica | 2013-08-13 | 3 | -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 ↵ | friendica | 2013-08-13 | 3 | -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) theming | friendica | 2013-08-13 | 2 | -1/+13 |
| | | | |||||
| * | | untested patch for issue #58 - will require theming if it works | friendica | 2013-08-13 | 1 | -0/+4 |
| | | | |||||
| * | | a bit more work on menus | friendica | 2013-08-13 | 1 | -0/+16 |
| | | | |||||
| * | | theme personal menus so they look more or less like widgets | friendica | 2013-08-12 | 2 | -2/+12 |
| | | | |||||
| * | | check these in so I can go back and find out why the stylsheet is horked | friendica | 2013-08-11 | 1 | -0/+11 |
| | | | |||||
* | | | Initial shot at write_pages widget | Thomas Willingham | 2013-08-10 | 1 | -0/+3 |
|/ / | |||||
* | | fix string horkage | friendica | 2013-08-09 | 2 | -109/+103 |
| | | |||||
* | | Merge pull request #92 from pixelroot/master | friendica | 2013-08-09 | 1 | -422/+379 |
|\| | | | | | modified: view/ru/messages.po | ||||
| * | modified: view/ru/messages.po | pixelroot | 2013-08-09 | 1 | -422/+379 |
| | | |||||
* | | Merge pull request #90 from beardy-unixer/master | friendica | 2013-08-08 | 1 | -0/+1 |
|\ \ | | | | | | | Add access policy to admin panel. | ||||
| * | | Add access policy to admin panel. | Thomas Willingham | 2013-08-07 | 1 | -0/+1 |
| | | | |||||
* | | | malformed ru string file | friendica | 2013-08-08 | 1 | -532/+532 |
| | | | |||||
* | | | Merge pull request #91 from pixelroot/master | friendica | 2013-08-08 | 1 | -533/+533 |
|\ \ \ | | |/ | |/| | modified: view/ru/messages.po | ||||
| * | | modified: view/ru/messages.po | pixelroot | 2013-08-08 | 1 | -533/+533 |
| | | | |||||
* | | | Add public visibility setting to privacy groups (collections). This doesn't ↵ | friendica | 2013-08-07 | 3 | -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. | friendica | 2013-08-06 | 2 | -3/+3 |
| | | |||||
* | | wee bit of css cleanup | friendica | 2013-08-06 | 3 | -297/+102 |
| | | |||||
* | | Add a site access policy (to determine if this is really a public site or ↵ | friendica | 2013-08-06 | 4 | -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 update | friendica | 2013-08-06 | 1 | -1901/+1385 |
| | | |||||
* | | Merge pull request #89 from pixelroot/master | friendica | 2013-08-06 | 1 | -6559/+4136 |
|\| | | | | | modified: view/ru/messages.po | ||||
| * | modified: view/ru/messages.po | pixelroot | 2013-08-06 | 1 | -10/+10 |
| | | |||||
| * | modified: view/ru/messages.po | pixelroot | 2013-08-06 | 1 | -6559/+4136 |
| | | |||||
* | | js_upload is wretched, but at least fix the HTML in the template so it will ↵ | friendica | 2013-08-04 | 1 | -1/+1 |
| | | | | | | | | work again. | ||||
* | | Template boo-boo | Thomas Willingham | 2013-08-04 | 1 | -5/+1 |
| | | |||||
* | | connect link in directory | friendica | 2013-08-03 | 1 | -0/+3 |
| | |