| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' | Christian Vogeley | 2015-01-11 | 18 | -205/+253 |
| |\ | | | | | | | | | | | Conflicts: doc/html/classRedmatrix_1_1Import_1_1Import-members.html doc/html/classRedmatrix_1_1Import_1_1Import.js | ||||
| | * | connection clone issues | friendica | 2015-01-10 | 1 | -2/+2 |
| | | | |||||
| | * | Fix unescaped image data | Habeas Codice | 2015-01-10 | 1 | -0/+1 |
| | | | |||||
| | * | basic changes for file activity | marijus | 2015-01-09 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #833 from pafcu/oneautocompleter | pafcu | 2015-01-08 | 2 | -23/+28 |
| | |\ | | | | | | | Fixes for the new autocompletion | ||||
| | | * | Fix saved searches on network page, fix caching mith multiple autocompleters | Stefan Parviainen | 2015-01-08 | 1 | -22/+26 |
| | | | | |||||
| | | * | Honor requested count in navbar search | Stefan Parviainen | 2015-01-08 | 1 | -1/+2 |
| | | | | |||||
| | * | | 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 |
| | |/ | |||||
| | * | the last checkin removed hostname from the address for autocomplete ↵ | friendica | 2015-01-04 | 1 | -1/+1 |
| | | | | | | | | | searches. This one allows it if explicitly added with a '@'. So 'mike' will find all mikes. 'mike@z' will find mike@zothub but not mike@popcorn. | ||||
| | * | only check the LHS of xchan_addr for autocomplete, don't match on the hostname. | friendica | 2015-01-04 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #816 from pafcu/acl | RedMatrix | 2015-01-05 | 1 | -75/+72 |
| | |\ | | | | | | | Autocomplete improvements | ||||
| | | * | 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 ↵ | Stefan Parviainen | 2015-01-04 | 1 | -75/+52 |
| | | | | | | | | | | | | | | | | | channel's connections | ||||
| | * | | | Fix wrong require | Stefan Parviainen | 2015-01-04 | 1 | -1/+1 |
| | | |/ | |/| | |||||
| | * | | provide some info for buttons | marijus | 2015-01-03 | 1 | -1/+3 |
| | | | | |||||
| | * | | some work on the edit connection workflow explanation and connedit page. ↵ | friendica | 2015-01-02 | 1 | -9/+11 |
| | | | | | | | | | | | | | This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved. | ||||
| | * | | 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) | ||||
| | | * | | Sort acl results according to match position (only type='c' for now) | Stefan Parviainen | 2015-01-02 | 1 | -2/+5 |
| | | |/ | |||||
| | * / | syntax issues (with some php versions?), unchecked intval | friendica | 2015-01-01 | 1 | -7/+15 |
| | |/ | |||||
| | * | fix shares that are processed with markdown (regression, this was pulled ↵ | friendica | 2015-01-01 | 1 | -3/+5 |
| | | | | | | | | | from diaspora2bb a couple weeks back as it was affecting diaspora input, but here we're dealing with red input only) | ||||
| | * | Merge pull request #805 from pafcu/moretpl | RedMatrix | 2015-01-02 | 3 | -12/+5 |
| | |\ | | | | | | | Move some HTML out to templates | ||||
| | | * | 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 pull request #797 from anaqreon/imagelink | RedMatrix | 2014-12-31 | 1 | -1/+8 |
| | |\ | | | | | | | Imagelink | ||||
| | | * | 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 |
| | |\ \ | | |/ | |/| | Improved notifications | ||||
| | | * | 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 | ||||
| | | * | | 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 pull request #789 from pafcu/chanman | RedMatrix | 2014-12-30 | 1 | -5/+2 |
| | |\ \ | | |/ | |/| | Don't show current channel separately in channel manager, highlight it i... | ||||
| | | * | 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 ↵ | friendica | 2014-12-28 | 1 | -4/+9 |
| | | | | | | | | | | | | | ways to do this, but involve some code complexity. This is easier to implement but may have a slight impact on the ping query performance. It's not horrid, just mentioning for the record. | ||||
| | * | | Merge pull request #772 from pafcu/chanman | RedMatrix | 2014-12-29 | 1 | -3/+10 |
| | |\| | | | | | | | Some work on the channel manager | ||||
| | | * | 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 ↵ | Stefan Parviainen | 2014-12-27 | 1 | -1/+3 |
| | | | | | | | | | | | | | show counts (even when 0, makes it easier to understand what the icons are) | ||||
| | * | | Merge pull request #769 from pafcu/profiles | RedMatrix | 2014-12-29 | 1 | -4/+14 |
| | |\ \ | | | | | | | | | Redirect /profiles to default profile when multi_profiles is off. Fixes ... | ||||
| | | * | | Redirect /profiles to default profile when multi_profiles is off. Fixes #768 | Stefan Parviainen | 2014-12-27 | 1 | -4/+14 |
| | | |/ | |||||
| | * | | issue #777, make photo cache time configurable, read the comments. | friendica | 2014-12-27 | 2 | -4/+17 |
| | | | | |||||
| * | | | Fix for issue #763 Error creating new channel within the limits of the | Christian Vogeley | 2015-01-11 | 1 | -1/+1 |
| |/ / | | | | | | | subscription plan | ||||
| * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-26 | 1 | -3/+0 |
| |\| | |||||
| | * | Cruft left over from stuff we don't have anymore. | Thomas Willingham | 2014-12-26 | 1 | -3/+0 |
| | | | |||||
| * | | doc update | friendica | 2014-12-26 | 1 | -1/+1 |
| |/ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |