| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-28 | 3 | -3/+3 |
|\ |
|
| * | remark in the private notes encrypted | Jeroen van Riet Paap | 2016-01-28 | 1 | -1/+1 |
| * | no trailing slash | Jeroen van Riet Paap | 2016-01-27 | 1 | -1/+1 |
| * | no trailing slash | Jeroen van Riet Paap | 2016-01-27 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-27 | 35 | -517/+577 |
|\| |
|
| * | lower caution level from danger to warning for ignore button | Mario Vavti | 2016-01-27 | 1 | -1/+1 |
| * | provide an icon to make 'add privacy group' stand out from the list of groups... | redmatrix | 2016-01-27 | 2 | -2/+2 |
| * | rename collections to privacy groups | redmatrix | 2016-01-26 | 16 | -491/+496 |
| * | control the generation or acceptance of directory keywords | redmatrix | 2016-01-26 | 3 | -3/+12 |
| * | bring back the ability to ignore a pending connection request without deletin... | redmatrix | 2016-01-26 | 4 | -3/+8 |
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-26 | 8 | -10/+19 |
| |\ |
|
| | * | Linking new connection notification to pending connections (see Channel 1) an... | jeroenpraat | 2016-01-27 | 8 | -10/+19 |
| * | | add abook_account to cloned abook records, was missing | redmatrix | 2016-01-26 | 1 | -1/+2 |
| |/ |
|
| * | change help text on other channel expiration setting to inform that there is ... | redmatrix | 2016-01-26 | 2 | -1/+24 |
| * | fix undefined variable reference in widget_item | redmatrix | 2016-01-26 | 2 | -7/+15 |
* | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-25 | 11 | -3177/+3198 |
|\| |
|
| * | don't provide notification icons on manage page for delegated channels | redmatrix | 2016-01-24 | 2 | -1/+2 |
| * | regression: channel name missing on delegate section of manage page | redmatrix | 2016-01-24 | 1 | -0/+1 |
| * | cleanup and add comments about what we're trying to do here | redmatrix | 2016-01-24 | 2 | -3/+12 |
| * | make exec the default for proc_run - use system.use_proc_open to use proc_ope... | redmatrix | 2016-01-24 | 2 | -5/+5 |
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-24 | 4 | -3169/+3173 |
| |\ |
|
| | * | es-es+nl string update | jeroenpraat | 2016-01-24 | 4 | -3169/+3173 |
| * | | remote delegation issue when already logged in with different account on same... | redmatrix | 2016-01-24 | 3 | -1/+7 |
| |/ |
|
* | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-24 | 4 | -4/+11 |
|\| |
|
| * | update hidden_configs with proc_run_use_exec | redmatrix | 2016-01-23 | 1 | -0/+3 |
| * | provide option to use exec in proc_run | redmatrix | 2016-01-23 | 3 | -4/+8 |
* | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-22 | 9 | -1297/+1329 |
|\| |
|
| * | doc | Jeroen van Riet Paap | 2016-01-22 | 1 | -1/+1 |
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-22 | 3 | -2/+8 |
| |\ |
|
| | * | Merge pull request #266 from anaqreon/activitystreams | redmatrix | 2016-01-22 | 1 | -0/+6 |
| | |\ |
|
| | | * | Merge branch 'master' of https://github.com/redmatrix/hubzilla into activitys... | Andrew Manning | 2016-01-21 | 64 | -1543/+1805 |
| | | |\ |
|
| | | * | | Added more ActivityStreams schema support to boot.php for games | Andrew Manning | 2016-01-21 | 1 | -0/+6 |
| | * | | | Merge pull request #267 from bashrc/bashrc/node | redmatrix | 2016-01-22 | 2 | -2/+2 |
| | |\ \ \ |
|
| | | * | | | Change node script types | Bob Mottram | 2016-01-22 | 2 | -2/+2 |
| | |/ / / |
|
| * / / / | provide mechanism for custom .well-known handlers and static files (e.g. for ... | redmatrix | 2016-01-22 | 5 | -1294/+1320 |
| |/ / / |
|
* | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-22 | 17 | -8/+31 |
|\| | | |
|
| * | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-21 | 5 | -0/+1 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Merge pull request #265 from bashrc/bashrc/tidying | redmatrix | 2016-01-22 | 5 | -0/+1 |
| | |\ \ |
|
| | | * | | Executable flash files ??? | Bob Mottram | 2016-01-21 | 1 | -0/+0 |
| | | * | | css files should not be executable | Bob Mottram | 2016-01-21 | 2 | -0/+0 |
| | | * | | README files should not be executable | Bob Mottram | 2016-01-21 | 1 | -0/+0 |
| | | * | | Type of script | Bob Mottram | 2016-01-21 | 1 | -0/+1 |
| * | | | | fix visitor photo uploads | redmatrix | 2016-01-21 | 1 | -1/+1 |
| * | | | | add a fixme | redmatrix | 2016-01-21 | 1 | -0/+2 |
| |/ / / |
|
| * | | | set the actual value of the password input field to a single space on remove ... | redmatrix | 2016-01-21 | 2 | -2/+2 |
| * | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-21 | 6 | -2/+22 |
| |\ \ \ |
|
| | * | | | A few minor tweaks in schemas + link to login form in lostpass | jeroenpraat | 2016-01-21 | 6 | -2/+22 |
| | |/ / |
|
| * / / | regression: public forums granting send stream permissions to all connections | redmatrix | 2016-01-21 | 2 | -3/+3 |
| |/ / |
|
* | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-21 | 12 | -83/+76 |
|\| | |
|
| * | | make contact block look widget alike | Mario Vavti | 2016-01-21 | 3 | -11/+6 |