Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-30 | 2 | -7/+370 |
|\ | |||||
| * | Merge remote-tracking branch 'upstream/dev' into website-export | Andrew Manning | 2016-08-30 | 7 | -18/+31 |
| |\ | |||||
| * \ | 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. Added ↵ | Andrew Manning | 2016-08-27 | 9 | -36/+115 |
| |\ \ \ | | | | | | | | | | | | | | | | attach_move() to include/attach.php. | ||||
| * \ \ \ | Merge remote-tracking branch 'upstream/dev' into website-export | Andrew Manning | 2016-08-23 | 8 | -8/+16 |
| |\ \ \ \ | |||||
| * | | | | | Website export to cloud files works. Created new recursive copy function in ↵ | Andrew Manning | 2016-08-23 | 1 | -8/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | attach.php. | ||||
| * | | | | | Block export and re-import works. Fixed bug where layout content was not ↵ | Andrew Manning | 2016-08-20 | 1 | -1/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | being imported properly. | ||||
| * | | | | | Layouts list and are selectable for export to the zip file | Andrew Manning | 2016-08-20 | 1 | -14/+56 |
| | | | | | | |||||
| * | | | | | Export of pages and their layouts to a zip file works. Bug on importing the ↵ | Andrew Manning | 2016-08-20 | 2 | -6/+193 |
| | | | | | | | | | | | | | | | | | | | | | | | | exported zip file for pages. | ||||
| * | | | | | Merge remote-tracking branch 'upstream/dev' into website-export | Andrew Manning | 2016-08-19 | 2 | -1/+8 |
| |\ \ \ \ \ | |||||
| * | | | | | | Pages populate the available-to-export list. New checkbox class for smaller ↵ | Andrew Manning | 2016-08-19 | 1 | -4/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | boxes. | ||||
| * | | | | | | Progress implementing zip file export | Andrew Manning | 2016-08-17 | 1 | -2/+24 |
| | | | | | | | |||||
* | | | | | | | remove duplicated include | redmatrix | 2016-08-29 | 1 | -1/+0 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | add authors to post distribution; case insensitive sort apps | redmatrix | 2016-08-29 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | 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 | 1 | -8/+8 |
| | | | | | | |||||
* | | | | | | fix aconfig | redmatrix | 2016-08-28 | 2 | -2/+2 |
| | | | | | | |||||
* | | | | | | Display text around the searched query in documentation search | Andrew Manning | 2016-08-27 | 1 | -2/+3 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | doc search broken | redmatrix | 2016-08-27 | 1 | -2/+2 |
| |_|_|/ |/| | | | |||||
* | | | | add a couple of useful observer constructs to support identity aware pages | redmatrix | 2016-08-26 | 1 | -1/+12 |
| | | | | |||||
* | | | | comanche: generalise the conditional variable usage and add $observer as a ↵ | redmatrix | 2016-08-26 | 1 | -19/+27 |
| | | | | | | | | | | | | | | | | test. Update comanche doco to reflect recent changes. | ||||
* | | | | ratings are gone. They can be enabled, but there is no UI for doing so at ↵ | redmatrix | 2016-08-25 | 5 | -27/+21 |
| | | | | | | | | | | | | | | | | 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. | ||||
* | | | | 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 | ||||
* | | | | provide a mechanism for global template values (macro replacements that are ↵ | redmatrix | 2016-08-24 | 1 | -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. | ||||
* | | | | allow changing the server role - as well as configuring any of the three ↵ | redmatrix | 2016-08-23 | 2 | -4/+28 |
| |_|/ |/| | | | | | | | | options during installation | ||||
* | | | optional server role compatibility checks for plugins | redmatrix | 2016-08-22 | 1 | -0/+1 |
| | | | |||||
* | | | server role management, part 1 | redmatrix | 2016-08-22 | 2 | -2/+2 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/git-marijus/hubzilla into ↵ | redmatrix | 2016-08-21 | 4 | -5/+10 |
|\ \ \ | | | | | | | | | | | | | git-marijus-dev | ||||
| * | | | move jotnets to jot and some cleanup (mostly whitespace) | Mario Vavti | 2016-08-21 | 4 | -5/+9 |
| | |/ | |/| | |||||
* / | | issue #496 | redmatrix | 2016-08-21 | 2 | -1/+3 |
|/ / | |||||
* | | remove insecure repository warning. | redmatrix | 2016-08-18 | 1 | -1/+1 |
| | | |||||
* | | don't set session theme unless logged in. | redmatrix | 2016-08-16 | 1 | -0/+7 |
|/ | |||||
* | move schema settings into the display settings main so we can set ↵ | redmatrix | 2016-08-15 | 2 | -17/+59 |
| | | | | theme:schema theme selectors in settings | ||||
* | fix attached photo/file permissions on clones | redmatrix | 2016-08-15 | 1 | -134/+2 |
| | |||||
* | Added a disable comments setting to the "Additional features" settings with ↵ | Andrew Manning | 2016-08-14 | 1 | -0/+2 |
| | | | | a corresponding post editor toggle button | ||||
* | string update | redmatrix | 2016-08-12 | 1 | -1/+1 |
| | |||||
* | fix auto-connect setting | zottel | 2016-08-12 | 1 | -3/+0 |
| | |||||
* | more cleanup of api | redmatrix | 2016-08-11 | 1 | -1/+1 |
| | |||||
* | A bit of api cleanup. Don't get excited. This is like a 0.005% cleanup but ↵ | redmatrix | 2016-08-11 | 2 | -32/+47 |
| | | | | you have to start somewhere. | ||||
* | optimise Onepoll so it doesn't try and fetch posts for a channel that we've ↵ | redmatrix | 2016-08-10 | 1 | -0/+9 |
| | | | | not given permission to send us their stream and posts. Currently the posts are fetched, processed, and ultimately discarded. Since we know they are going to be discarded, there's not much point fetching them in the first place. | ||||
* | implement acl for folder creation | Mario Vavti | 2016-08-10 | 2 | -10/+18 |
| | |||||
* | use config system.server_role and deprecate 'UNO' | redmatrix | 2016-08-07 | 4 | -19/+23 |
| | |||||
* | fix cloud path | redmatrix | 2016-08-07 | 1 | -1/+1 |
| | |||||
* | bring back acl for cloud file uploads | Mario Vavti | 2016-08-06 | 1 | -1/+2 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-05 | 15 | -18/+83 |
|\ | |||||
| * | multi acl: port /settings | Mario Vavti | 2016-08-05 | 1 | -1/+5 |
| | | |||||
| * | multi acl: port /display | Mario Vavti | 2016-08-05 | 1 | -0/+1 |
| | | |||||
| * | multi acl: port /thing | Mario Vavti | 2016-08-05 | 1 | -0/+8 |
| | |