aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * doco updatesredmatrix2016-08-224-2/+155
| * server role management, part 1redmatrix2016-08-223-12/+37
| * remove references to tinymce which were causing console errorsredmatrix2016-08-212-85/+4
| * make zid() do the right things when confronted with url fragmentsredmatrix2016-08-211-0/+10
| * Merge branch 'git-marijus-dev' into devredmatrix2016-08-2110-103/+125
| |\
| | * Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-mariju...redmatrix2016-08-2110-103/+125
| |/|
| | * move jotnets to jot and some cleanup (mostly whitespace)Mario Vavti2016-08-2110-103/+124
| * | issue #496redmatrix2016-08-212-1/+3
| * | Merge branch 'zp' into devredmatrix2016-08-191-4/+31
| |\ \
| | * | block backdoor delivery of bulk imported itemsredmatrix2016-08-191-4/+31
| | |/
| * / string updateredmatrix2016-08-191-3697/+3724
| |/
* | Website export to cloud files works. Created new recursive copy function in a...Andrew Manning2016-08-234-9/+113
* | Visual improvements to the export element tableAndrew Manning2016-08-211-25/+25
* | Block export and re-import works. Fixed bug where layout content was not bein...Andrew Manning2016-08-203-3/+157
* | Layouts list and are selectable for export to the zip fileAndrew Manning2016-08-203-16/+137
* | Export of pages and their layouts to a zip file works. Bug on importing the e...Andrew Manning2016-08-205-10/+242
* | Merge remote-tracking branch 'upstream/dev' into website-exportAndrew Manning2016-08-1911-6150/+6138
|\|
| * remove insecure repository warning.redmatrix2016-08-184-31/+31
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-172-6106/+6089
| |\
| | * Merge pull request #492 from wave72/devhubzilla2016-08-172-6106/+6089
| | |\
| | | * Updated Italian stringsWave722016-08-172-6106/+6089
| | |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 19:39:45 +0000