aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* turn the oft-repeated block_public ... check into a function ↵redmatrix2016-05-2216-307/+311
| | | | observer_prohibited()
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-224-1318/+1398
|\
| * Update NL + ES_ESjeroenpraat2016-05-224-1318/+1398
| |
* | renamed include files identity.php (channel.php) and Contact.php ↵redmatrix2016-05-2262-240/+194
| | | | | | | | (connections.php)
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-216-671/+721
|\|
| * Merge pull request #400 from anaqreon/plugin-repo-pathhubzilla2016-05-221-8/+14
| |\ | | | | | | Plugin repo path
| | * Temp repo folder error message correctionAndrew Manning2016-05-211-2/+2
| | |
| | * Moved git repository storage to store/[data]/git to avoid collision with a ↵Andrew Manning2016-05-211-8/+14
| | | | | | | | | | | | channel named git. Fixed bug where temp repo folder was never created.
| * | Merge pull request #399 from phellmes/de20160521hubzilla2016-05-222-661/+701
| |\ \ | | |/ | |/| Update DE translation strings
| | * Update DE translation stringsphellmes2016-05-212-661/+701
| |/
| * revert fix for #385Mario Vavti2016-05-211-4/+0
| |
| * possible better fix for #385Mario Vavti2016-05-212-2/+5
| |
| * possible fix for #385Mario Vavti2016-05-213-1/+6
| |
* | include new finger backendredmatrix2016-05-211-0/+130
| |
* | finish updating zot_finger instancesredmatrix2016-05-2110-44/+29
| |
* | first cut at zot-finger request signaturesredmatrix2016-05-212-8/+14
|/
* relocate the (unused currently) protocol driverredmatrix2016-05-202-26/+32
|
* rework the conversation object stuff at a high level - still needs a bit of ↵redmatrix2016-05-2021-98/+44
| | | | refactoring
* remove redundant includeredmatrix2016-05-201-3/+0
|
* consolidate include/*_selectors.php (not touching acl_selectors for the ↵redmatrix2016-05-208-104/+77
| | | | moment, as it will likely end up with a different disposition)
* code commentsredmatrix2016-05-201-3/+4
|
* move template stuff to zotlabs/renderredmatrix2016-05-208-129/+145
|
* cleanup proc_run after messing it up with debugging yesterdayredmatrix2016-05-203-34/+38
|
* recurse one more level of array when processing argsredmatrix2016-05-201-1/+8
|
* add some backtrace to find the issueredmatrix2016-05-201-1/+6
|
* case issueredmatrix2016-05-203-506/+539
|
* update the installation text for the cron setupredmatrix2016-05-191-4/+4
|
* 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
| |