aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* tweak dl bbcode in expanded autocompleteTreer2016-05-011-6/+9
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-30541-25213/+29542
|\
| * Merge pull request #362 from Treer/fontawesomeredmatrix2016-05-01512-22656/+27156
| |\
| | * update icon names in libraryTreer2016-05-012-8/+8
| | * update icon names in view/Treer2016-05-0185-349/+349
| | * update icon names in view/jsTreer2016-05-017-68/+68
| | * update icon names in include/Treer2016-05-016-34/+34
| | * update icon names in Zotlabs/Treer2016-05-013-5/+5
| | * update font-awesome library to 4.6.1Treer2016-04-30409-22192/+26692
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-04-302-6/+7
| |\ \
| | * \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devjeroenpraat2016-04-3010-463/+333
| | |\ \
| | * | | Small fix of Dutch stringsjeroenpraat2016-04-302-6/+7
| * | | | css fixMario Vavti2016-04-303-15/+5
| | |/ / | |/| |
| * | | whitespaceMario Vavti2016-04-301-36/+35
| * | | more work on layout editorsMario Vavti2016-04-302-5/+7
| * | | make mod editlayout use status_editor()Mario Vavti2016-04-302-108/+55
| * | | add dl bbcode to the expanded autocompleteMario Vavti2016-04-301-2/+2
| * | | minor cleanupMario Vavti2016-04-301-24/+16
| * | | Merge pull request #361 from Treer/bbcodegit-marijus2016-04-306-291/+221
| |\ \ \ | | |/ / | |/| |
| | * | clean up some doc/ formattingTreer2016-04-302-288/+128
| | * | improve whitespace control around definition list ([dl]) bbcodeTreer2016-04-301-4/+6
| | * | Add definition lists to bbcodeTreer2016-04-304-3/+91
| * | | Update NL+ES-ESjeroenpraat2016-04-304-1916/+1888
| | |/ | |/|
| * | get rid of the unused ispublic variableMario Vavti2016-04-299-27/+4
| * | css fixMario Vavti2016-04-291-1/+2
| * | Merge pull request #360 from sasiflo/dev_sasiflo_contexthelpgit-marijus2016-04-2913-0/+96
| |\ \
| | * \ Merge branch 'dev' into dev_sasiflo_contexthelpsasiflo2016-04-291-25/+0
| | |\ \
| | * | | Added german translation to context help.sasiflo2016-04-2913-0/+96
| * | | | some work on making mod editpost use status_editor() - if you find anything r...Mario Vavti2016-04-294-109/+60
| * | | | css fixesMario Vavti2016-04-291-5/+1
| | |/ / | |/| |
| * | | jot: cleanup unused variablesMario Vavti2016-04-291-25/+0
| |/ /
* | | Merge branch 'master' into devredmatrix2016-04-292-794/+779
|\ \ \
| * | | version+stringsredmatrix2016-04-292-794/+779
* | | | trim engr_units string slight improvement to avoid subtle bugsredmatrix2016-04-291-1/+3
| |/ / |/| |
* | | allow engineering units (e.g. 400M, 1G) as service class limitsredmatrix2016-04-289-13/+16
* | | This setting isn't implemented so remove the UI until it is.redmatrix2016-04-282-4/+1
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-282-5/+23
|\ \ \ | | |/ | |/|
| * | provide help button in context help popupMario Vavti2016-04-282-5/+22
| * | css fixMario Vavti2016-04-281-0/+1
* | | Merge branch 'master' into devredmatrix2016-04-281-1/+1
|\ \ \ | | |/ | |/|
| * | revupredmatrix2016-04-281-1/+1
* | | provide a Hook method to unregister all hooks with a given filespec component...redmatrix2016-04-271-0/+21
| |/ |/|
* | provide courtesy function for syncing one item. We'll probably be doing this ...redmatrix2016-04-271-0/+15
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-2711-40/+78
|\ \
| * \ Merge pull request #359 from anaqreon/help-contentredmatrix2016-04-287-3/+48
| |\ \
| | * | Added context help contentAndrew Manning2016-04-275-1/+29
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into help-contentAndrew Manning2016-04-2723-15602/+16085
| | |\ \ | | |/ / | |/| |
| * | | some refinements on jotMario Vavti2016-04-274-37/+30
| | * | Merge remote-tracking branch 'upstream/dev' into help-contentAndrew Manning2016-04-2553-1636/+2042
| | |\ \
| | * \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into help-contentAndrew Manning2016-04-234-7227/+7472
| | |\ \ \