aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* basic structure for premium channel implementationfriendica2013-08-215-6/+30
|
* poll stufffriendica2013-08-214-4/+65
|
* network-wide poll voting structurefriendica2013-08-203-20/+47
|
* Merge https://github.com/friendica/red into zpullfriendica2013-08-202-8956/+6225
|\
| * 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
| | |
* | | fix superblock for commentsfriendica2013-08-203-3/+17
|/ /
* | email attachments (and fix email photos)friendica2013-08-199-13/+137
| |
* | localize_item() thinks all likes on posts are likes on comments because we ↵friendica2013-08-192-1/+2
| | | | | | | | didn't pass any info in the activity object to distinguish them from each other.
* | if changing primary hub during an import operation - remove the old xchan ↵friendica2013-08-193-2/+27
|/ | | | 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.
* some sane permission defaults.friendica2013-08-184-19/+67
|
* Merge pull request #100 from cvogeley/masterfriendica2013-08-182-10/+16
|\ | | | | More steps for mobile theme toggling + dash elimination
| * More steps for mobile theme toggling + dash eliminationChristian Vogeley2013-08-192-10/+16
|/
* item_store logging to discover where object is getting quote mangled.friendica2013-08-181-1/+4
|
* Another try at issue #61 and #62 - an earlier fix was partially working but ↵friendica2013-08-183-10/+49
| | | | the issue persisted - this extends it a bit.
* Issue #99Thomas Willingham2013-08-181-0/+1
|
* issue #82, posted order not working - also doc updatefriendica2013-08-1779-1390/+2839
|
* get rid of more variables with dashes in the names - use underscore *except* ↵friendica2013-08-159-25/+25
| | | | in CSS. These were probably already here, but if you see any - please keep them out of PHP and MySQL where they sometimes get interpreted as a subtraction operation and are a bugger to find.
* Merge https://github.com/friendica/red into zpullfriendica2013-08-152-1/+4
|\
| * Merge pull request #98 from cvogeley/masterfriendica2013-08-152-1/+4
| |\ | | | | | | Partial fix for Issue #97
| | * Do it like normal themesChristian Vogeley2013-08-161-1/+1
| | |
| | * Fix Load mobile themeChristian Vogeley2013-08-162-1/+4
| | |
* | | we only want to maintain one INSTALL.txt - and it is in the directory ↵friendica2013-08-154-282/+47
|/ / | | | | | | 'install' where it belongs.
* | fix import from filefriendica2013-08-152-5/+5
| |
* | don't include archived contacts in public posts, unless specifically requestedfriendica2013-08-152-4/+5
| |
* | issues marking for deathfriendica2013-08-151-14/+15
|/
* fix homebase variablefriendica2013-08-151-1/+1
|
* move js from matrix pagefriendica2013-08-152-17/+9
|
* not able to drop pending connectionsfriendica2013-08-152-2/+3
|
* show main menu page even if no menus existfriendica2013-08-141-2/+2
|
* Merge https://github.com/friendica/red into zpullfriendica2013-08-146-23/+87
|\
| * Merge pull request #96 from beardy-unixer/masterfriendica2013-08-146-23/+87
| |\ | | | | | | Webpages
| | * More progress on pages - extend writepages widget, add pagelist widgetThomas Willingham2013-08-145-20/+46
| | |
| | * Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-08-1427-508/+1319
| | |\
| | * | Initial shot at write_pages widgetThomas Willingham2013-08-103-1/+29
| | | |
| | * | Small improvementThomas Willingham2013-08-091-1/+1
| | | |
| | * | Allow creation of webpages at channels other than your own.Thomas Willingham2013-08-091-9/+19
| | | |
* | | | util/pconfig - if you understand util/config you'll understand this; if you ↵friendica2013-08-141-0/+34
|/ / / | | | | | | | | | don't you won't
* | / most of expire is now ported from friendica, but the protocol bits to push ↵friendica2013-08-144-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.
* | typofriendica2013-08-141-1/+1
| |
* | fix expire so it actually should expire stuff; and mostly the correct stuff ↵friendica2013-08-142-12/+17
| | | | | | | | - though it DOESN'T currently send out notifications to connections
* | ru strings updatedfriendica2013-08-142-155/+159
| |
* | 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-132-0/+13
| | |
* | | 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-137-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 ↵friendica2013-08-135-15/+95
| | | | | | | | | | | | not). As usual, this means functionally complete - as theming and presentation have been left for those more suited to the task.