Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-11-18 | 1 | -4/+4 | |
|\ | ||||||
| * | Pass in account_id. Required for bulk identity importer. | ken restivo | 2015-11-18 | 1 | -1/+1 | |
| | | ||||||
| * | Use provided account_id instead of user's logged in account_id. Necessary ↵ | ken restivo | 2015-11-18 | 1 | -3/+3 | |
| | | | | | | | | for bulk importer. | |||||
* | | some events refacturing | Mario Vavti | 2015-11-18 | 1 | -15/+14 | |
|/ | ||||||
* | fix admin plugin hooks | redmatrix | 2015-11-17 | 1 | -1/+6 | |
| | ||||||
* | fix api/direct_messages/new at least for the json case. We seem to have a ↵ | redmatrix | 2015-11-16 | 1 | -1/+1 | |
| | | | | missing template for XML | |||||
* | permission issues editing wall-to-wall posts | redmatrix | 2015-11-15 | 1 | -7/+7 | |
| | ||||||
* | revert html in markdown for posts, but trim the input before processing the ↵ | redmatrix | 2015-11-15 | 1 | -1/+1 | |
| | | | | markdown | |||||
* | superblock enhancements | redmatrix | 2015-11-13 | 1 | -2/+2 | |
| | ||||||
* | allow pdl content | redmatrix | 2015-11-12 | 1 | -0/+4 | |
| | ||||||
* | small fixes, removed old unused database row, and log more prominently a ↵ | redmatrix | 2015-11-12 | 1 | -0/+2 | |
| | | | | missing directory server URL | |||||
* | Small update to Bluegrid and generic-content-wrapper-styled to dreport | jeroenpraat | 2015-11-12 | 1 | -2/+3 | |
| | ||||||
* | run markdown through html purifier for those who insist on mixing html with ↵ | redmatrix | 2015-11-11 | 1 | -1/+2 | |
| | | | | markdown. | |||||
* | Bust out import_account() into a separate function to allow importing ↵ | ken restivo | 2015-11-10 | 1 | -3/+13 | |
| | | | | accounts by proxy, i.e. for admins to import a channel on behalf of a user. | |||||
* | do a better job of preserving linebreaks in posts for channels that use markdown | redmatrix | 2015-11-10 | 1 | -0/+1 | |
| | ||||||
* | suppress duplicate locations in connedit, issue #111 | redmatrix | 2015-11-08 | 1 | -0/+4 | |
| | ||||||
* | no comment permission bug, also implement delete() in RedDirectory per Waitman | redmatrix | 2015-11-08 | 1 | -8/+13 | |
| | ||||||
* | relative attachment not fetched due to os filename issue | redmatrix | 2015-11-08 | 1 | -1/+4 | |
| | ||||||
* | A few quotes too many. Also translations for tooltip. | jeroenpraat | 2015-11-08 | 1 | -5/+5 | |
| | ||||||
* | Fix ffsapi for non-English languages (or better when 's was used in the ↵ | jeroenpraat | 2015-11-08 | 1 | -7/+7 | |
| | | | | strings) - Update nl+es | |||||
* | more work on hook doco | redmatrix | 2015-11-05 | 1 | -1/+2 | |
| | ||||||
* | update hooklist | redmatrix | 2015-11-05 | 1 | -1/+1 | |
| | ||||||
* | Firefox Share app. Paper plane icon is public domain. Shorted the name in ↵ | jeroenpraat | 2015-11-05 | 1 | -3/+4 | |
| | | | | ffsapi > compare it with other providers. Changed bookmark (checkmark) item to selfmade Hubzilla bookmark icon for Firefox (bookmark icon = bootstrap icon). | |||||
* | Firefox share (that seems now the official name) button added to misc. settings. | jeroenpraat | 2015-11-05 | 1 | -2/+3 | |
| | ||||||
* | Style the button | jeroenpraat | 2015-11-05 | 1 | -2/+2 | |
| | ||||||
* | menu_list() takes a channel_id, not the whole channel array | redmatrix | 2015-11-04 | 1 | -1/+3 | |
| | ||||||
* | typo | redmatrix | 2015-11-04 | 1 | -1/+1 | |
| | ||||||
* | add bookmarking to FF social api provider | redmatrix | 2015-11-04 | 1 | -3/+3 | |
| | ||||||
* | Firefox Share API provider interface (first cut, only has share ability) | redmatrix | 2015-11-04 | 1 | -0/+64 | |
| | ||||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-11-03 | 1 | -0/+2 | |
|\ | | | | | | | | | | | | | Conflicts: include/photo/photo_driver.php include/text.php mod/post.php | |||||
| * | backport small bits of the re-install fix; at least the damaging bits | redmatrix | 2015-11-03 | 1 | -6/+6 | |
| | | ||||||
* | | better re-install detection/protection. This necessitated a slight protocol ↵ | redmatrix | 2015-11-03 | 1 | -21/+33 | |
| | | | | | | | | change but should not introduce any compatibility issues with older software. Things just work better if you use an up-to-date server. | |||||
* | | need better peer verification due to re-install issue, this is temporary | redmatrix | 2015-11-03 | 1 | -31/+38 | |
| | | ||||||
* | | provide admin setting to change directory server | redmatrix | 2015-11-03 | 1 | -1/+26 | |
| | | ||||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-03 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | timeago() works best with iso format. fix #118 | Mario Vavti | 2015-11-03 | 1 | -1/+1 | |
| | | | ||||||
* | | | implement unfollow thread | redmatrix | 2015-11-03 | 1 | -97/+12 | |
|/ / | ||||||
* | | revert filtering by metwork | Mario Vavti | 2015-11-02 | 1 | -1/+1 | |
| | | ||||||
* | | hubloc filtering to eliminate dead and deleted entries | redmatrix | 2015-11-01 | 1 | -1/+2 | |
| | | ||||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-01 | 3 | -2/+7 | |
|\ \ | ||||||
| * | | More Bluegrid fine tuning and generic-content-wrapper-styled added to some ↵ | jeroenpraat | 2015-11-01 | 2 | -1/+6 | |
| | | | | | | | | | | | | tpl-files and 2 php files, cause they dont have a tpl file. | |||||
| * | | since other networks do not support cloning we only need hublocs for zot ↵ | Mario Vavti | 2015-11-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | contacts - fix #111 | |||||
* | | | improve /locs page with some field notes and the ability to do a forced sync | redmatrix | 2015-11-01 | 1 | -0/+12 | |
|/ / | ||||||
* | | make hubloc repair script a bit more selective | redmatrix | 2015-10-31 | 1 | -3/+13 | |
| | | ||||||
* | | add hubloc repair script (needed for deadsuperhero, probably temporary) | redmatrix | 2015-10-30 | 1 | -0/+70 | |
| | | ||||||
* | | fix #83 | Mario Vavti | 2015-10-29 | 2 | -2/+3 | |
| | | ||||||
* | | add entry for 'none' | redmatrix | 2015-10-29 | 1 | -10/+12 | |
| | | ||||||
* | | This may take a few iterations to discover the best way to present the ↵ | redmatrix | 2015-10-29 | 1 | -1/+17 | |
| | | | | | | | | information, but we need a way for members to know what alternate locations are available for a channel during times of server issues - and as recently discovered if there aren't any hublocs at all; without digging around the database and probing channels and other messy stuff. | |||||
* | | add text hint how to set language in connection filter | redmatrix | 2015-10-28 | 1 | -2/+2 | |
| | | ||||||
* | | first the image than the body | Mario Vavti | 2015-10-27 | 1 | -1/+1 | |
| | |