Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ | | | | | Update build_query for mid | ||||
| * | 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 |
| |\ | | | | | | | Use prettyPhoto for photo albums | ||||
| | * | 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 |
| | | | | | | | | | | | | it was fixed) | ||||
| | * | 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 | ||||
| | * | 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 ↵ | friendica | 2013-03-21 | 27 | -284/+315 |
| | | | | | | | | longer remotely resemble uri's and are actually message_id's. This change is potentially destabilising because it touches a lot of code and structure. But it has to get done and there's no better time than the present. | ||||
* | | support various and multiple content_types on the display side - still have ↵ | friendica | 2013-03-21 | 1 | -7/+28 |
|/ | | | | some work to do on the posting side. | ||||
* | 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 |
| |\ | | | | | | | small fix for to add additional profiles | ||||
| | * | 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 |
| |\ | | | | | | | Small fixes | ||||
| | * | 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 ↵ | Thomas Willingham | 2013-03-20 | 1 | -15/+2 |
| | | | | | | | | | | | | have it's xchan. | ||||
| | * | 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 |
| |\ \ | | | | | | | | | update channel notify flags on save settings | ||||
| | * | | 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 to profile table | ||||
| | * | 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 ↵ | friendica | 2013-03-18 | 3 | -10/+29 |
| | | | | directory synchronisation | ||||
* | Merge pull request #36 from beardy-unixer/master | friendica | 2013-03-18 | 3 | -0/+28 |
|\ | | | | | Admin panel mobility/accessibility theme options | ||||
| * | Allow admins to specify default mobile/accessibility theme. | Thomas Willingham | 2013-03-17 | 3 | -0/+28 |
|/ | |||||
* | Merge pull request #34 from beardy-unixer/master | friendica | 2013-03-15 | 3 | -29/+14 |
|\ | | | | | Admin panel | ||||
| * | Tidy up | Thomas Willingham | 2013-03-15 | 3 | -14/+8 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2013-03-14 | 36 | -6000/+3420 |
| |\ | | | | | | | | | | | | | Conflicts: view/theme/redbasic/css/style.css | ||||
| * | | Get admin/users mostly working. Still need to associate channels with accounts. | Thomas Willingham | 2013-03-12 | 2 | -18/+9 |
| | | | |||||
| * | | Get rid of max-height - no longer breaks newer versions of chrome, but does ↵ | Thomas Willingham | 2013-03-11 | 1 | -3/+2 |
| | | | | | | | | | | | | break showmore. | ||||
* | | | add xconfig table and functions, update strings and doco | friendica | 2013-03-15 | 107 | -955/+1707 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2013-03-14 | 2 | -2/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix path in photo_ablums.tpl | Thomas Willingham | 2013-03-13 | 2 | -2/+2 |
| | | | |||||
* | | | prepare for multiple content types | friendica | 2013-03-14 | 2 | -70/+33 |
| | | | |||||
* | | | update modification time whenever a directory related attribute is changed | friendica | 2013-03-13 | 1 | -2/+24 |
|/ / |