aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-193-15/+60
|\
| * Merge pull request #397 from git-marijus/devhubzilla2016-05-203-15/+60
| |\ | | | | | | provide an acl select option for only me
| | * whitespaceMario Vavti2016-05-191-1/+1
| | |
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-05-193-28/+37
| | |\ | | |/ | |/|
| | * provide an acl select option for only meMario Vavti2016-05-193-15/+60
| | |
* | | remove test fileredmatrix2016-05-191-13/+0
| | |
* | | roll minor version, change example textredmatrix2016-05-192-2/+2
| | |
* | | typo uncovered during testsredmatrix2016-05-191-1/+1
| | |
* | | daemon conversion continued...redmatrix2016-05-1949-1804/+66
| | |
* | | cleanup of daemon infrastructureredmatrix2016-05-192-5/+10
| | |
* | | Separate cron into periodic components and use that as the main interface ↵redmatrix2016-05-195-232/+322
| | | | | | | | | | | | for scheduled tasks instead of the quaint 'poller'.
* | | don't try to deliver empty hashesredmatrix2016-05-192-0/+6
| | |
* | | daemon master: create some compatibility coderedmatrix2016-05-198-449/+34
| | |
* | | first phase of daemon refactoringredmatrix2016-05-1918-0/+2122
| | |
* | | minorredmatrix2016-05-192-0/+5
|/ /
* | Merge pull request #395 from anaqreon/plugin-repo-uihubzilla2016-05-202-18/+35
|\ \ | | | | | | Plugin repo ui
| * | Replace text strings for translation supportAndrew Manning2016-05-192-10/+6
| | |
| * | Merge remote-tracking branch 'upstream/dev' into plugin-repo-uiAndrew Manning2016-05-197-17/+36
| |\|
| * | Improved plugin repo management UI in admin/pluginsAndrew Manning2016-05-191-17/+38
| | |
* | | Merge pull request #396 from Treer/permissionshubzilla2016-05-201-10/+2
|\ \ \ | |_|/ |/| | fix permission string
| * | fix permission stringTreer2016-05-191-10/+2
|/ /
* | issue #391 - htmlspecialchars_decode before firing up jot, which re-encodesredmatrix2016-05-191-2/+2
| |
* | one more text clarificationredmatrix2016-05-181-1/+1
| |
* | text clarificationsredmatrix2016-05-183-3/+3
| |
* | explain what we're doing and where we're going with this.redmatrix2016-05-181-6/+7
| |
* | This explains it all. Don't set the domain when creating a cookie. You'll ↵redmatrix2016-05-181-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 ↵redmatrix2016-05-181-0/+13
| | | | | | | | of fighting this darn thing. Sessions and cookies need to work.
* | Merge pull request #394 from anaqreon/plugin-linkhubzilla2016-05-191-0/+12
|\ \ | |/ |/| Link new plugins when updating repos via admin/plugins
| * Link new plugins when updating repos via admin/pluginsAndrew Manning2016-05-181-0/+12
|/
* comment out session_regenerate until we get this sortedredmatrix2016-05-181-1/+1
|
* Revert "Revert "yet more session work""redmatrix2016-05-182-5/+23
| | | | This reverts commit 37d14f3a1dbc8b4fea6831585c746be4a6602fcb.
* Revert "yet more session work"redmatrix2016-05-182-23/+5
| | | | This reverts commit 51edd472c2e007490bdad3198ba1b2a3d7a09c45.
* missing close tagredmatrix2016-05-181-1/+1
|
* provide server role on pubsites pageredmatrix2016-05-183-5/+5
|
* Merge pull request #393 from git-marijus/devhubzilla2016-05-191-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 Vavti2016-05-181-3/+3
|/ | | | much sense otherwise since the member is merely using a preset of permissions.
* experimental PDO DBA driverredmatrix2016-05-172-4/+106
|
* cli utilities - argc and argv reversed. Not functionally incorrect since it ↵redmatrix2016-05-1718-38/+35
| | | | was consistent but aesthetically incorrect.
* Merge pull request #389 from sasiflo/dev_sasiflo_synchubzilla2016-05-182-12/+20
|\ | | | | Synchronization: Directory creation on sync import corrected.
| * Synchronization: Directory creation on sync import corrected.sasiflo2016-05-172-12/+20
| |
* | support work for a long-term fix for issue #390, essentially one can specify ↵redmatrix2016-05-176-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 workredmatrix2016-05-162-5/+23
|
* remove the app_menu hook - no longer used anywhere in core. Several addons ↵redmatrix2016-05-161-6/+0
| | | | still hook into it, but we can remove these over time.
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-162-3045/+3082
|\
| * Merge pull request #388 from phellmes/de20160516hubzilla2016-05-172-3045/+3082
| |\ | | | | | | Update DE translation strings
| | * Update DE translations stringsphellmes2016-05-162-3045/+3082
| | |
* | | an issue related to #386redmatrix2016-05-163-1/+6
|/ /
* | more work on sessions and cookies, as some anomalies appeared in caldav and ↵redmatrix2016-05-167-26/+40
| | | | | | | | firefox which suggested deeper issues
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-169-5809/+5990
|\ \
| * | Dutch and Spanish Spanish strings, and some schema-bitsjeroenpraat2016-05-169-5809/+5990
| |/