aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * open editor or comment window when linkdropping to a closed window. We probab...redmatrix2016-08-101-4/+18
| * allow dropping links on comments as well as postsredmatrix2016-08-092-2/+4
| * function order reversedredmatrix2016-08-091-2/+2
| * You can drag links to the editor (which will be parsed and inserted); as well...redmatrix2016-08-092-2/+2
| * bad code formatredmatrix2016-08-092-2/+27
| * updates to hcard parsingredmatrix2016-08-071-4/+9
| * diaspora vcard updatesredmatrix2016-08-072-5/+12
| * server rolesredmatrix2016-08-071-6/+8
| * use config system.server_role and deprecate 'UNO'redmatrix2016-08-0724-71/+135
| * fix cloud pathredmatrix2016-08-071-1/+1
| * fix /cloud upload for imagesMario Vavti2016-08-061-1/+1
| * bring back acl for cloud file uploadsMario Vavti2016-08-064-19/+31
| * strings updateredmatrix2016-08-051-2270/+2333
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-0538-121/+242
| |\
| | * Merge pull request #477 from git-marijus/devhubzilla2016-08-0637-119/+200
| | |\
| | | * Revert "Revert "remove some logging""Mario Vavti2016-08-051-10/+1
| | | * Revert "remove some logging"Mario Vavti2016-08-051-1/+10