aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* more security stuffredmatrix2016-05-024-71/+52
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-0213-0/+395
|\
| * Merge pull request #364 from mjfriaza/devredmatrix2016-05-0313-0/+395
| |\
| | * Contextual help in SpanishManuel Jiménez Friaza2016-05-0213-0/+395
* | | a bit more oembed security - and document the shortcomings of this approachredmatrix2016-05-021-16/+20
|/ /
* | sort out the rest of the source categoriesredmatrix2016-05-022-4/+4
* | a couple of bugfixes from earlier checkins and implementation of source tagsredmatrix2016-05-015-7/+50
* | db schema change to add tags to content sourcesredmatrix2016-05-014-3/+14
* | sort addons based on the internal display name instead of the filenameredmatrix2016-05-011-0/+7
* | use only the std_versionredmatrix2016-05-017-20/+13
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-017-14/+35
|\|
| * fix mime-type icons in /cloudMario Vavti2016-05-011-1/+1
| * tweak dl bbcode in expanded autocomplete a bit moreMario Vavti2016-05-011-3/+4
| * Merge pull request #363 from Treer/bbcodegit-marijus2016-05-011-6/+9
| |\
| | * tweak dl bbcode in expanded autocompleteTreer2016-05-011-6/+9
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-05-011-2/+0
| |\ \
| | * | css fixMario Vavti2016-05-011-2/+0
| | |/
| * / make weblink and attach button hideable and some minor fixesMario Vavti2016-05-014-5/+24
| |/
* / some much needed work on oembed securityredmatrix2016-05-018-68/+255
|/
* 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
|\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 03:56:30 +0000