aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into website-exportAndrew Manning2016-08-271-0/+1
|\
| * vsprintf error on sql queryredmatrix2016-08-271-0/+1
| |
* | Merge remote-tracking branch 'upstream/dev' into website-export. Added ↵Andrew Manning2016-08-2726-4413/+4711
|\| | | | | | | attach_move() to include/attach.php.
| * 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 ↵Mario Vavti2016-08-261-11/+12
| | | | | | | | | | | | widgets and whitespace
| * | comanche: generalise the conditional variable usage and add $observer as a ↵redmatrix2016-08-262-24/+73
| |/ | | | | | | test. Update comanche doco to reflect recent changes.
| * - implemented but untested: duplicate detection for photo 'move to another ↵redmatrix2016-08-262-4323/+4375
| | | | | | | | | | | | folder' - weekly string update
| * update docoredmatrix2016-08-251-1/+1
| |
| * ratings are gone. They can be enabled, but there is no UI for doing so at ↵redmatrix2016-08-259-37/+28
| | | | | | | | this time; and will likely only be available in a 'pro' configuration once the new implementation details have been hashed out. This appears to require a mechanism for rebuttal before it can again be opened to the public. There are also some synchronisation issues to contend with; as ratings are currently only distributed to active directory servers. There is no reliable mechanism for a new directory server to fetch existing ratings.
| * move premium channel to 'pro' since that's the only configuration where it ↵redmatrix2016-08-251-3/+12
| | | | | | | | works reliably.
| * attach_move() function created to relocate files or photos to different ↵redmatrix2016-08-242-0/+72
| | | | | | | | directories in the cloud area and photo albums without deleting and recreating (which would create a new resource_id and invalidate any existing links).
| * 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 ↵redmatrix2016-08-241-4/+40
| | | | | | | | equals x, in_array, and array_key_exists
| * 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 ↵Mario Vavti2016-08-241-24/+39
| | | | | | | | scrolling up again before scrolling into the cover photo again.
| * Revert "revert cover photo changes"Mario Vavti2016-08-241-8/+20
| | | | | | | | This reverts commit 4c840d70a494dae62a856ed91f9039eb16bc51ee.
| * provide a mechanism for global template values (macro replacements that are ↵redmatrix2016-08-241-0/+6
| | | | | | | | available to all templates). There's a strong likelihood this list will increase but we may wish to actively prevent it from mushrooming out of control.
| * revert cover photo changesredmatrix2016-08-241-20/+8
| |
| * allow changing the server role - as well as configuring any of the three ↵redmatrix2016-08-234-5/+30
| | | | | | | | options during installation
| * cover photo: adjustments to display the entire photo on manual scrollback ↵redmatrix2016-08-231-1/+2
| | | | | | | | (padding added for nav height)
| * several cover photo widget enhancements:redmatrix2016-08-231-8/+19
| | | | | | | | | | | | | | | | | | - allow a click anywhere on the page to cause the photo to autoscroll - provide a logic flag to autoscroll only once - allow manual scroll back to see the cover photo afterward (tricky to handle the nav menu here) - on scroll back, the nav remains fixed at the top and the top pixels of the cover photo are covered (this was an acceptable tradeoff to gain the ability to see the photo again without causing unpredictable behaviour of the nav) - some positioning details in small screen width mode caused jot to be off screen due to insufficient top padding; a manual padding was also added as something still wasn't right even after adding the nav height - very minor nit: if screen size is reduced below 755 and then upsized again, the cover photo will not be redisplayed
| * 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) ↵redmatrix2016-08-221-5/+4
| | | | | | | | was looking at owner rather than observer perms
| * 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 ↵redmatrix2016-08-2110-103/+125
| |/| | | | | | | | | | git-marijus-dev
| | * 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 ↵Andrew Manning2016-08-234-9/+113
| | | | | | | | attach.php.
* | 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 ↵Andrew Manning2016-08-203-3/+157
| | | | | | | | being imported properly.
* | 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 ↵Andrew Manning2016-08-205-10/+242
| | | | | | | | exported zip file for pages.
* | 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
| |\