| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2013-03-28 | 49 | -279/+361 |
| |\ |
|
| | * | clarify | friendica | 2013-03-27 | 1 | -1/+1 |
| | * | updated readme | friendica | 2013-03-27 | 1 | -9/+6 |
| | * | add new connections to default group (if any) | friendica | 2013-03-27 | 5 | -62/+47 |
| | * | update manage table and some documentation | friendica | 2013-03-27 | 46 | -210/+310 |
| * | | Template clean up. | Thomas Willingham | 2013-03-28 | 63 | -2344/+1 |
| |/ |
|
| * | more doco | friendica | 2013-03-26 | 1 | -5/+8 |
| * | set hidden flags on new directory entries, not just existing ones | friendica | 2013-03-26 | 3 | -6/+29 |
| * | magic auth issue | friendica | 2013-03-26 | 2 | -4/+12 |
| * | we don't need this any more | friendica | 2013-03-25 | 1 | -84/+0 |
| * | doco | friendica | 2013-03-25 | 3 | -11/+106 |
| * | uri to mid | friendica | 2013-03-25 | 2 | -2/+2 |
| * | Merge pull request #43 from beardy-unixer/master | friendica | 2013-03-25 | 5 | -11/+9 |
| |\ |
|
| | * | Updated build_query for mid | Thomas Willingham | 2013-03-25 | 5 | -11/+9 |
| |/ |
|
| * | fix mod_display breakage. | friendica | 2013-03-24 | 2 | -3/+10 |
| * | descriptive text | friendica | 2013-03-23 | 1 | -0/+23 |
| * | Merge https://github.com/friendica/red into zpull | friendica | 2013-03-23 | 48 | -5/+429 |
| |\ |
|
| | * | Merge pull request #42 from beardy-unixer/master | friendica | 2013-03-23 | 47 | -2/+427 |
| | |\ |
|
| | | * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2013-03-23 | 1 | -3/+2 |
| | | |\
| | |/
| |/| |
|
| | * | | Redbasic - get rid of max-height for images (got lost in the merge last time ... | Thomas Willingham | 2013-03-23 | 1 | -3/+2 |
| | | * | Implement prettyPhoto (somewhat). | Thomas Willingham | 2013-03-23 | 3 | -2/+16 |
| | | * | Remove Twatter/Facebook shit. | Thomas Willingham | 2013-03-23 | 1 | -1/+1 |
| | | * | Add prettyPhoto library. | Thomas Willingham | 2013-03-23 | 44 | -0/+411 |
| | |/ |
|
| * / | rev update | friendica | 2013-03-23 | 3 | -1535/+1560 |
| |/ |
|
| * | Merge https://github.com/friendica/red into zpull | friendica | 2013-03-21 | 3 | -15/+17 |
| |\ |
|
| | * | Merge pull request #41 from unary/events | friendica | 2013-03-21 | 3 | -15/+17 |
| | |\ |
|
| | | * | small fixes for events | Michael Johnston | 2013-03-21 | 3 | -15/+17 |
| | |/ |
|
| * | | rename 'uri' (and parent_uri) to 'mid' (and parent_mid) since these no longer... | friendica | 2013-03-21 | 27 | -284/+315 |
| * | | support various and multiple content_types on the display side - still have s... | friendica | 2013-03-21 | 1 | -7/+28 |
| |/ |
|
| * | Merge https://github.com/friendica/red into zpull | friendica | 2013-03-21 | 1 | -1/+1 |
| |\ |
|
| | * | Merge pull request #40 from MicMee/master | friendica | 2013-03-21 | 1 | -1/+1 |
| | |\ |
|
| | | * | otherwise add profile wont work | Michael Meer | 2013-03-21 | 1 | -1/+1 |
| | |/ |
|
| * | | main_slider hook | friendica | 2013-03-21 | 1 | -1/+4 |
| * | | update for js_upload | friendica | 2013-03-21 | 1 | -3/+3 |
| |/ |
|
| * | Merge https://github.com/friendica/red into zpull | friendica | 2013-03-21 | 10 | -5/+41 |
| |\ |
|
| | * | Merge pull request #38 from beardy-unixer/master | friendica | 2013-03-21 | 6 | -2/+32 |
| | |\ |
|
| | | * | Typo | Thomas Willingham | 2013-03-21 | 2 | -2/+2 |
| | | * | Add register link to nav. | Thomas Willingham | 2013-03-21 | 2 | -0/+6 |
| | | * | Revert randprof - that was stupid. If you have a local channel, you also hav... | Thomas Willingham | 2013-03-20 | 1 | -15/+2 |
| | | * | Add a fallback or two to randprof. | Thomas Willingham | 2013-03-20 | 1 | -2/+15 |
| | | * | Use load_pconfig in style.php | Thomas Willingham | 2013-03-20 | 1 | -1/+2 |
| | | * | Make the channels profile tab actually do something. | Thomas Willingham | 2013-03-20 | 3 | -1/+24 |
| | * | | Merge pull request #39 from zzottel/master | friendica | 2013-03-21 | 1 | -1/+2 |
| | |\ \ |
|
| | | * | | write notify settings to channel table when saving settings | zottel | 2013-03-21 | 1 | -1/+2 |
| | |/ / |
|
| | * | | Merge pull request #37 from beardy-unixer/master | friendica | 2013-03-19 | 3 | -2/+7 |
| | |\| |
|
| | | * | Add "channels" field to profile table. | Thomas Willingham | 2013-03-20 | 3 | -2/+7 |
| | |/ |
|
| * / | update | friendica | 2013-03-21 | 3 | -12/+35 |
| |/ |
|
| * | we'll need a special system channel (not attached to any account) for directo... | friendica | 2013-03-18 | 3 | -10/+29 |
| * | Merge pull request #36 from beardy-unixer/master | friendica | 2013-03-18 | 3 | -0/+28 |
| |\ |
|
| | * | Allow admins to specify default mobile/accessibility theme. | Thomas Willingham | 2013-03-17 | 3 | -0/+28 |
| |/ |
|
