aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/
| * / import anomalyredmatrix2016-08-171-4/+6
| |/
| * don't set session theme unless logged in.redmatrix2016-08-163-1/+11
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-164-43/+30
| |\
| * | get rid of ugly code constructredmatrix2016-08-161-8/+1
* | | Pages populate the available-to-export list. New checkbox class for smaller b...Andrew Manning2016-08-194-10/+182
* | | Progress implementing zip file exportAndrew Manning2016-08-177-64/+80
* | | Stash changes for merge with devAndrew Manning2016-08-174-0/+52
| |/ |/|
* | Merge pull request #491 from mjfriaza/devhubzilla2016-08-171-0/+12
|\ \
| * | Add Spanish context help settings/features pageManuel Jiménez Friaza2016-08-161-0/+12
|/ /
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-08-165-35/+83
|\|
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-151-14/+1
| |\
| * | move schema settings into the display settings main so we can set theme:schem...redmatrix2016-08-155-35/+83
* | | rename limited -> customMario Vavti2016-08-163-17/+17
* | | remove unneeded functionMario Vavti2016-08-161-26/+1
| |/ |/|
* | only check settings-form for dirty state and remove redundant javascriptMario Vavti2016-08-161-14/+1
|/
* Use double quotes for strings passed via templates to javascript. Some transl...redmatrix2016-08-151-5/+5
* Merge pull request #487 from git-marijus/devhubzilla2016-08-163-128/+79
|\
| * provide group options serverside and minor cleanupMario Vavti2016-08-153-124/+30
| * implement groups in the acl select. please notice that selecting *custom sele...Mario Vavti2016-08-151-17/+62
* | fix attached photo/file permissions on clonesredmatrix2016-08-153-134/+140
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-152-47/+7
|\ \
| * \ Merge pull request #488 from einervonvielen/dev_homeinstall_merge_master-devhubzilla2016-08-162-47/+7
| |\ \ | | |/ | |/|
| | * Merge dev with last changes of homeinstall script in masterEiner von Vielen2016-08-152-47/+7
| |/
* | s/$rr/$rv/redmatrix2016-08-141-22/+22
* | event_store_event hookredmatrix2016-08-143-0/+21
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-05 22:46:09 +0000