aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* allow public comments (sort of - see the notes)redmatrix2016-08-311-5/+4
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-314-13784/+14054
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devjeroenpraat2016-08-3121-68/+1026
| |\
| * | Dutch and Spanish string updatejeroenpraat2016-08-314-13784/+14054
| | |
* | | provide techlevels in the pro server role. Should have no visible effect on ↵redmatrix2016-08-3112-20/+81
| |/ |/| | | | | other roles.
* | resolve merge conflictMario Vavti2016-08-3120-68/+1019
|\ \
| * | The 'save to folder' modal dialog looked like crap. Now it only looks like dung.redmatrix2016-08-303-5/+15
| | |
| * | only check permissions on normal photos and force cover photos as well as ↵redmatrix2016-08-301-0/+9
| | | | | | | | | | | | profile photos to be public. As a side effect 'thing' photos will also be considered public.
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-302-14/+11
| |\ \
| | * \ Merge pull request #507 from anaqreon/exportzotlabs2016-08-312-14/+11
| | |\ \ | | | | | | | | | | Imported webpage elements update existing elements properly. AllowCode…
| | | * | Imported webpage elements update existing elements properly. AllowCode ↵Andrew Manning2016-08-302-14/+11
| | | | | | | | | | | | | | | | | | | | permission is checked correctly and issues error on import if denied.
| * | | | version and release policy guideredmatrix2016-08-301-0/+30
| |/ / /
| * / / first cut at project governance docredmatrix2016-08-302-0/+47
| |/ /
| * | increase timeout on oembed remote fetches. This is a balancing act. Too ↵redmatrix2016-08-301-3/+12
| | | | | | | | | | | | short and many sites won't show up. Too long and you could be watching a spinner anxiously waiting for the page to load even if your own site is blindingly fast.
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-3013-6219/+7100
| |\ \
| | * \ Merge pull request #506 from anaqreon/website-exportzotlabs2016-08-3111-53/+903
| | |\ \ | | | |/ | | |/| Website export
| | | * Merge remote-tracking branch 'upstream/dev' into website-exportAndrew Manning2016-08-3039-6240/+6309
| | | |\ | | | |/ | | |/|
| | | * Merge remote-tracking branch 'upstream/dev' into website-exportAndrew Manning2016-08-271-2/+2
| | | |\
| | | * \ Merge remote-tracking branch 'upstream/dev' into website-exportAndrew Manning2016-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.
| | | * \ \ \ Merge remote-tracking branch 'upstream/dev' into website-exportAndrew Manning2016-08-2328-3913/+4113
| | | |\ \ \ \
| | | * | | | | 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
| | | |\ \ \ \ \
| | | * | | | | | Pages populate the available-to-export list. New checkbox class for smaller ↵Andrew Manning2016-08-194-10/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boxes.
| | | * | | | | | Progress implementing zip file exportAndrew Manning2016-08-177-64/+80
| | | | | | | | |
| | | * | | | | | Stash changes for merge with devAndrew Manning2016-08-174-0/+52
| | | | | | | | |
| * | | | | | | | remove duplicated includeredmatrix2016-08-291-1/+0
| | | | | | | | |
* | | | | | | | | provide a possibility to create checklists in bbcode [x] creates a checked ↵Mario Vavti2016-08-312-0/+7
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | checkbox, [] creates an unchecked checkbox
* | | | | | | | Merge pull request #505 from wave72/devWave2016-08-302-6166/+6197
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Updated Italian strings
| * | | | | | | Updated Italian stringsWave722016-08-302-6166/+6197
| | | | | | | |
* | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-292-7/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | make lock switching actually work with multiple acl formsMario Vavti2016-08-292-7/+6
| | | | | | | | |
* | | | | | | | | add authors to post distribution; case insensitive sort appsredmatrix2016-08-292-1/+21
|/ / / / / / / /
* | | | | | | | Before throwing a 'smarty3 dir does not exist' fatal error, try and create ↵redmatrix2016-08-282-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it. We did try and create it during install, but the template processor is initalised long before we get to that code (and throws that ugly error).
* | | | | | | | create smarty dir before any templates can be initialisedredmatrix2016-08-281-2/+3
| | | | | | | |
* | | | | | | | supercedes pull request #503redmatrix2016-08-281-1/+9
| | | | | | | |
* | | | | | | | move allowed email domains to admin->security pageredmatrix2016-08-283-10/+11
| | | | | | | |
* | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-2824-44/+44
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #502 from anaqreon/docfixAndrew Manning2016-08-2824-44/+44
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove definite article before $Projectname in docs
| | * | | | | | | | Remove definite article before $Projectname in docsAndrew Manning2016-08-2824-44/+44
| |/ / / / / / / /
* / / / / / / / / fix aconfigredmatrix2016-08-282-2/+2
|/ / / / / / / /
* | | | | | | | minor (non-technical) corrections in the plugin docredmatrix2016-08-271-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #501 from anaqreon/doc-searchzotlabs2016-08-282-4/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Display text around the searched query in documentation search
| * | | | | | | Display text around the searched query in documentation searchAndrew Manning2016-08-272-4/+10
|/ / / / / / /
* | | | | | / doc search brokenredmatrix2016-08-271-2/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | vsprintf error on sql queryredmatrix2016-08-271-0/+1
| |_|_|_|/ |/| | | |