Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | hotfix for readmore.js | Mario Vavti | 2016-10-10 | 2 | -4/+22 |
| | |||||
* | check datatype to be sure | redmatrix | 2016-09-28 | 1 | -4/+4 |
| | |||||
* | translate null_date on all db fields | redmatrix | 2016-09-26 | 1 | -0/+6 |
| | |||||
* | issue #511, postgres schema issues | redmatrix | 2016-09-09 | 1 | -2/+2 |
| | |||||
* | custom/expert permissions bug | redmatrix | 2016-09-06 | 1 | -3/+14 |
| | |||||
* | fix aconfig | redmatrix | 2016-08-28 | 2 | -2/+2 |
| | |||||
* | doc search broken | redmatrix | 2016-08-27 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-08-27 | 4 | -14/+27 |
|\ | |||||
| * | Merge pull request #499 from mjfriaza/master | git-marijus | 2016-08-26 | 3 | -3/+15 |
| |\ | | | | | | | Add new page 'connedit' to Spanish context help & fixed a string in Spanish translation | ||||
| | * | Fixed a string in the Spanish translation | Manuel Jiménez Friaza | 2016-08-25 | 1 | -1/+1 |
| | | | |||||
| | * | Fixed a string in the Spanish translation | Manuel Jiménez Friaza | 2016-08-25 | 1 | -2/+2 |
| | | | |||||
| | * | Add new page connedit to Spanish context help | Manuel Jiménez Friaza | 2016-08-25 | 1 | -0/+12 |
| | | | |||||
| * | | contact-block needs a class clear div at the end to not mess with following ↵ | Mario Vavti | 2016-08-26 | 1 | -11/+12 |
| |/ | | | | | | | widgets and whitespace | ||||
* / | vsprintf error on sql query | redmatrix | 2016-08-27 | 1 | -0/+1 |
|/ | |||||
* | version1.12 | redmatrix | 2016-08-23 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into 1.12RC | redmatrix | 2016-08-22 | 0 | -0/+0 |
|\ | |||||
| * | Revert "Merge branch '1.12RC'" | redmatrix | 2016-08-22 | 121 | -23970/+21829 |
| | | | | | | | | | | This reverts commit b89c869e7ce2586852607a55717f5388c88e275d, reversing changes made to fbb357ac47f0c5823dd30aa9b955982035cef8ba. | ||||
| * | Revert "missing release file" | redmatrix | 2016-08-22 | 1 | -236/+0 |
| | | | | | | | | This reverts commit 17fa2d88012091ac5c015a1d2703598c1b7f2f48. | ||||
| * | Revert "more missing files from merge" | redmatrix | 2016-08-22 | 3 | -367/+0 |
| | | | | | | | | This reverts commit 1bd784cf12d6ca4dc3ed2a6a3e77c7127a9d8590. | ||||
| * | more missing files from merge | redmatrix | 2016-08-22 | 3 | -0/+367 |
| | | |||||
| * | missing release file | redmatrix | 2016-08-22 | 1 | -0/+236 |
| | | |||||
| * | Merge branch '1.12RC' | redmatrix | 2016-08-22 | 121 | -21829/+23970 |
| |\ | |/ |/| | |||||
* | | Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_merge | redmatrix | 2016-08-22 | 4 | -11185/+11251 |
|\ \ | |||||
| * | | Spanish and Dutch strings | jeroenpraat | 2016-08-22 | 4 | -11185/+11251 |
| | | | |||||
* | | | public forum fallback checking (when custom/expert permissions are applied) ↵ | redmatrix | 2016-08-22 | 1 | -5/+4 |
|/ / | | | | | | | was looking at owner rather than observer perms | ||||
* | | Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_merge | redmatrix | 2016-08-21 | 6 | -19743/+20176 |
|\ \ | |||||
| * | | Updating Spanish and Dutch strings | jeroenpraat | 2016-08-17 | 4 | -12928/+13136 |
| | | | |||||
| * | | Merge pull request #493 from phellmes/de20160817 | hubzilla | 2016-08-17 | 2 | -6815/+7040 |
| |\ \ | | | | | | | | | Update DE translation strings | ||||
| | * | | Update DE translation strings | phellmes | 2016-08-17 | 2 | -6815/+7040 |
| |/ / | |||||
* / / | issue #496 | redmatrix | 2016-08-21 | 2 | -1/+3 |
|/ / | |||||
* | | Use double quotes for strings passed via templates to javascript. Some ↵ | redmatrix | 2016-08-15 | 1 | -5/+5 |
| | | | | | | | | translated strings have unescaped single quotes. | ||||
* | | Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_merge | redmatrix | 2016-08-15 | 12 | -185/+152 |
|\ \ | |||||
| * \ | Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC | Mario Vavti | 2016-08-15 | 2 | -29/+37 |
| |\ \ | |||||
| | * | | btn/dropdown rendering issue | Mario Vavti | 2016-08-14 | 1 | -24/+30 |
| | | | | |||||
| | * | | Merge pull request #481 from anaqreon/issue-475 | hubzilla | 2016-08-14 | 1 | -5/+7 |
| | |\ \ | | | | | | | | | | | Fixed bug preventing images in root photo album from loading in embed… | ||||
| | | * | | Fix for older photos not being embedded by the embedphotos tool. | Andrew Manning | 2016-08-13 | 1 | -2/+4 |
| | | | | | |||||
| | | * | | Fixed bug preventing images in root photo album from loading in embedphotos ↵ | Andrew Manning | 2016-08-13 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | dialog. | ||||
| * | | | | update bootstrap 3.3.5 > 3.3.7 | Mario Vavti | 2016-08-15 | 6 | -138/+111 |
| | | | | | |||||
| * | | | | fix javascript error if not logged in | Mario Vavti | 2016-08-15 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | remove js debugging | Mario Vavti | 2016-08-13 | 1 | -1/+0 |
| | | | | |||||
| * | | | fix #480, enable bbcode autocomplete for photo comments and remove some ↵ | Mario Vavti | 2016-08-13 | 4 | -16/+3 |
| |/ / | | | | | | | | | | redundant javascript | ||||
* / / | Merge dev with last changes of homeinstall script in master | Einer von Vielen | 2016-08-15 | 2 | -47/+7 |
|/ / | |||||
* | | pending flag not being reset when using autoperms from custom role | redmatrix | 2016-08-12 | 1 | -1/+4 |
| | | |||||
* | | fix auto-connect setting | zottel | 2016-08-12 | 1 | -3/+0 |
| | | |||||
* | | possible quickfix for multi-acl not honoring jotnets | Mario Vavti | 2016-08-12 | 1 | -0/+6 |
| | | |||||
* | | embed filter adjustments | redmatrix | 2016-08-11 | 1 | -13/+17 |
| | | |||||
* | | forum detection was off for forums with custom perms | redmatrix | 2016-08-10 | 1 | -1/+3 |
| | | |||||
* | | update CHANGELOG for 1.12 | redmatrix | 2016-08-10 | 1 | -0/+25 |
| | | |||||
* | | update version | redmatrix | 2016-08-10 | 1 | -1/+1 |
| | | |||||
* | | implement acl for folder creation | Mario Vavti | 2016-08-10 | 4 | -17/+53 |
| | |