Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2013-08-24 | 8 | -4/+73 |
|\ | |||||
| * | premium/restricted channel connections implemented, configure at ↵ | friendica | 2013-08-21 | 1 | -0/+23 |
| | | | | | | | | 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 | 2 | -0/+12 |
| | | | | | | | | buttons and editing has not been completed | ||||
| * | email attachments (and fix email photos) | friendica | 2013-08-19 | 2 | -3/+32 |
| | | |||||
| * | 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 |
| | | |||||
| * | 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 | 7 | -1/+97 |
|\| | |||||
| * | 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 | 1 | -1/+1 |
| | | |||||
| * | 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 | 1 | -1/+3 |
| | | |||||
| * | 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 |
|/ | |||||
* | 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 |
| | | |||||
* | | Add public visibility setting to privacy groups (collections). This doesn't ↵ | friendica | 2013-08-07 | 1 | -0/+1 |
|/ | | | | 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 | 1 | -1/+1 |
| | |||||
* | Add a site access policy (to determine if this is really a public site or ↵ | friendica | 2013-08-06 | 2 | -10/+0 |
| | | | | 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. | ||||
* | 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 |
| | |||||
* | Merge pull request #86 from beardy-unixer/master | friendica | 2013-08-01 | 1 | -1/+12 |
|\ | | | | | "Can edit my webpages" permissions | ||||
| * | "Can edit my webpages" permissions | Thomas Willingham | 2013-08-01 | 1 | -1/+12 |
| | | |||||
* | | make "selected" class work on all navigation menu items | marijus | 2013-08-01 | 1 | -1/+1 |
|/ | |||||
* | trying to center the selected channel on the manage page. Dreamhost really ↵ | friendica | 2013-07-25 | 1 | -0/+4 |
| | | | | botched up my dev site so it's taking 5 minute per page load - and I don't have any more time to waste tweaking one line of CSS, grabbing a cup of coffee, and drinking it, before seeing the CSS changes. It still needs more tweaking but I might have to do that on the production site - which loads promptly. | ||||
* | remove obsolete notifications | friendica | 2013-07-21 | 1 | -2/+0 |
| | |||||
* | remove some unused settings from admin page | friendica | 2013-07-21 | 1 | -2/+0 |
| | |||||
* | fix template syntax | friendica | 2013-07-17 | 1 | -1/+1 |
| | |||||
* | usability improvements on abook permissions settings - keep advanced ↵ | friendica | 2013-07-17 | 1 | -6/+6 |
| | | | | dialogue open, make quick links clear relevant settings before setting each, and don't auto submit. This shows you exactly what happens with the quick settings and allows you to change/correct it if it isn't what you want. | ||||
* | Kill autogenerated warnings, plus a typo. | Thomas Willingham | 2013-07-16 | 171 | -898/+14 |
| | |||||
* | Whitespace making smarty fart | Thomas Willingham | 2013-07-16 | 1 | -2/+2 |
| | |||||
* | theme the page link title | friendica | 2013-07-15 | 1 | -0/+3 |
| | |||||
* | more spin.js porting | marijus | 2013-07-15 | 3 | -19/+18 |
| | |||||
* | we need to actually include spin.js or it causes issues | friendica | 2013-07-14 | 1 | -1/+1 |
| | |||||
* | Merge pull request #77 from git-marijus/master | friendica | 2013-07-14 | 7 | -11/+11 |
|\ | | | | | add spin.js a themable js spinner to red | ||||
| * | port jot to spin.js | git-marijus | 2013-07-13 | 1 | -1/+1 |
| | | |||||
| * | port jot to spin.js | git-marijus | 2013-07-13 | 1 | -3/+3 |
| | | |||||
| * | port jot to spin.js | git-marijus | 2013-07-13 | 1 | -1/+1 |
| | | |||||
| * | port like button to spin.js | git-marijus | 2013-07-13 | 1 | -1/+1 |
| | | |||||
| * | port like button to spin.js | git-marijus | 2013-07-13 | 1 | -1/+1 |
| | | |||||
| * | port like button to spin.js | git-marijus | 2013-07-13 | 1 | -2/+2 |
| | | |||||
| * | Update conv_frame.tpl | git-marijus | 2013-07-13 | 1 | -0/+1 |
| | |