| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | Merge branch 'master' into pocorate | friendica | 2015-02-02 | 2 | -0/+77 | |
| | |\| | | ||||||
| | | * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-02-02 | 2 | -0/+77 | |
| | | |\ \ | ||||||
| | | | * | | comment out latest changes - needs more testing | marijus | 2015-02-02 | 1 | -4/+4 | |
| | | | | | | ||||||
| | | | * | | comment this out for now - it is not always true | marijus | 2015-02-02 | 1 | -2/+2 | |
| | | | | | | ||||||
| | | | * | | one important line missing | marijus | 2015-02-02 | 1 | -0/+1 | |
| | | | | | | ||||||
| | | | * | | we also need folder here | marijus | 2015-02-02 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | | * | | typo | marijus | 2015-02-02 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | | * | | just select perms | marijus | 2015-02-02 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | | * | | respect parent dir permissions | marijus | 2015-02-02 | 2 | -0/+76 | |
| | | | | | | ||||||
| | | * | | | Merge branch 'pocorate'; commit '043ff33' | friendica | 2015-02-02 | 0 | -0/+0 | |
| | | | | | | ||||||
| | * | | | | add signatures | friendica | 2015-02-02 | 1 | -4/+12 | |
| | |/ / / | ||||||
| | * / / | issue #889 private tags for forums no longer recognised after tag refactor a ↵ | friendica | 2015-02-02 | 2 | -0/+4 | |
| | |/ / | | | | | | | | | | few weeks back. This solution is not optimal as it also leaves you in the privacy ACL in some cases and not in others but it restores the previous functionality | |||||
| * | | | Merge branch 'master' into tres | friendica | 2015-02-01 | 12 | -10/+108 | |
| |\| | | ||||||
| | * | | admin/dbsync not reporting failed updates | friendica | 2015-02-01 | 2 | -2/+2 | |
| | | | | ||||||
| | * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-02-01 | 2 | -3/+4 | |
| | |\ \ | ||||||
| | | * | | typo, see #884 | jeroenpraat | 2015-02-02 | 1 | -3/+3 | |
| | | | | | ||||||
| | | * | | add multipart/mixed to getIconFromType() | marijus | 2015-02-01 | 1 | -0/+1 | |
| | | | | | ||||||
| | * | | | two tracks proceeding in parallel - first adding the ability to store a ↵ | friendica | 2015-02-01 | 8 | -4/+101 | |
| | |/ / | | | | | | | | | | digital signature with ratings so that directories can pass them around, second provide some directory registration functions so we can obtain a list of directories from somewhere (to pass ratings around between them). This gives the primary directory role some value as that is where you register your directory. | |||||
| | * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-31 | 3 | -6/+16 | |
| | |\| | ||||||
| | * | | issue #885, autoperms not working for diaspora connections | friendica | 2015-01-31 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | revup | friendica | 2015-01-31 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master' into tres | friendica | 2015-01-31 | 108 | -4218/+5439 | |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: include/zot.php | |||||
| | * | | Add more detail about directory_mode settings to default config and docs | Habeas Codice | 2015-01-30 | 2 | -5/+15 | |
| | | | | ||||||
| | * | | prevent silly fake null date from causing problems OTW from older builds | Habeas Codice | 2015-01-30 | 1 | -1/+1 | |
| | |/ | ||||||
| | * | sync_locations() toggle DB flag functions were broken - result of postgres ↵ | friendica | 2015-01-30 | 6 | -4/+751 | |
| | | | | | | | | | changes. Split these into seperate set and reset blocks. | |||||
| | * | fix random profiles | friendica | 2015-01-30 | 1 | -2/+3 | |
| | | | ||||||
| | * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-30 | 1 | -1/+1 | |
| | |\ | ||||||
| | | * | better cross-browser compatibility for td hover colour | marijus | 2015-01-30 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | let zot_refresh continue without a primary hub if one cannot be found. also ↵ | friendica | 2015-01-30 | 86 | -4189/+4483 | |
| | |/ | | | | | | | weekly doc updates | |||||
| | * | Merge pull request #881 from cvogeley/master | RedMatrix | 2015-01-30 | 2 | -1/+5 | |
| | |\ | | | | | | | Add allowed and not allowed emails to the UI in the | |||||
| | | * | Add allowed and not allowed emails to the UI in the | Christian Vogeley | 2015-01-29 | 2 | -1/+5 | |
| | | | | | | | | | | | | | admin menu | |||||
| | * | | how did that stuff merge? grrrr.... | friendica | 2015-01-29 | 2 | -3/+3 | |
| | | | | ||||||
| | * | | bring back inline images | friendica | 2015-01-29 | 1 | -6/+15 | |
| | | | | ||||||
| | * | | enable ratings only in this branch until we're ready to push | friendica | 2015-01-29 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Merge branch 'master' into pocorate | friendica | 2015-01-29 | 5 | -6/+5 | |
| | |\ \ | ||||||
| | | * \ | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-29 | 4 | -6/+4 | |
| | | |\ \ | ||||||
| | | | * \ | Merge pull request #880 from redswede/master | RedMatrix | 2015-01-30 | 4 | -6/+4 | |
| | | | |\ \ | | | | |/ | | | |/| | fixes | |||||
| | | | | * | small autocomplete fix adding space to the output | RedSwede | 2015-01-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | provides: the ability to press enter after pressing enter during the mention-js-popup (this second enter should behave as a normal one) FF35 | |||||
| | | | | * | non-tested fix for issue 847 | RedSwede | 2015-01-29 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | | | * | fix issue 848 + code comments | RedSwede | 2015-01-29 | 1 | -4/+2 | |
| | | | | | | ||||||
| | | | | * | Renamed translation file | RedSwede | 2015-01-29 | 1 | -0/+0 | |
| | | | |/ | ||||||
| | | * / | disable ratings until we're a bit further along. It's all changing. | friendica | 2015-01-29 | 1 | -0/+1 | |
| | | |/ | ||||||
| | * | | Merge branch 'master' into pocorate | friendica | 2015-01-29 | 165 | -936/+933 | |
| | |\| | ||||||
| | * | | prate module | friendica | 2015-01-29 | 1 | -0/+91 | |
| | | | | ||||||
| | * | | basic query for number of raters. Should probably be a join or subselect but ↵ | friendica | 2015-01-28 | 1 | -1/+11 | |
| | | | | | | | | | | | | | that will take a bit more fiddling | |||||
| | * | | updates to put rating info into the local xlink before sending it to known ↵ | friendica | 2015-01-28 | 2 | -2/+48 | |
| | | | | | | | | | | | | | directory servers | |||||
| | * | | Merge branch 'master' into pocorate | friendica | 2015-01-28 | 9 | -21/+75 | |
| | |\ \ | ||||||
| | * | | | first cut at direntry template, right now just provide a mockup with a ↵ | friendica | 2015-01-27 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | slider and rating count to look at. | |||||
| * | | | | cleanup event form and various required indicators on inputs | friendica | 2015-01-29 | 5 | -9/+28 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into tres | friendica | 2015-01-29 | 167 | -954/+1001 | |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |