aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* TypoThomas Willingham2013-08-241-1/+1
|
* Another one.Thomas Willingham2013-08-241-0/+2
|
* Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-08-24133-10797/+9947
|\
| * Merge pull request #104 from cvogeley/masterfriendica2013-08-241-0/+2
| |\ | | | | | | Make footers position fixed, so that its content appears...
| | * Make footers position fixed, so that its content appearsChristian Vogeley2013-08-241-0/+2
| |/
| * this should fix the premium checkbox stickiness issuefriendica2013-08-221-6/+10
| |
| * proc_run, not proc_execfriendica2013-08-221-1/+1
| |
| * perform a refresh_all operation after changing premium status so that ↵friendica2013-08-221-2/+4
| | | | | | | | everybody will catch it quickly and not in a day or two.
| * extra logging for translating likes in notification emails - which is still ↵friendica2013-08-221-0/+3
| | | | | | | | failing on occasion.
| * possible fix for mention tags not posting to mentioned forum (when send ↵friendica2013-08-221-3/+25
| | | | | | | | stream permission is blocked)
| * add detailed logging to public recips - find out why some public recipients ↵friendica2013-08-221-0/+3
| | | | | | | | are getting bypassed (David Benfells' problem with tagging groups, etc.)
| * make premium channels a featurefriendica2013-08-222-2/+14
| |
| * add zid to connect_urlfriendica2013-08-222-2/+2
| |
| * fixes for sellpage with blocked profilesfriendica2013-08-211-9/+16
| |
| * premium/restricted channel connections implemented, configure at ↵friendica2013-08-218-15/+82
| | | | | | | | 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 ↵friendica2013-08-216-7/+121
| | | | | | | | buttons and editing has not been completed
| * implement premium channel discoveryfriendica2013-08-211-5/+14
| |
| * Merge https://github.com/friendica/red into zpullfriendica2013-08-212-5/+5
| |\
| | * Merge pull request #103 from cvogeley/masterfriendica2013-08-212-5/+5
| | |\ | | | | | | | | More mobile stuff
| | | * theme qualifier without dotsChristian Vogeley2013-08-211-3/+3
| | | |
| | | * Merge remote-tracking branch 'upstream/master'Christian Vogeley2013-08-2121-9010/+6579
| | | |\ | | | |/ | | |/| | | | | Update
| | | * show chosen desktop theme when SESSION['show_mobile'] is falseChristian Vogeley2013-08-211-2/+2
| | | |
| * | | 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
| |