aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into website-exportAndrew Manning2016-08-3039-6240/+6309
|\
| * Merge pull request #505 from wave72/devWave2016-08-302-6166/+6197
| |\
| | * Updated Italian stringsWave722016-08-302-6166/+6197
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-292-7/+6
| |\ \
| | * | make lock switching actually work with multiple acl formsMario Vavti2016-08-292-7/+6
| * | | add authors to post distribution; case insensitive sort appsredmatrix2016-08-292-1/+21
| |/ /
| * | Before throwing a 'smarty3 dir does not exist' fatal error, try and create it...redmatrix2016-08-282-3/+6
| * | create smarty dir before any templates can be initialisedredmatrix2016-08-281-2/+3
| * | supercedes pull request #503redmatrix2016-08-281-1/+9
| * | move allowed email domains to admin->security pageredmatrix2016-08-283-10/+11
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-2824-44/+44
| |\ \
| | * \ Merge pull request #502 from anaqreon/docfixAndrew Manning2016-08-2824-44/+44
| | |\ \
| | | * | Remove definite article before $Projectname in docsAndrew Manning2016-08-2824-44/+44
| | |/ /
| * / / fix aconfigredmatrix2016-08-282-2/+2
| |/ /
| * | minor (non-technical) corrections in the plugin docredmatrix2016-08-271-2/+2
| * | Merge pull request #501 from anaqreon/doc-searchzotlabs2016-08-282-4/+10
| |\ \
| | * | Display text around the searched query in documentation searchAndrew Manning2016-08-272-4/+10
| |/ /
* | | Merge remote-tracking branch 'upstream/dev' into website-exportAndrew Manning2016-08-271-2/+2
|\| |
| * | doc search brokenredmatrix2016-08-271-2/+2
* | | Merge remote-tracking branch 'upstream/dev' into website-exportAndrew Manning2016-08-271-0/+1
|\| |
| * | vsprintf error on sql queryredmatrix2016-08-271-0/+1
* | | Merge remote-tracking branch 'upstream/dev' into website-export. Added attach...Andrew Manning2016-08-2726-4413/+4711
|\| |
| * | issue #186 ...different check for pubforum with expert permissionsredmatrix2016-08-261-12/+6
| * | add a couple of useful observer constructs to support identity aware pagesredmatrix2016-08-261-1/+12
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-262-11/+24
| |\ \
| | * | Add new page connedit to Spanish context helpManuel Jiménez Friaza2016-08-261-0/+12
| | * | contact-block needs a class clear div at the end to not mess with following w...Mario Vavti2016-08-261-11/+12
| * | | comanche: generalise the conditional variable usage and add $observer as a te...redmatrix2016-08-262-24/+73
| |/ /
| * | - implemented but untested: duplicate detection for photo 'move to another fo...redmatrix2016-08-262-4323/+4375
| * | update docoredmatrix2016-08-251-1/+1
| * | ratings are gone. They can be enabled, but there is no UI for doing so at thi...redmatrix2016-08-259-37/+28
| * | move premium channel to 'pro' since that's the only configuration where it wo...redmatrix2016-08-251-3/+12
| * | attach_move() function created to relocate files or photos to different direc...redmatrix2016-08-242-0/+72
| * | provide context help for the connedit pageredmatrix2016-08-241-0/+12
| * | off by one pixelredmatrix2016-08-241-3/+3
| * | some more complex test scenarios for comanche conditionals: equals x, not equ...redmatrix2016-08-241-4/+40
| * | do not return false since it could prevent clicking also when not appropriate.Mario Vavti2016-08-241-1/+1
| * | remove the onclick actionMario Vavti2016-08-241-1/+1
| * | do not remove cover photo after scrolling it up. mimik an scroll edge if scro...Mario Vavti2016-08-241-24/+39
| * | Revert "revert cover photo changes"Mario Vavti2016-08-241-8/+20
| * | provide a mechanism for global template values (macro replacements that are a...redmatrix2016-08-241-0/+6
| * | revert cover photo changesredmatrix2016-08-241-20/+8
| * | allow changing the server role - as well as configuring any of the three opti...redmatrix2016-08-234-5/+30
| * | cover photo: adjustments to display the entire photo on manual scrollback (pa...redmatrix2016-08-231-1/+2
| * | several cover photo widget enhancements:redmatrix2016-08-231-8/+19
| * | include port in pdo url when host is 'localhost'redmatrix2016-08-231-0/+2
* | | Merge remote-tracking branch 'upstream/dev' into website-exportAndrew Manning2016-08-2328-3913/+4113
|\| |
| * | change default server roleredmatrix2016-08-221-2/+2
| * | optional server role compatibility checks for pluginsredmatrix2016-08-224-2/+18
| * | public forum fallback checking (when custom/expert permissions are applied) w...redmatrix2016-08-221-5/+4