| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master' into trinidad | friendica | 2015-01-07 | 4 | -42/+22 |
| |\ |
|
| | * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-07 | 1 | -34/+14 |
| | |\ |
|
| | | * | Return results from acl.php in standard form | Stefan Parviainen | 2015-01-07 | 1 | -20/+0 |
| | | * | Make nav search use textcomplete | Stefan Parviainen | 2015-01-07 | 1 | -14/+14 |
| | * | | syncing connections issue, incorrect return_url after deleting connection | friendica | 2015-01-07 | 2 | -6/+6 |
| | * | | don't allow admin to delete the sys channel from the channel manage page | friendica | 2015-01-06 | 1 | -2/+2 |
| | |/ |
|
| * | | begin the grand unification for 3.0. Start by splitting DAV into a web access... | friendica | 2015-01-06 | 2 | -27/+156 |
| * | | undo these bits of trinidad - we're going to do things differently | friendica | 2015-01-05 | 1 | -1/+1 |
| * | | Merge branch 'master' into trinidad | friendica | 2015-01-04 | 1 | -1/+1 |
| |\| |
|
| | * | the last checkin removed hostname from the address for autocomplete searches.... | friendica | 2015-01-04 | 1 | -1/+1 |
| * | | Merge branch 'master' into trinidad | friendica | 2015-01-04 | 1 | -1/+1 |
| |\| |
|
| | * | only check the LHS of xchan_addr for autocomplete, don't match on the hostname. | friendica | 2015-01-04 | 1 | -1/+1 |
| * | | Merge branch 'master' into trinidad | friendica | 2015-01-04 | 2 | -76/+73 |
| |\| |
|
| | * | Merge pull request #816 from pafcu/acl | RedMatrix | 2015-01-05 | 1 | -75/+72 |
| | |\ |
|
| | | * | Typo | Stefan Parviainen | 2015-01-04 | 1 | -3/+3 |
| | | * | Sorting of autocomplete | Stefan Parviainen | 2015-01-04 | 4 | -21/+56 |
| | | |\ |
|
| | | * | | Autocmplete suggestions for non-local users, also suggest from visited channe... | Stefan Parviainen | 2015-01-04 | 1 | -75/+52 |
| | * | | | Fix wrong require | Stefan Parviainen | 2015-01-04 | 1 | -1/+1 |
| | | |/
| |/| |
|
| * | | | Merge branch 'master' into trinidad | friendica | 2015-01-04 | 1 | -1/+3 |
| |\| | |
|
| | * | | provide some info for buttons | marijus | 2015-01-03 | 1 | -1/+3 |
| * | | | Merge branch 'master' into trinidad | friendica | 2015-01-02 | 1 | -9/+11 |
| |\| | |
|
| | * | | some work on the edit connection workflow explanation and connedit page. This... | friendica | 2015-01-02 | 1 | -9/+11 |
| * | | | Merge branch 'master' into trinidad | friendica | 2015-01-02 | 1 | -2/+5 |
| |\| | |
|
| | * | | Merge pull request #810 from pafcu/aclsort | pafcu | 2015-01-02 | 1 | -2/+5 |
| | |\ \ |
|
| | | * | | Sort acl results according to match position (only type='c' for now) | Stefan Parviainen | 2015-01-02 | 1 | -2/+5 |
| | | |/ |
|
| * | | | Merge branch 'master' into trinidad | friendica | 2015-01-01 | 1 | -7/+15 |
| |\| | |
|
| | * | | syntax issues (with some php versions?), unchecked intval | friendica | 2015-01-01 | 1 | -7/+15 |
| | |/ |
|
| * | | Merge branch 'master' into trinidad | friendica | 2015-01-01 | 5 | -28/+30 |
| |\| |
|
| | * | fix shares that are processed with markdown (regression, this was pulled from... | friendica | 2015-01-01 | 1 | -3/+5 |
| | * | Merge pull request #805 from pafcu/moretpl | RedMatrix | 2015-01-02 | 3 | -12/+5 |
| | |\ |
|
| | | * | Use grouped select field for role selection | Stefan Parviainen | 2015-01-01 | 2 | -8/+3 |
| | | * | Use grouped select field for timezone selection | Stefan Parviainen | 2015-01-01 | 2 | -4/+2 |
| | * | | Checkboxify yesno-fields, but use CSS to show them as switches in Redbasic | Stefan Parviainen | 2015-01-01 | 2 | -13/+20 |
| | |/ |
|
| * | | Merge branch 'master' into trinidad | friendica | 2014-12-30 | 4 | -5/+21 |
| |\| |
|
| | * | Merge pull request #797 from anaqreon/imagelink | RedMatrix | 2014-12-31 | 1 | -1/+8 |
| | |\ |
|
| | | * | Added url tag around image for inserted links | Andrew Manning | 2014-12-30 | 1 | -1/+8 |
| | * | | Merge pull request #791 from pafcu/notifications | RedMatrix | 2014-12-31 | 1 | -0/+5 |
| | |\ \
| | |/
| |/| |
|
| | | * | Make showing wall posts, intros and private messages under Notices optional | Stefan Parviainen | 2014-12-30 | 1 | -0/+5 |
| | * | | Merge pull request #793 from pafcu/filestorageurlfix | pafcu | 2014-12-30 | 1 | -1/+5 |
| | |\ \ |
|
| | | * | | Encode URL offered in filestorage. Fixes #780 | Stefan Parviainen | 2014-12-30 | 1 | -1/+5 |
| | * | | | Sort notifications | Stefan Parviainen | 2014-12-30 | 1 | -2/+2 |
| | |/ / |
|
| | * | | fix recursive file permissions | marijus | 2014-12-30 | 1 | -1/+1 |
| * | | | Merge branch 'master' into trinidad | friendica | 2014-12-29 | 3 | -15/+34 |
| |\| | |
|
| | * | | Merge pull request #789 from pafcu/chanman | RedMatrix | 2014-12-30 | 1 | -5/+2 |
| | |\ \
| | |/
| |/| |
|
| | | * | Don't show current channel separately in channel manager, highlight it instead | Stefan Parviainen | 2014-12-29 | 1 | -5/+2 |
| | * | | filter posts you author from unseen notifications - note there are other ways... | friendica | 2014-12-28 | 1 | -4/+9 |
| | * | | Merge pull request #772 from pafcu/chanman | RedMatrix | 2014-12-29 | 1 | -3/+10 |
| | |\| |
|
| | | * | Allow quick access to mail and connections from Channel Manager | Stefan Parviainen | 2014-12-27 | 1 | -2/+7 |
| | | * | Fix #771, add tooltips to mail and intros count in channel manager, always sh... | Stefan Parviainen | 2014-12-27 | 1 | -1/+3 |
| | * | | Merge pull request #769 from pafcu/profiles | RedMatrix | 2014-12-29 | 1 | -4/+14 |
| | |\ \ |
|
