Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-30 | 13 | -6219/+7100 |
|\ | |||||
| * | Merge pull request #506 from anaqreon/website-export | zotlabs | 2016-08-31 | 11 | -53/+903 |
| |\ | | | | | | | Website export | ||||
| | * | Merge remote-tracking branch 'upstream/dev' into website-export | Andrew Manning | 2016-08-30 | 39 | -6240/+6309 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #505 from wave72/dev | Wave | 2016-08-30 | 2 | -6166/+6197 |
| |\ \ | | | | | | | | | Updated Italian strings | ||||
| | * | | Updated Italian strings | Wave72 | 2016-08-30 | 2 | -6166/+6197 |
| | | | | |||||
| | | * | Merge remote-tracking branch 'upstream/dev' into website-export | Andrew Manning | 2016-08-27 | 1 | -2/+2 |
| | | |\ | |||||
| | | * \ | Merge remote-tracking branch 'upstream/dev' into website-export | Andrew Manning | 2016-08-27 | 1 | -0/+1 |
| | | |\ \ | |||||
| | | * \ \ | Merge remote-tracking branch 'upstream/dev' into website-export. Added ↵ | Andrew Manning | 2016-08-27 | 26 | -4413/+4711 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | attach_move() to include/attach.php. | ||||
| | | * \ \ \ | Merge remote-tracking branch 'upstream/dev' into website-export | Andrew Manning | 2016-08-23 | 28 | -3913/+4113 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Website export to cloud files works. Created new recursive copy function in ↵ | Andrew Manning | 2016-08-23 | 4 | -9/+113 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attach.php. | ||||
| | | * | | | | | Visual improvements to the export element table | Andrew Manning | 2016-08-21 | 1 | -25/+25 |
| | | | | | | | | |||||
| | | * | | | | | Block export and re-import works. Fixed bug where layout content was not ↵ | Andrew Manning | 2016-08-20 | 3 | -3/+157 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being imported properly. | ||||
| | | * | | | | | Layouts list and are selectable for export to the zip file | Andrew Manning | 2016-08-20 | 3 | -16/+137 |
| | | | | | | | | |||||
| | | * | | | | | Export of pages and their layouts to a zip file works. Bug on importing the ↵ | Andrew Manning | 2016-08-20 | 5 | -10/+242 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exported zip file for pages. | ||||
| | | * | | | | | Merge remote-tracking branch 'upstream/dev' into website-export | Andrew Manning | 2016-08-19 | 11 | -6150/+6138 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Pages populate the available-to-export list. New checkbox class for smaller ↵ | Andrew Manning | 2016-08-19 | 4 | -10/+182 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boxes. | ||||
| | | * | | | | | | Progress implementing zip file export | Andrew Manning | 2016-08-17 | 7 | -64/+80 |
| | | | | | | | | | |||||
| | | * | | | | | | Stash changes for merge with dev | Andrew Manning | 2016-08-17 | 4 | -0/+52 |
| | | | | | | | | | |||||
* | | | | | | | | | remove duplicated include | redmatrix | 2016-08-29 | 1 | -1/+0 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-29 | 2 | -7/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | make lock switching actually work with multiple acl forms | Mario Vavti | 2016-08-29 | 2 | -7/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | add authors to post distribution; case insensitive sort apps | redmatrix | 2016-08-29 | 2 | -1/+21 |
|/ / / / / / / / | |||||
* | | | | | | | | Before throwing a 'smarty3 dir does not exist' fatal error, try and create ↵ | redmatrix | 2016-08-28 | 2 | -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 initialised | redmatrix | 2016-08-28 | 1 | -2/+3 |
| | | | | | | | | |||||
* | | | | | | | | supercedes pull request #503 | redmatrix | 2016-08-28 | 1 | -1/+9 |
| | | | | | | | | |||||
* | | | | | | | | move allowed email domains to admin->security page | redmatrix | 2016-08-28 | 3 | -10/+11 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-28 | 24 | -44/+44 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge pull request #502 from anaqreon/docfix | Andrew Manning | 2016-08-28 | 24 | -44/+44 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove definite article before $Projectname in docs | ||||
| | * | | | | | | | | Remove definite article before $Projectname in docs | Andrew Manning | 2016-08-28 | 24 | -44/+44 |
| |/ / / / / / / / | |||||
* / / / / / / / / | fix aconfig | redmatrix | 2016-08-28 | 2 | -2/+2 |
|/ / / / / / / / | |||||
* | | | | | | | | minor (non-technical) corrections in the plugin doc | redmatrix | 2016-08-27 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #501 from anaqreon/doc-search | zotlabs | 2016-08-28 | 2 | -4/+10 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | Display text around the searched query in documentation search | ||||
| * | | | | | | | Display text around the searched query in documentation search | Andrew Manning | 2016-08-27 | 2 | -4/+10 |
|/ / / / / / / | |||||
* | | | | | / | doc search broken | redmatrix | 2016-08-27 | 1 | -2/+2 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | vsprintf error on sql query | redmatrix | 2016-08-27 | 1 | -0/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | issue #186 ...different check for pubforum with expert permissions | redmatrix | 2016-08-26 | 1 | -12/+6 |
| | | | | | |||||
* | | | | | add a couple of useful observer constructs to support identity aware pages | redmatrix | 2016-08-26 | 1 | -1/+12 |
| | | | | | |||||
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-26 | 2 | -11/+24 |
|\ \ \ \ \ | |||||
| * | | | | | Add new page connedit to Spanish context help | Manuel Jiménez Friaza | 2016-08-26 | 1 | -0/+12 |
| | | | | | | |||||
| * | | | | | contact-block needs a class clear div at the end to not mess with following ↵ | Mario Vavti | 2016-08-26 | 1 | -11/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | widgets and whitespace | ||||
* | | | | | | comanche: generalise the conditional variable usage and add $observer as a ↵ | redmatrix | 2016-08-26 | 2 | -24/+73 |
|/ / / / / | | | | | | | | | | | | | | | | test. Update comanche doco to reflect recent changes. | ||||
* | | | | | - implemented but untested: duplicate detection for photo 'move to another ↵ | redmatrix | 2016-08-26 | 2 | -4323/+4375 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folder' - weekly string update | ||||
* | | | | | update doco | redmatrix | 2016-08-25 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | ratings are gone. They can be enabled, but there is no UI for doing so at ↵ | redmatrix | 2016-08-25 | 9 | -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 ↵ | redmatrix | 2016-08-25 | 1 | -3/+12 |
| | | | | | | | | | | | | | | | | | | | | works reliably. | ||||
* | | | | | attach_move() function created to relocate files or photos to different ↵ | redmatrix | 2016-08-24 | 2 | -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 page | redmatrix | 2016-08-24 | 1 | -0/+12 |
| | | | | | |||||
* | | | | | off by one pixel | redmatrix | 2016-08-24 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | some more complex test scenarios for comanche conditionals: equals x, not ↵ | redmatrix | 2016-08-24 | 1 | -4/+40 |
| | | | | | | | | | | | | | | | | | | | | equals x, in_array, and array_key_exists | ||||
* | | | | | do not return false since it could prevent clicking also when not appropriate. | Mario Vavti | 2016-08-24 | 1 | -1/+1 |
| | | | | |