Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-08-15 | 2 | -1/+4 | |
|\ \ | ||||||
| * \ | Merge pull request #98 from cvogeley/master | friendica | 2013-08-15 | 2 | -1/+4 | |
| |\ \ | | | | | | | | | Partial fix for Issue #97 | |||||
| | * | | Do it like normal themes | Christian Vogeley | 2013-08-16 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Fix Load mobile theme | Christian Vogeley | 2013-08-16 | 2 | -1/+4 | |
| | | | | ||||||
* | | | | we only want to maintain one INSTALL.txt - and it is in the directory ↵ | friendica | 2013-08-15 | 4 | -282/+47 | |
|/ / / | | | | | | | | | | 'install' where it belongs. | |||||
* | | | fix import from file | friendica | 2013-08-15 | 2 | -5/+5 | |
| | | | ||||||
* | | | don't include archived contacts in public posts, unless specifically requested | friendica | 2013-08-15 | 2 | -4/+5 | |
| | | | ||||||
* | | | issues marking for death | friendica | 2013-08-15 | 1 | -14/+15 | |
|/ / | ||||||
* | | fix homebase variable | friendica | 2013-08-15 | 1 | -1/+1 | |
| | | ||||||
* | | move js from matrix page | friendica | 2013-08-15 | 2 | -17/+9 | |
| | | ||||||
* | | not able to drop pending connections | friendica | 2013-08-15 | 2 | -2/+3 | |
| | | ||||||
* | | show main menu page even if no menus exist | friendica | 2013-08-14 | 1 | -2/+2 | |
| | | ||||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-08-14 | 6 | -23/+87 | |
|\ \ | ||||||
| * | | Merge pull request #96 from beardy-unixer/master | friendica | 2013-08-14 | 6 | -23/+87 | |
| |\| | | | | | | | Webpages | |||||
| | * | More progress on pages - extend writepages widget, add pagelist widget | Thomas Willingham | 2013-08-14 | 5 | -20/+46 | |
| | | | ||||||
| | * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2013-08-14 | 27 | -508/+1319 | |
| | |\ | ||||||
| | * | | 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 | |
| | | | | ||||||
* | | | | util/pconfig - if you understand util/config you'll understand this; if you ↵ | friendica | 2013-08-14 | 1 | -0/+34 | |
|/ / / | | | | | | | | | | don't you won't | |||||
* | / | most of expire is now ported from friendica, but the protocol bits to push ↵ | friendica | 2013-08-14 | 4 | -6/+23 | |
| |/ |/| | | | | | 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. | |||||
* | | 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. | |||||
* | | 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 |