aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ /
* | 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
| | |\ \ \
| | * | | | Added help contentAndrew Manning2016-04-223-3/+20
* | | | | | Use / for album name in photo activities if no album present.redmatrix2016-04-271-1/+1
|/ / / / /
* | | | | Merge branch 'master' into devredmatrix2016-04-271-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | revupredmatrix2016-04-271-1/+1
* | | | | implement the singleton delivery stuffredmatrix2016-04-263-8/+38
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-265-51/+36
|\ \ \ \ \
| * | | | | only padding-top needs adjustmentMario Vavti2016-04-261-2/+2
| * | | | | hopefully fix jot dropdown visibility issueMario Vavti2016-04-261-3/+5
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-04-262-7/+13
| |\ \ \ \ \
| * | | | | | move spoiler= and quote= bbcode handling from prepare_body() to bbcode() and ...Mario Vavti2016-04-263-46/+29
* | | | | | | move iconfig functions to include/config.php with all the rest of the configs...redmatrix2016-04-265-160/+179
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-261-0/+9
|\| | | | |
| * | | | | fix top padding for narrow navbarMario Vavti2016-04-261-0/+9
* | | | | | Merge branch 'master' into devredmatrix2016-04-261-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | revupredmatrix2016-04-261-1/+1
* | | | | | some cleanup on the mysqli driverredmatrix2016-04-251-6/+12
| |/ / / / |/| | | |
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-2512-15360/+15804
|\ \ \ \ \
| * \ \ \ \ Merge pull request #356 from Treer/CUIredmatrix2016-04-262-2/+97
| |\ \ \ \ \
| | * | | | | improve error message in config and pconfigTreer2016-04-252-0/+13