aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* hotfix for readmore.jsMario Vavti2016-10-102-4/+22
* check datatype to be sureredmatrix2016-09-281-4/+4
* translate null_date on all db fieldsredmatrix2016-09-261-0/+6
* issue #511, postgres schema issuesredmatrix2016-09-091-2/+2
* custom/expert permissions bugredmatrix2016-09-061-3/+14
* fix aconfigredmatrix2016-08-282-2/+2
* doc search brokenredmatrix2016-08-271-2/+2
* Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-08-274-14/+27
|\
| * Merge pull request #499 from mjfriaza/mastergit-marijus2016-08-263-3/+15
| |\
| | * Fixed a string in the Spanish translationManuel Jiménez Friaza2016-08-251-1/+1
| | * Fixed a string in the Spanish translationManuel Jiménez Friaza2016-08-251-2/+2
| | * Add new page connedit to Spanish context helpManuel Jiménez Friaza2016-08-251-0/+12
| * | contact-block needs a class clear div at the end to not mess with following w...Mario Vavti2016-08-261-11/+12
| |/
* / vsprintf error on sql queryredmatrix2016-08-271-0/+1
|/
* version1.12redmatrix2016-08-231-1/+1
* Merge branch 'master' into 1.12RCredmatrix2016-08-220-0/+0
|\
| * Revert "Merge branch '1.12RC'"redmatrix2016-08-22121-23970/+21829
| * Revert "missing release file"redmatrix2016-08-221-236/+0
| * Revert "more missing files from merge"redmatrix2016-08-223-367/+0
| * more missing files from mergeredmatrix2016-08-223-0/+367
| * missing release fileredmatrix2016-08-221-0/+236
| * Merge branch '1.12RC'redmatrix2016-08-22121-21829/+23970
| |\ | |/ |/|
* | Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_mergeredmatrix2016-08-224-11185/+11251
|\ \
| * | Spanish and Dutch stringsjeroenpraat2016-08-224-11185/+11251
* | | public forum fallback checking (when custom/expert permissions are applied) w...redmatrix2016-08-221-5/+4
|/ /
* | Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_mergeredmatrix2016-08-216-19743/+20176
|\ \
| * | Updating Spanish and Dutch stringsjeroenpraat2016-08-174-12928/+13136
| * | Merge pull request #493 from phellmes/de20160817hubzilla2016-08-172-6815/+7040
| |\ \
| | * | Update DE translation stringsphellmes2016-08-172-6815/+7040
| |/ /
* / / issue #496redmatrix2016-08-212-1/+3
|/ /
* | Use double quotes for strings passed via templates to javascript. Some transl...redmatrix2016-08-151-5/+5
* | Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_mergeredmatrix2016-08-1512-185/+152
|\ \
| * \ Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RCMario Vavti2016-08-152-29/+37
| |\ \
| | * | btn/dropdown rendering issueMario Vavti2016-08-141-24/+30
| | * | Merge pull request #481 from anaqreon/issue-475hubzilla2016-08-141-5/+7
| | |\ \
| | | * | Fix for older photos not being embedded by the embedphotos tool.Andrew Manning2016-08-131-2/+4
| | | * | Fixed bug preventing images in root photo album from loading in embedphotos d...Andrew Manning2016-08-131-3/+3
| * | | | update bootstrap 3.3.5 > 3.3.7Mario Vavti2016-08-156-138/+111
| * | | | fix javascript error if not logged inMario Vavti2016-08-151-2/+2
| |/ / /
| * | | remove js debuggingMario Vavti2016-08-131-1/+0
| * | | fix #480, enable bbcode autocomplete for photo comments and remove some redun...Mario Vavti2016-08-134-16/+3
| |/ /
* / / Merge dev with last changes of homeinstall script in masterEiner von Vielen2016-08-152-47/+7
|/ /
* | pending flag not being reset when using autoperms from custom roleredmatrix2016-08-121-1/+4
* | fix auto-connect settingzottel2016-08-121-3/+0
* | possible quickfix for multi-acl not honoring jotnetsMario Vavti2016-08-121-0/+6
* | embed filter adjustmentsredmatrix2016-08-111-13/+17
* | forum detection was off for forums with custom permsredmatrix2016-08-101-1/+3
* | update CHANGELOG for 1.12redmatrix2016-08-101-0/+25
* | update versionredmatrix2016-08-101-1/+1
* | implement acl for folder creationMario Vavti2016-08-104-17/+53