Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #402 from git-marijus/dev | hubzilla | 2016-05-26 | 1 | -0/+3 |
|\ | | | | | another try on #385 - replace sabres restrictive CSP with what we do in boot.php | ||||
| * | another try on #385 - replace sabres restrictive CSP with what we do in boot.php | Mario Vavti | 2016-05-25 | 1 | -0/+3 |
| | | |||||
* | | some event fixes, also change jquery-textcomplete to un-minified since the ↵ | redmatrix | 2016-05-25 | 1 | -1/+1 |
|/ | | | | minified version appears to require a mapping file and causes a lot of server fetch errors trying to load it. | ||||
* | more work associated with DBA and index.php shuffle | redmatrix | 2016-05-24 | 1 | -33/+8 |
| | |||||
* | relocate index and db | redmatrix | 2016-05-24 | 1 | -12/+14 |
| | |||||
* | moved enotify | redmatrix | 2016-05-24 | 2 | -5/+6 |
| | |||||
* | typo | redmatrix | 2016-05-23 | 1 | -1/+1 |
| | |||||
* | Can't use "use x as y" aliases in callback function declarations | redmatrix | 2016-05-22 | 1 | -1/+1 |
| | |||||
* | move chatroom stuff to zlib | redmatrix | 2016-05-22 | 2 | -15/+19 |
| | |||||
* | move apps to zlib | redmatrix | 2016-05-22 | 2 | -16/+18 |
| | |||||
* | turn the oft-repeated block_public ... check into a function ↵ | redmatrix | 2016-05-22 | 12 | -301/+296 |
| | | | | observer_prohibited() | ||||
* | renamed include files identity.php (channel.php) and Contact.php ↵ | redmatrix | 2016-05-22 | 39 | -67/+39 |
| | | | | (connections.php) | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-21 | 2 | -9/+15 |
|\ | |||||
| * | Temp repo folder error message correction | Andrew Manning | 2016-05-21 | 1 | -2/+2 |
| | | |||||
| * | Moved git repository storage to store/[data]/git to avoid collision with a ↵ | Andrew Manning | 2016-05-21 | 1 | -8/+14 |
| | | | | | | | | channel named git. Fixed bug where temp repo folder was never created. | ||||
| * | revert fix for #385 | Mario Vavti | 2016-05-21 | 1 | -4/+0 |
| | | |||||
| * | possible better fix for #385 | Mario Vavti | 2016-05-21 | 1 | -1/+5 |
| | | |||||
* | | finish updating zot_finger instances | redmatrix | 2016-05-21 | 4 | -23/+14 |
| | | |||||
* | | first cut at zot-finger request signatures | redmatrix | 2016-05-21 | 1 | -8/+8 |
|/ | |||||
* | rework the conversation object stuff at a high level - still needs a bit of ↵ | redmatrix | 2016-05-20 | 7 | -8/+8 |
| | | | | refactoring | ||||
* | remove redundant include | redmatrix | 2016-05-20 | 1 | -3/+0 |
| | |||||
* | consolidate include/*_selectors.php (not touching acl_selectors for the ↵ | redmatrix | 2016-05-20 | 5 | -7/+7 |
| | | | | moment, as it will likely end up with a different disposition) | ||||
* | daemon conversion continued... | redmatrix | 2016-05-19 | 18 | -34/+32 |
| | |||||
* | Replace text strings for translation support | Andrew Manning | 2016-05-19 | 1 | -1/+3 |
| | |||||
* | issue #391 - htmlspecialchars_decode before firing up jot, which re-encodes | redmatrix | 2016-05-19 | 1 | -2/+2 |
| | |||||
* | one more text clarification | redmatrix | 2016-05-18 | 1 | -1/+1 |
| | |||||
* | text clarifications | redmatrix | 2016-05-18 | 2 | -2/+3 |
| | |||||
* | Link new plugins when updating repos via admin/plugins | Andrew Manning | 2016-05-18 | 1 | -0/+12 |
| | |||||
* | missing close tag | redmatrix | 2016-05-18 | 1 | -1/+1 |
| | |||||
* | provide server role on pubsites page | redmatrix | 2016-05-18 | 1 | -3/+3 |
| | |||||
* | Create store/git/sys/extend/addon directory and link if it does not exist in ↵ | Andrew Manning | 2016-05-12 | 1 | -0/+26 |
| | | | | all plugin repo GUI POST actions | ||||
* | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-11 | 4 | -57/+80 |
|\ | |||||
| * | provide repository versions on admin summary page and an upgrade message if ↵ | redmatrix | 2016-05-10 | 2 | -7/+16 |
| | | | | | | | | you're behind master | ||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-10 | 1 | -0/+15 |
| |\ | |||||
| * | | sabre upgrade | redmatrix | 2016-05-10 | 2 | -56/+56 |
| | | | |||||
| * | | initial sabre upgrade (needs lots of work - to wit: authentication, redo the ↵ | redmatrix | 2016-05-10 | 1 | -1/+15 |
| | | | | | | | | | | | | browser interface, and rework event export/import) | ||||
* | | | Check if target directories are writable when adding, updating, or removing ↵ | Andrew Manning | 2016-05-11 | 1 | -63/+88 |
| |/ |/| | | | | | plugin repos | ||||
* | | Remove debugging lines | Andrew Manning | 2016-05-10 | 1 | -4/+0 |
| | | |||||
* | | Link plugins in the newly installed addon repo to /addon so they are accessible | Andrew Manning | 2016-05-10 | 1 | -0/+19 |
|/ | |||||
* | Delete existing repo if the new one has a different URL. Fixed bug that ↵ | Andrew Manning | 2016-05-10 | 1 | -0/+9 |
| | | | | could cause repeated installation. | ||||
* | another public -> pubstream | Mario Vavti | 2016-05-10 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-10 | 1 | -2/+2 |
|\ | |||||
| * | allow delayed publishing of webpages | Mario Vavti | 2016-05-10 | 1 | -2/+2 |
| | | |||||
* | | try again with shutdown handler, fix issue #373 (live-pubstream div wasn't ↵ | redmatrix | 2016-05-10 | 2 | -3/+3 |
|/ | | | | present | ||||
* | revert shutdown function | redmatrix | 2016-05-09 | 1 | -1/+3 |
| | |||||
* | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-09 | 12 | -222/+135 |
|\ | |||||
| * | minor cleanup. No functional changes | Treer | 2016-05-10 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-09 | 1 | -2/+2 |
| |\ | |||||
| | * | prevent recursion in the database driver when debugging is enabled and the ↵ | redmatrix | 2016-05-09 | 1 | -2/+2 |
| | | | | | | | | | | | | system config is not yet loaded - caused by calling get_config and making db calls within the logger function; which we then attempt to log... | ||||
| * | | make editwebpage use status_editor() and fix storing of layout on webpage ↵ | Mario Vavti | 2016-05-09 | 2 | -135/+78 |
| | | | | | | | | | | | | creation |