| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 1 | -1/+1 |
|\| |
|
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 1 | -4/+5 |
|\| |
|
| * | provide info text for automatic permissions | Mario Vavti | 2015-07-15 | 1 | -1/+1 |
| * | whitespace | Mario Vavti | 2015-07-15 | 1 | -4/+0 |
| * | show inherited state in Connection Default Permissions | Mario Vavti | 2015-07-15 | 1 | -2/+7 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 1 | -0/+1 |
|\| |
|
| * | fix import of group members | redmatrix | 2015-07-14 | 1 | -1/+1 |
* | | group fixes to import | redmatrix | 2015-07-14 | 1 | -4/+14 |
* | | more stuff to resume failed imports | redmatrix | 2015-07-14 | 1 | -1/+13 |
* | | log the import progress | redmatrix | 2015-07-14 | 1 | -3/+9 |
* | | provide resumable imports if things go wrong | redmatrix | 2015-07-14 | 1 | -285/+329 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 3 | -81/+46 |
|\| |
|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-14 | 1 | -80/+44 |
| |\ |
|
| | * | make strings translateable | Mario Vavti | 2015-07-14 | 1 | -0/+6 |
| | * | revert provide inherited perms for connection default permissions | Mario Vavti | 2015-07-14 | 1 | -1/+1 |
| | * | remove dbg | Mario Vavti | 2015-07-14 | 1 | -2/+0 |
| | * | provide inherited perms for connection default permissions | Mario Vavti | 2015-07-14 | 1 | -1/+3 |
| | * | cleanup connedit | Mario Vavti | 2015-07-14 | 1 | -80/+38 |
| * | | coverup and ignore the illegal string offset message that some sites have bee... | redmatrix | 2015-07-14 | 1 | -1/+1 |
| |/ |
|
* | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | redmatrix | 2015-07-13 | 1 | -1/+0 |
|\ \ |
|
| * \ | merge | Mario Vavti | 2015-07-11 | 1 | -1/+4 |
| |\ \ |
|
| * \ \ | merge redmatrix fixes | Mario Vavti | 2015-07-10 | 5 | -24/+26 |
| |\ \ \ |
|
* | \ \ \ | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-13 | 2 | -7/+4 |
|\ \ \ \ \
| |_|_|/ /
|/| | | /
| | |_|/
| |/| | |
|
| * | | | allow sys editing of menu | redmatrix | 2015-07-11 | 1 | -0/+1 |
| * | | | whitespace and comment out info again | Mario Vavti | 2015-07-12 | 2 | -3/+3 |
| * | | | fix sys channel menu in a morre standard way | Mario Vavti | 2015-07-12 | 2 | -4/+4 |
| * | | | menu_id is still needed | Mario Vavti | 2015-07-12 | 1 | -0/+1 |
| * | | | make menu creation for sys channel work | Mario Vavti | 2015-07-12 | 2 | -7/+2 |
* | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-10 | 5 | -24/+30 |
|\| | |
| |/ /
|/| | |
|
| * | | show status editor in /display on share action. | Mario Vavti | 2015-07-10 | 1 | -1/+4 |
| |/ |
|
| * | more webpages - generic-content-wrapper fixes | Mario Vavti | 2015-07-10 | 3 | -15/+18 |
| * | add generic content wrapper to post/webpage editor and make editpost render c... | Mario Vavti | 2015-07-10 | 1 | -8/+6 |
| * | revert | Mario Vavti | 2015-07-09 | 1 | -2/+2 |
| * | do not show status editor in /display - we most probably want to read the thr... | Mario Vavti | 2015-07-09 | 1 | -1/+2 |
| * | increase width of the aside area and make default profile image size 300x300 | Mario Vavti | 2015-07-09 | 1 | -2/+2 |
* | | inconsistent naming of block item types | redmatrix | 2015-07-08 | 3 | -5/+5 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-07 | 1 | -11/+24 |
|\| |
|
| * | fix sorting of channel suggestions | Mario Vavti | 2015-07-07 | 1 | -0/+1 |
| * | rename function get_directory_settings => get_directory_setting and move sort... | Mario Vavti | 2015-07-07 | 1 | -4/+9 |
| * | make public forums only setting sticky and simplify function to get directory... | Mario Vavti | 2015-07-07 | 1 | -10/+17 |
* | | Merge pull request #4 from git-marijus/master | redmatrix | 2015-07-08 | 1 | -1/+1 |
|\ \ |
|
| * | | abook_pending should probably be 1 in this place | Mario Vavti | 2015-07-06 | 1 | -1/+1 |
* | | | ok that's wretchedly inefficient but provides a basic relevance search for st... | redmatrix | 2015-07-06 | 2 | -2/+34 |
|/ / |
|
* | | very crude but working doc search | redmatrix | 2015-07-05 | 1 | -1/+47 |
* | | more work on db storage of doco | redmatrix | 2015-07-05 | 1 | -4/+55 |
* | | mod/help: read doc files from the database if present and newer than the copy... | redmatrix | 2015-07-04 | 1 | -5/+27 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-02 | 2 | -0/+126 |
|\| |
|
| * | a few clone sync fixes as well as some work on hubzilla clone sync back to re... | redmatrix | 2015-07-02 | 2 | -0/+14 |
| * | a bit of cleanup and explanatory text on mod/pconfig | redmatrix | 2015-07-02 | 1 | -6/+13 |
| * | web version of util/pconfig | redmatrix | 2015-07-02 | 1 | -0/+105 |