aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-1415-4/+497
|\
| * Merge pull request #320 from dawnbreak/masterredmatrix2015-05-1515-4/+497
| |\
| | * Add sprintf.js v1.0.2.Klaus Weidenbach2015-05-1415-4/+497
| |/
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-1346-209/+226
|\|
| * not sure how these files ended up here, but they belong with doxygen stuffredmatrix2015-05-132-577/+0
| * remove project name dependency from most of the doc files to ease project mer...redmatrix2015-05-1348-277/+277
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-1313-19/+23
|\|
| * restrict webpage list to undeleted itemsredmatrix2015-05-132-3/+3
| * product was a bad string to use because we may require it for e-commerce, and...redmatrix2015-05-1311-15/+15
| * issue #187redmatrix2015-05-121-1/+5
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-123-2/+72
|\|
| * cut/paste errorredmatrix2015-05-121-1/+1
| * repo updatersredmatrix2015-05-123-2/+72
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-126-5/+27
|\|
| * provide a method for loading site/custom widgetsredmatrix2015-05-121-0/+3
| * replace project name with $product or $Product in strings to avoid merge issu...redmatrix2015-05-121-2/+15
| * version updateredmatrix2015-05-121-1/+1
| * Dutch 100\% againjeroenpraat2015-05-122-56/+76
| * fix a couple of miscellaneous errors which showed up in the logsredmatrix2015-05-112-2/+5
| * let the site admin import a record directly from the probe diagnosticredmatrix2015-05-111-0/+3
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-112-6099/+7075
| |\
| * | missing translationredmatrix2015-05-112-2/+2
* | | missing merge conflictredmatrix2015-05-111-6/+1
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-110-0/+0
|\ \ \ | | |/ | |/|
| * | Merge pull request #319 from solstag/ptbrupdateredmatrix2015-05-122-6099/+7075
| |\ \ | | |/ | |/|
| | * update pt-br transationAlexandre Hannud Abdo2015-05-112-6099/+7075
| |/
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla into mergerredmatrix2015-05-100-0/+0
|\ \
| * \ Merge pull request #1 from anaqreon/patch-1redmatrix2015-05-111-1/+1
| |\ \
| | * | Misspellinganaqreon2015-05-101-1/+1
* | | | correcting upstreamredmatrix2015-05-102-2/+2
|/ / /
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-1014-126/+186
|\ \ \ | | |/ | |/|
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-1018-5474/+5835
| |\ \
| | * | uid > channel id to make submenus visible for observersMario Vavti2015-05-101-3/+3
| | * | provide drop down submenu suggestions in edit modeMario Vavti2015-05-102-3/+6
| | * | copy/paste typoMario Vavti2015-05-101-1/+1
| | * | provide ability to create submenusMario Vavti2015-05-108-11/+47
| | * | Merge pull request #318 from zzottel/masterzzottel2015-05-082-5226/+5453
| | |\ \
| | | * | update to German stringszottel2015-05-082-5226/+5453
| | |/ /
| * | | rev updateredmatrix2015-05-103-47/+63
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-078-232/+301
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | provide wrap variable for comanche menusMario Vavti2015-05-073-5/+23
| * | Update Dutchjeroenpraat2015-05-072-221/+232
| * | provide a possibility to include js/css libsMario Vavti2015-05-071-0/+40
| * | adjust icon sizeMario Vavti2015-05-073-6/+6
* | | missed one...redmatrix2015-05-063-2/+4
* | | forgot to saveredmatrix2015-05-061-2/+0
* | | Hopefully this will make item_cache the defaultredmatrix2015-05-062-14/+54
* | | change notification colourredmatrix2015-05-061-1/+1
* | | convert ITEM_WALL from bitfield to standaloneredmatrix2015-05-0629-90/+98
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-0610-206/+274
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 22:47:50 +0000