| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | Merge branch 'master' into trinidad | friendica | 2015-01-02 | 1 | -9/+11 | |
| |\| | | | ||||||
| | * | | | 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 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) | |||||
| | | * | | | 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 ↵ | 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 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 | |
| | |\ \ | | | | | | | | | 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 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 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 | |
| | | |/ / | ||||||
| * | / / | initial trinidad checkin | friendica | 2014-12-29 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | / | issue #777, make photo cache time configurable, read the comments. | friendica | 2014-12-27 | 2 | -4/+17 | |
| | |/ |/| | ||||||
| * | | 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 | |
| |/ | ||||||
| * | Pass sitename to apps | Thomas Willingham | 2014-12-22 | 1 | -0/+1 | |
| | | ||||||
| * | provide last successful poll run time (using relative time) in siteinfo so ↵ | friendica | 2014-12-21 | 1 | -1/+5 | |
| | | | | | that we can tell folks that have no idea what we're talking about that their poller definitely isn't running and this is probably why nothing works correctly. | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-21 | 1 | -1/+2 | |
| |\ | ||||||
| | * | files: make mod/filestorage.php load via ajax and some design work. work in ↵ | marijus | 2014-12-21 | 1 | -1/+2 | |
| | | | | | | | | | progress... | |||||
| * | | fix double encoding of homepage in profile activity - not as ↵ | friendica | 2014-12-21 | 1 | -1/+1 | |
| |/ | | | | straight-forward as it looked | |||||
| * | Access list of smilies over JSON | Stefan Parviainen | 2014-12-20 | 1 | -1/+13 | |
| | | ||||||
| * | provide link to help for channel permission roles when creating a channel | friendica | 2014-12-19 | 1 | -0/+2 | |
| | | ||||||
| * | incorrect check for sys ownership | friendica | 2014-12-19 | 1 | -4/+5 | |
| | | ||||||
| * | mod/import: try ten times to create a unique webbie if the chosen one is in use. | friendica | 2014-12-18 | 1 | -3/+27 | |
| | | ||||||
| * | fix some directory anomolies | friendica | 2014-12-16 | 1 | -1/+1 | |
| | | ||||||
| * | add divmore to directory entries | friendica | 2014-12-16 | 1 | -1/+2 | |
| | | ||||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-16 | 1 | -1/+1 | |
| |\ | ||||||
| | * | Minor doco | Thomas Willingham | 2014-12-16 | 1 | -1/+1 | |
| | | | ||||||
| * | | edit and preview removed from additional features and turned into core ↵ | friendica | 2014-12-16 | 4 | -4/+4 | |
| |/ | | | | functionality (always enabled). | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |