aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #103 from cvogeley/masterfriendica2013-08-212-5/+5
|\
| * theme qualifier without dotsChristian Vogeley2013-08-211-3/+3
| * Merge remote-tracking branch 'upstream/master'Christian Vogeley2013-08-2121-9010/+6579
| |\ | |/ |/|
* | 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
| |\ \
| | * | 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 di...friendica2013-08-192-1/+2
* | | if changing primary hub during an import operation - remove the old xchan and...friendica2013-08-193-2/+27
|/ /
* | some sane permission defaults.friendica2013-08-184-19/+67
* | Merge pull request #100 from cvogeley/masterfriendica2013-08-182-10/+16
|\ \
| | * show chosen desktop theme when SESSION['show_mobile'] is falseChristian Vogeley2013-08-211-2/+2
| |/
| * 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 t...friendica2013-08-183-10/+49
* 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
* Merge https://github.com/friendica/red into zpullfriendica2013-08-152-1/+4
|\
| * Merge pull request #98 from cvogeley/masterfriendica2013-08-152-1/+4
| |\
| | * 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 'instal...friendica2013-08-154-282/+47
|/ /
* | 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
| |\
| | * 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 d...friendica2013-08-141-0/+34
|/ / /
* | / most of expire is now ported from friendica, but the protocol bits to push ou...friendica2013-08-144-6/+23
| |/ |/|
* | typofriendica2013-08-141-1/+1
* | fix expire so it actually should expire stuff; and mostly the correct stuff -...friendica2013-08-142-12/+17
* | ru strings updatedfriendica2013-08-142-155/+159
* | Merge pull request #95 from pixelroot/masterfriendica2013-08-141-301/+317
|\ \
| * | 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