Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2013-08-24 | 133 | -10797/+9947 |
|\ | |||||
| * | Merge pull request #104 from cvogeley/master | friendica | 2013-08-24 | 1 | -0/+2 |
| |\ | | | | | | | Make footers position fixed, so that its content appears... | ||||
| | * | Make footers position fixed, so that its content appears | Christian Vogeley | 2013-08-24 | 1 | -0/+2 |
| |/ | |||||
| * | this should fix the premium checkbox stickiness issue | friendica | 2013-08-22 | 1 | -6/+10 |
| | | |||||
| * | proc_run, not proc_exec | friendica | 2013-08-22 | 1 | -1/+1 |
| | | |||||
| * | perform a refresh_all operation after changing premium status so that ↵ | friendica | 2013-08-22 | 1 | -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 ↵ | friendica | 2013-08-22 | 1 | -0/+3 |
| | | | | | | | | failing on occasion. | ||||
| * | possible fix for mention tags not posting to mentioned forum (when send ↵ | friendica | 2013-08-22 | 1 | -3/+25 |
| | | | | | | | | stream permission is blocked) | ||||
| * | add detailed logging to public recips - find out why some public recipients ↵ | friendica | 2013-08-22 | 1 | -0/+3 |
| | | | | | | | | are getting bypassed (David Benfells' problem with tagging groups, etc.) | ||||
| * | make premium channels a feature | friendica | 2013-08-22 | 2 | -2/+14 |
| | | |||||
| * | add zid to connect_url | friendica | 2013-08-22 | 2 | -2/+2 |
| | | |||||
| * | fixes for sellpage with blocked profiles | friendica | 2013-08-21 | 1 | -9/+16 |
| | | |||||
| * | premium/restricted channel connections implemented, configure at ↵ | friendica | 2013-08-21 | 8 | -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 ↵ | friendica | 2013-08-21 | 6 | -7/+121 |
| | | | | | | | | buttons and editing has not been completed | ||||
| * | implement premium channel discovery | friendica | 2013-08-21 | 1 | -5/+14 |
| | | |||||
| * | Merge https://github.com/friendica/red into zpull | friendica | 2013-08-21 | 2 | -5/+5 |
| |\ | |||||
| | * | Merge pull request #103 from cvogeley/master | friendica | 2013-08-21 | 2 | -5/+5 |
| | |\ | | | | | | | | | More mobile stuff | ||||
| | | * | theme qualifier without dots | Christian Vogeley | 2013-08-21 | 1 | -3/+3 |
| | | | | |||||
| | | * | Merge remote-tracking branch 'upstream/master' | Christian Vogeley | 2013-08-21 | 21 | -9010/+6579 |
| | | |\ | | | |/ | | |/| | | | | | Update | ||||
| | | * | show chosen desktop theme when SESSION['show_mobile'] is false | Christian Vogeley | 2013-08-21 | 1 | -2/+2 |
| | | | | |||||
| * | | | basic structure for premium channel implementation | friendica | 2013-08-21 | 5 | -6/+30 |
| |/ / | |||||
| * | | poll stuff | friendica | 2013-08-21 | 4 | -4/+65 |
| | | | |||||
| * | | network-wide poll voting structure | friendica | 2013-08-20 | 3 | -20/+47 |
| | | | |||||
| * | | Merge https://github.com/friendica/red into zpull | friendica | 2013-08-20 | 2 | -8956/+6225 |
| |\ \ | |||||
| | * \ | Merge pull request #101 from tuscanhobbit/master | friendica | 2013-08-20 | 2 | -8956/+6225 |
| | |\ \ | | | | | | | | | | | Italian translation (Thanks!) | ||||
| | | * | | First version of Italian translation | p.tacconi | 2013-08-20 | 2 | -5/+5 |
| | | | | | |||||
| | | * | | First version of Italian translation | p.tacconi | 2013-08-20 | 2 | -8954/+6223 |
| | | | | | |||||
| * | | | | fix superblock for comments | friendica | 2013-08-20 | 3 | -3/+17 |
| |/ / / | |||||
| * | | | email attachments (and fix email photos) | friendica | 2013-08-19 | 9 | -13/+137 |
| | | | | |||||
| * | | | localize_item() thinks all likes on posts are likes on comments because we ↵ | friendica | 2013-08-19 | 2 | -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 ↵ | friendica | 2013-08-19 | 3 | -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. | friendica | 2013-08-18 | 4 | -19/+67 |
| | | | |||||
| * | | Merge pull request #100 from cvogeley/master | friendica | 2013-08-18 | 2 | -10/+16 |
| |\| | | | | | | | More steps for mobile theme toggling + dash elimination | ||||
| | * | More steps for mobile theme toggling + dash elimination | Christian Vogeley | 2013-08-19 | 2 | -10/+16 |
| |/ | |||||
| * | item_store logging to discover where object is getting quote mangled. | friendica | 2013-08-18 | 1 | -1/+4 |
| | | |||||
| * | Another try at issue #61 and #62 - an earlier fix was partially working but ↵ | friendica | 2013-08-18 | 3 | -10/+49 |
| | | | | | | | | the issue persisted - this extends it a bit. | ||||
| * | Issue #99 | Thomas Willingham | 2013-08-18 | 1 | -0/+1 |
| | | |||||
| * | issue #82, posted order not working - also doc update | friendica | 2013-08-17 | 79 | -1390/+2839 |
| | | |||||
| * | get rid of more variables with dashes in the names - use underscore *except* ↵ | friendica | 2013-08-15 | 9 | -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 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 |
| | |