aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * remove some loggingMario Vavti2016-08-051-10/+1
| | * multi acl: port /settingsMario Vavti2016-08-053-5/+7
| | * multi acl: port /displayMario Vavti2016-08-051-0/+1
| | * multi acl: port /thingMario Vavti2016-08-054-7/+13
| | * multi acl: port /rpostMario Vavti2016-08-058-20/+18
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-08-052-2/+42
| | |\ | | |/ | |/|
| * | Merge pull request #476 from anaqreon/wikihubzilla2016-08-052-2/+42
| |\ \
| | * \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-08-041-11/+13
| | |\ \ | | |/ / | |/| |
| | * | Parse bbcode when page loadsAndrew Manning2016-08-042-2/+8
| | * | Convert select bbcode tags including [observer], [baseurl], [sitename]Andrew Manning2016-08-032-0/+34
| | | * multi acl: provide a acl-form-trigger class which comes handy in certain situ...Mario Vavti2016-08-043-6/+7
| | | * multi acl: port /wikiMario Vavti2016-08-042-11/+20
| | | * multi acl: port /webpages and /mitemMario Vavti2016-08-044-3/+13