aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | 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
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | comanche docoMario Vavti2015-05-062-2/+10
| * | | | | | | | | | | | | avoid double slash after editing layoutMario Vavti2015-05-061-1/+1
| * | | | | | | | | | | | | allow blocks to have custom classes and add a new template called zen which g...Mario Vavti2015-05-062-2/+20
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-056-8102/+8003
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | turn consensus items into diaspora polls for that networkredmatrix2015-05-055-201/+243
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | no need to obscure the diaspora signature if we're not obscuring the postsredmatrix2015-05-062-6/+12
* | | | | | | | | | | | | for hubzilla we won't be obscuring items, only private mail, this will allow ...redmatrix2015-05-053-67/+1
* | | | | | | | | | | | | i think this is 100redmatrix2015-05-052-14/+6
* | | | | | | | | | | | | update 99redmatrix2015-05-052-20/+20
* | | | | | | | | | | | | second pass name changeredmatrix2015-05-0593-372/+372
* | | | | | | | | | | | | first pass name changeredmatrix2015-05-0591-680/+680
* | | | | | | | | | | | | iteration #97redmatrix2015-05-052-4/+4
* | | | | | | | | | | | | this will settle down eventually.redmatrix2015-05-052-6/+6
* | | | | | | | | | | | | change nameredmatrix2015-05-051-1/+1
* | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-054-4050/+4001
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #317 from tuscanhobbit/devPaolo T2015-05-042-4048/+3998
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Italian translationPaolo Tacconi2015-05-042-4048/+3998
| * | | | | | | | | | | | | fix center page content settingMario Vavti2015-05-041-1/+2
| * | | | | | | | | | | | | remove obsolete linebreakMario Vavti2015-05-041-1/+1