Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2013-08-14 | 27 | -508/+1319 |
|\ | |||||
| * | typo | friendica | 2013-08-14 | 1 | -1/+1 |
| | | |||||
| * | fix expire so it actually should expire stuff; and mostly the correct stuff ↵ | friendica | 2013-08-14 | 2 | -12/+17 |
| | | | | | | | | - though it DOESN'T currently send out notifications to connections | ||||
| * | ru strings updated | friendica | 2013-08-14 | 2 | -155/+159 |
| | | |||||
| * | 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 | 2 | -0/+13 |
| | | | |||||
| * | | 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 | 7 | -26/+133 |
| | | | | | | | | | | | | 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 | 5 | -15/+95 |
| | | | | | | | | | | | | 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 | 4 | -5/+24 |
| | | | |||||
| * | | untested patch for issue #58 - will require theming if it works | friendica | 2013-08-13 | 3 | -12/+28 |
| | | | |||||
| * | | a bit more work on menus | friendica | 2013-08-13 | 4 | -1/+43 |
| | | | |||||
| * | | block content-type (called ITEM_BUILDBLOCK to avoid confusion with content ↵ | friendica | 2013-08-12 | 3 | -0/+9 |
| | | | | | | | | | | | | that is blocked) | ||||
| * | | add mod_mitem to manage menu items | friendica | 2013-08-12 | 2 | -35/+95 |
| | | | |||||
| * | | menu module | friendica | 2013-08-12 | 1 | -0/+96 |
| | | | |||||
| * | | theme personal menus so they look more or less like widgets | friendica | 2013-08-12 | 3 | -3/+13 |
| | | | |||||
| * | | more menu manage functions - should be everything we need to get started | friendica | 2013-08-11 | 1 | -0/+187 |
| | | | |||||
| * | | debugging user menus | friendica | 2013-08-11 | 1 | -6/+4 |
| | | | |||||
| * | | check these in so I can go back and find out why the stylsheet is horked | friendica | 2013-08-11 | 5 | -3/+74 |
| | | | |||||
| * | | Merge https://github.com/friendica/red into zpull | friendica | 2013-08-11 | 3 | -1/+2 |
| |\ \ | |||||
| | * | | Update install.txt - fix shell command and path instruction | Abinoam P. Marques Jr. | 2013-08-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | - Fix chown with chmod - Fix path from view/smarty3 to view/tpl/smarty3 | ||||
| | * | | How did that end up there? Move sample config to right place. | Thomas Willingham | 2013-08-11 | 1 | -0/+0 |
| | | | | |||||
| | * | | Missing include for new_keypair | Thomas Willingham | 2013-08-10 | 1 | -0/+1 |
| | | | | |||||
| * | | | important bits we need to allow php executable content. These must be ↵ | friendica | 2013-08-11 | 3 | -20/+53 |
| | | | | | | | | | | | | | | | | explicitly allowed - but only if the account has ACCOUNT_ROLE_ALLOWCODE and *only* for web pages and profile fields. This content cannot be transmitted to other sites. | ||||
| * | | | don't import any hubloc that doesn't have a sitekey. Eventually we should ↵ | friendica | 2013-08-11 | 2 | -3/+8 |
| |/ / | | | | | | | | | | also verify that it is a valid key, as we've already seen one case where one character got mangled and messed up communication. | ||||
* | | | Initial shot at write_pages widget | Thomas Willingham | 2013-08-10 | 3 | -1/+29 |
| | | | |||||
* | | | Small improvement | Thomas Willingham | 2013-08-09 | 1 | -1/+1 |
| | | | |||||
* | | | Allow creation of webpages at channels other than your own. | Thomas Willingham | 2013-08-09 | 1 | -9/+19 |
|/ / | |||||
* | | fix string horkage | friendica | 2013-08-09 | 2 | -109/+103 |
| | | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-08-09 | 1 | -422/+379 |
|\ \ | |||||
| * | | 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 |
| | | | |||||
* | | | string parse error extracting one particular string | friendica | 2013-08-09 | 4 | -1280/+1425 |
|/ / | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-08-09 | 3 | -1/+18 |
|\ \ | |||||
| * \ | Merge pull request #90 from beardy-unixer/master | friendica | 2013-08-08 | 3 | -1/+18 |
| |\ \ | | | | | | | | | Add access policy to admin panel. | ||||
| | * | | Unbork webpage permissions - missed this because most of my channel_ids are 1. | Thomas Willingham | 2013-08-07 | 1 | -1/+7 |
| | | | | |||||
| | * | | Add access policy to admin panel. | Thomas Willingham | 2013-08-07 | 2 | -0/+11 |
| | | | | |||||
* | | | | add a few missing doc pages | friendica | 2013-08-09 | 6 | -0/+488 |
| | | | | |||||
* | | | | move sitekey creation to the account creation function instead of during ↵ | friendica | 2013-08-09 | 103 | -1776/+1797 |
|/ / / | | | | | | | | | | channel creation. Channel import bypassed sitekey creation completely. We should do it during install, but it's possible somebody might have to install manually and the sitekey would never get created. This is the best compromise I can come up with. Looks like the doc tree was also updated in this checkin | ||||
* | | | donate link | friendica | 2013-08-08 | 1 | -0/+2 |
| | | | |||||
* | | | malformed ru string file | friendica | 2013-08-08 | 3 | -534/+534 |
| | | | |||||
* | | | 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 | 5 | -49/+80 |
| |/ |/| | | | | | yet make them visible, but allows them to be visible (like a Cc: instead of a Bcc:) | ||||
* | | remove some un-needed code | friendica | 2013-08-07 | 1 | -1320/+10 |
| | | |||||
* | | big changes to photo->store() which is now photo->save() and takes an array ↵ | friendica | 2013-08-07 | 4 | -20/+172 |
| | | | | | | | | instead of a list of args. Also the beginning of the migration to using photo_flags to indicate special purpose photos such as profile photos and contact photos and "thing" photos. | ||||
* | | 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 |
| | |