| Commit message (Expand) | Author | Age | Files | Lines |
* | update font-awesome library to 4.6.1 | Treer | 2016-04-30 | 409 | -22192/+26692 |
* | get rid of the unused ispublic variable | Mario Vavti | 2016-04-29 | 9 | -27/+4 |
* | css fix | Mario Vavti | 2016-04-29 | 1 | -1/+2 |
* | Merge pull request #360 from sasiflo/dev_sasiflo_contexthelp | git-marijus | 2016-04-29 | 13 | -0/+96 |
|\ |
|
| * | Merge branch 'dev' into dev_sasiflo_contexthelp | sasiflo | 2016-04-29 | 1 | -25/+0 |
| |\ |
|
| * | | Added german translation to context help. | sasiflo | 2016-04-29 | 13 | -0/+96 |
* | | | some work on making mod editpost use status_editor() - if you find anything r... | Mario Vavti | 2016-04-29 | 4 | -109/+60 |
* | | | css fixes | Mario Vavti | 2016-04-29 | 1 | -5/+1 |
| |/
|/| |
|
* | | jot: cleanup unused variables | Mario Vavti | 2016-04-29 | 1 | -25/+0 |
|/ |
|
* | allow engineering units (e.g. 400M, 1G) as service class limits | redmatrix | 2016-04-28 | 9 | -13/+16 |
* | This setting isn't implemented so remove the UI until it is. | redmatrix | 2016-04-28 | 2 | -4/+1 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-28 | 2 | -5/+23 |
|\ |
|
| * | provide help button in context help popup | Mario Vavti | 2016-04-28 | 2 | -5/+22 |
| * | css fix | Mario Vavti | 2016-04-28 | 1 | -0/+1 |
* | | Merge branch 'master' into dev | redmatrix | 2016-04-28 | 1 | -1/+1 |
|\ \ |
|
| * | | revup | redmatrix | 2016-04-28 | 1 | -1/+1 |
* | | | provide a Hook method to unregister all hooks with a given filespec component... | redmatrix | 2016-04-27 | 1 | -0/+21 |
| |/
|/| |
|
* | | provide courtesy function for syncing one item. We'll probably be doing this ... | redmatrix | 2016-04-27 | 1 | -0/+15 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-27 | 11 | -40/+78 |
|\ \ |
|
| * \ | Merge pull request #359 from anaqreon/help-content | redmatrix | 2016-04-28 | 7 | -3/+48 |
| |\ \ |
|
| | * | | Added context help content | Andrew Manning | 2016-04-27 | 5 | -1/+29 |
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into help-content | Andrew Manning | 2016-04-27 | 23 | -15602/+16085 |
| | |\ \
| | |/ /
| |/| | |
|
| * | | | some refinements on jot | Mario Vavti | 2016-04-27 | 4 | -37/+30 |
| | * | | Merge remote-tracking branch 'upstream/dev' into help-content | Andrew Manning | 2016-04-25 | 53 | -1636/+2042 |
| | |\ \ |
|
| | * \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into help-content | Andrew Manning | 2016-04-23 | 4 | -7227/+7472 |
| | |\ \ \ |
|
| | * | | | | Added help content | Andrew Manning | 2016-04-22 | 3 | -3/+20 |
* | | | | | | Use / for album name in photo activities if no album present. | redmatrix | 2016-04-27 | 1 | -1/+1 |
|/ / / / / |
|
* | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-27 | 1 | -1/+1 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | revup | redmatrix | 2016-04-27 | 1 | -1/+1 |
* | | | | | implement the singleton delivery stuff | redmatrix | 2016-04-26 | 3 | -8/+38 |
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-26 | 5 | -51/+36 |
|\ \ \ \ \ |
|
| * | | | | | only padding-top needs adjustment | Mario Vavti | 2016-04-26 | 1 | -2/+2 |
| * | | | | | hopefully fix jot dropdown visibility issue | Mario Vavti | 2016-04-26 | 1 | -3/+5 |
| * | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-04-26 | 2 | -7/+13 |
| |\ \ \ \ \ |
|
| * | | | | | | move spoiler= and quote= bbcode handling from prepare_body() to bbcode() and ... | Mario Vavti | 2016-04-26 | 3 | -46/+29 |
* | | | | | | | move iconfig functions to include/config.php with all the rest of the configs... | redmatrix | 2016-04-26 | 5 | -160/+179 |
| |/ / / / /
|/| | | | | |
|
* | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-26 | 1 | -0/+9 |
|\| | | | | |
|
| * | | | | | fix top padding for narrow navbar | Mario Vavti | 2016-04-26 | 1 | -0/+9 |
* | | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-26 | 1 | -1/+1 |
|\ \ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| * | | | | | revup | redmatrix | 2016-04-26 | 1 | -1/+1 |
* | | | | | | some cleanup on the mysqli driver | redmatrix | 2016-04-25 | 1 | -6/+12 |
| |/ / / /
|/| | | | |
|
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-25 | 12 | -15360/+15804 |
|\ \ \ \ \ |
|
| * \ \ \ \ | Merge pull request #356 from Treer/CUI | redmatrix | 2016-04-26 | 2 | -2/+97 |
| |\ \ \ \ \ |
|
| | * | | | | | improve error message in config and pconfig | Treer | 2016-04-25 | 2 | -0/+13 |
| | * | | | | | util/pconfig can list channel IDs | Treer | 2016-04-25 | 1 | -1/+13 |
| | * | | | | | add commandline help to util/pconfig | Treer | 2016-04-25 | 1 | -0/+34 |
| | * | | | | | add commandline help to util/config | Treer | 2016-04-25 | 1 | -2/+38 |
| * | | | | | | +es-es strings update | jeroenpraat | 2016-04-25 | 4 | -15342/+15688 |
| | |_|_|_|/
| |/| | | | |
|
| * | | | | | make it more obvious what is behind the dropdowns | Mario Vavti | 2016-04-25 | 6 | -16/+19 |
* | | | | | | Setup was horked after this commit and I couldn't easily make it right so rev... | redmatrix | 2016-04-25 | 6 | -87/+98 |