Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | whitespace | Mario Vavti | 2016-05-19 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-19 | 3 | -28/+37 |
|\ | |||||
| * | Merge pull request #395 from anaqreon/plugin-repo-ui | hubzilla | 2016-05-20 | 2 | -18/+35 |
| |\ | | | | | | | Plugin repo ui | ||||
| | * | Replace text strings for translation support | Andrew Manning | 2016-05-19 | 2 | -10/+6 |
| | | | |||||
| | * | Merge remote-tracking branch 'upstream/dev' into plugin-repo-ui | Andrew Manning | 2016-05-19 | 7 | -17/+36 |
| | |\ | |||||
| | * | | Improved plugin repo management UI in admin/plugins | Andrew Manning | 2016-05-19 | 1 | -17/+38 |
| | | | | |||||
| * | | | Merge pull request #396 from Treer/permissions | hubzilla | 2016-05-20 | 1 | -10/+2 |
| |\ \ \ | | |_|/ | |/| | | fix permission string | ||||
| | * | | fix permission string | Treer | 2016-05-19 | 1 | -10/+2 |
| |/ / | |||||
* / / | provide an acl select option for only me | Mario Vavti | 2016-05-19 | 3 | -15/+60 |
|/ / | |||||
* | | 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 | 3 | -3/+3 |
| | | |||||
* | | explain what we're doing and where we're going with this. | redmatrix | 2016-05-18 | 1 | -6/+7 |
| | | |||||
* | | This explains it all. Don't set the domain when creating a cookie. You'll ↵ | redmatrix | 2016-05-18 | 1 | -17/+10 |
| | | | | | | | | get a wildcard and sessions will break if you have multiple domains running hubzilla (or any php basic session based code). | ||||
* | | Document what I know about the session regeneration issue. I'm really tired ↵ | redmatrix | 2016-05-18 | 1 | -0/+13 |
| | | | | | | | | of fighting this darn thing. Sessions and cookies need to work. | ||||
* | | Merge pull request #394 from anaqreon/plugin-link | hubzilla | 2016-05-19 | 1 | -0/+12 |
|\ \ | |/ |/| | Link new plugins when updating repos via admin/plugins | ||||
| * | Link new plugins when updating repos via admin/plugins | Andrew Manning | 2016-05-18 | 1 | -0/+12 |
|/ | |||||
* | comment out session_regenerate until we get this sorted | redmatrix | 2016-05-18 | 1 | -1/+1 |
| | |||||
* | Revert "Revert "yet more session work"" | redmatrix | 2016-05-18 | 2 | -5/+23 |
| | | | | This reverts commit 37d14f3a1dbc8b4fea6831585c746be4a6602fcb. | ||||
* | Revert "yet more session work" | redmatrix | 2016-05-18 | 2 | -23/+5 |
| | | | | This reverts commit 51edd472c2e007490bdad3198ba1b2a3d7a09c45. | ||||
* | missing close tag | redmatrix | 2016-05-18 | 1 | -1/+1 |
| | |||||
* | provide server role on pubsites page | redmatrix | 2016-05-18 | 3 | -5/+5 |
| | |||||
* | Merge pull request #393 from git-marijus/dev | hubzilla | 2016-05-19 | 1 | -3/+3 |
|\ | | | | | only show $showall_origin if permission_role is custom. it does not m… | ||||
| * | only show $showall_origin if permission_role is custom. it does not make ↵ | Mario Vavti | 2016-05-18 | 1 | -3/+3 |
|/ | | | | much sense otherwise since the member is merely using a preset of permissions. | ||||
* | experimental PDO DBA driver | redmatrix | 2016-05-17 | 2 | -4/+106 |
| | |||||
* | cli utilities - argc and argv reversed. Not functionally incorrect since it ↵ | redmatrix | 2016-05-17 | 18 | -38/+35 |
| | | | | was consistent but aesthetically incorrect. | ||||
* | Merge pull request #389 from sasiflo/dev_sasiflo_sync | hubzilla | 2016-05-18 | 2 | -12/+20 |
|\ | | | | | Synchronization: Directory creation on sync import corrected. | ||||
| * | Synchronization: Directory creation on sync import corrected. | sasiflo | 2016-05-17 | 2 | -12/+20 |
| | | |||||
* | | support work for a long-term fix for issue #390, essentially one can specify ↵ | redmatrix | 2016-05-17 | 6 | -112/+153 |
|/ | | | | a theme:schema string anywhere a theme is input. It will be honoured unless an existing schema setting over-rides this behaviour. This should also be backward compatible but the theme selection code has been cleaned up slightly and there may be subtle differences in behaviour after this commit. On my site this required a page refresh as the first page load after this change was a bit confused. | ||||
* | yet more session work | redmatrix | 2016-05-16 | 2 | -5/+23 |
| | |||||
* | remove the app_menu hook - no longer used anywhere in core. Several addons ↵ | redmatrix | 2016-05-16 | 1 | -6/+0 |
| | | | | still hook into it, but we can remove these over time. | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-16 | 2 | -3045/+3082 |
|\ | |||||
| * | Merge pull request #388 from phellmes/de20160516 | hubzilla | 2016-05-17 | 2 | -3045/+3082 |
| |\ | | | | | | | Update DE translation strings | ||||
| | * | Update DE translations strings | phellmes | 2016-05-16 | 2 | -3045/+3082 |
| | | | |||||
* | | | an issue related to #386 | redmatrix | 2016-05-16 | 3 | -1/+6 |
|/ / | |||||
* | | more work on sessions and cookies, as some anomalies appeared in caldav and ↵ | redmatrix | 2016-05-16 | 7 | -26/+40 |
| | | | | | | | | firefox which suggested deeper issues | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-16 | 9 | -5809/+5990 |
|\ \ | |||||
| * | | Dutch and Spanish Spanish strings, and some schema-bits | jeroenpraat | 2016-05-16 | 9 | -5809/+5990 |
| |/ | |||||
* / | restrict static to the one function that requires it | redmatrix | 2016-05-16 | 1 | -5/+5 |
|/ | |||||
* | changes to session for cdev compatibility | redmatrix | 2016-05-16 | 1 | -6/+6 |
| | |||||
* | updated the addons list - Andrew might want to add his repo/repos and addons ↵ | redmatrix | 2016-05-15 | 1 | -1/+11 |
| | | | | to this page | ||||
* | provide tools to extract a pdo constructor | redmatrix | 2016-05-15 | 1 | -6/+24 |
| | |||||
* | be a bit more precise | redmatrix | 2016-05-15 | 1 | -1/+1 |
| | |||||
* | issue #387 | redmatrix | 2016-05-15 | 1 | -1/+2 |
| | |||||
* | Another updated context help es-es | Manuel Jiménez Friaza | 2016-05-14 | 14 | -273/+58 |
| | |||||
* | issue #383 | redmatrix | 2016-05-14 | 1 | -1/+0 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-14 | 4 | -64/+117 |
|\ | |||||
| * | Merge pull request #381 from anaqreon/chat-notify | redmatrix | 2016-05-14 | 1 | -3/+45 |
| |\ | | | | | | | Enable options for chat notifications, with optional audio. Notify fo… | ||||
| | * | Enable options for chat notifications, with optional audio. Notify for ↵ | Andrew Manning | 2016-05-13 | 1 | -3/+45 |
| |/ | | | | | | | member entering room and incoming messages. | ||||
| * | Merge pull request #380 from git-marijus/dev | redmatrix | 2016-05-14 | 3 | -61/+72 |
| |\ | | | | | | | instead of radio buttons use select to choose between public and custom selection |