aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * Merge remote-tracking branch 'upstream/dev' into website-exportAndrew Manning2016-08-3039-6240/+6309
| | |\ | | |/ | |/|
| * | Merge pull request #505 from wave72/devWave2016-08-302-6166/+6197
| |\ \
| | * | Updated Italian stringsWave722016-08-302-6166/+6197
| | | * 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 attach...Andrew Manning2016-08-2726-4413/+4711
| | | |\ \ \
| | | * \ \ \ 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 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
| | | |\ \ \ \ \
| | | * | | | | | 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
* | | | | | | | | remove duplicated includeredmatrix2016-08-291-1/+0
|/ / / / / / / /
* | | | | | | | 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 it...redmatrix2016-08-282-3/+6
* | | | | | | | 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 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 searchAndrew Manning2016-08-272-4/+10
|/ / / / / / /
* | | | | | / doc search brokenredmatrix2016-08-271-2/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | vsprintf error on sql queryredmatrix2016-08-271-0/+1
| |_|_|_|/ |/| | | |
* | | | | 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