Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | issue #185 - prevent liveUpdate from updating while the built-in html5 media ↵ | redmatrix | 2015-11-23 | 1 | -1/+20 |
| | | | | player is "active". This will not have any affect on flash or other media players, and could potentially get confused if you have more than one media player actively playing at any given time. | ||||
* | issue #183 | redmatrix | 2015-11-23 | 1 | -1/+1 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-23 | 1 | -9/+21 |
|\ | |||||
| * | Merge pull request #182 from anaqreon/url-selected | redmatrix | 2015-11-24 | 1 | -9/+21 |
| |\ | | | | | | | Place link around selected text | ||||
| | * | Merge branch 'master' of https://github.com/redmatrix/hubzilla into url-selected | Andrew Manning | 2015-11-20 | 61 | -10382/+21638 |
| | |\ | |||||
| | * | | If text is selected in profile-jot-text when the link button is pressed, the ↵ | Andrew Manning | 2015-11-20 | 1 | -9/+21 |
| | | | | | | | | | | | | | | | | input URL is applied around the text. Otherwise, the normal link data fetch occurs. | ||||
* | | | | issue #184 | redmatrix | 2015-11-23 | 2 | -2/+2 |
|/ / / | |||||
* | | | doco updates | redmatrix | 2015-11-22 | 2 | -1/+29 |
| | | | |||||
* | | | delivery report tweaks | redmatrix | 2015-11-22 | 3 | -2/+27 |
| | | | |||||
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-22 | 9 | -352/+920 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: version.inc | ||||
| * | | | update datetimepicker and fix it for finish date | Mario Vavti | 2015-11-22 | 3 | -342/+881 |
| | | | | |||||
| * | | | do not hide scrollbars | Mario Vavti | 2015-11-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | datetimepicker should also respect first day of week setting | Mario Vavti | 2015-11-21 | 2 | -5/+6 |
| | | | | |||||
| * | | | make calendar week start (sun or mon) configurable | Mario Vavti | 2015-11-21 | 4 | -2/+11 |
| | |/ | |/| | |||||
| * | | Use http_status() instead of homegrowing it. Adapt http_status to handle ↵ | ken restivo | 2015-11-20 | 2 | -5/+24 |
| | | | | | | | | | | | | replies with data. | ||||
| * | | Bump version, migrator needs to depend on it for f164ddf | ken restivo | 2015-11-20 | 1 | -1/+1 |
| | | | |||||
* | | | webpages and design elements weren't being included in the item export query. | redmatrix | 2015-11-22 | 2 | -2/+3 |
|/ / | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-20 | 1 | -0/+1 |
|\ \ | |||||
| * | | Report correct HTTP error code, i.e. for API callers. | ken restivo | 2015-11-20 | 1 | -0/+1 |
| | | | |||||
* | | | add v4 project roadmap, partial fix for cloning of profile photos on ↵ | redmatrix | 2015-11-20 | 4 | -4/+53 |
|/ / | | | | | | | alternate profiles | ||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-20 | 6 | -3195/+3281 |
|\ \ | |||||
| * \ | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-11-20 | 4 | -3192/+3278 |
| |\ \ | |||||
| | * | | update es+nl | jeroenpraat | 2015-11-20 | 4 | -3192/+3278 |
| | | | | |||||
| * | | | make calendar language aware | Mario Vavti | 2015-11-20 | 2 | -3/+3 |
| |/ / | |||||
* / / | change _newwin to _blank because the window named _newwin may be hard to ↵ | redmatrix | 2015-11-20 | 4 | -23/+21 |
|/ / | | | | | | | find if you have lots of windows/tabs open. | ||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-20 | 1 | -0/+6 |
|\ \ | |||||
| * | | Throw HTTP error and display error message when database is unavailable. #179 | ken restivo | 2015-11-19 | 1 | -0/+6 |
| | | | |||||
* | | | issue #85, community tags and file tags lost during edits. This required ↵ | redmatrix | 2015-11-20 | 14 | -1380/+1454 |
|/ / | | | | | | | splitting off communitytags as a separate tag type and is not backward compatible. Community tags on older posts or those federated from redmatrix clones will not be preserved during edits. | ||||
* | | change action label from 'stop following' to 'unfollow thread' | redmatrix | 2015-11-19 | 1 | -1/+1 |
| | | |||||
* | | directory search for pubforums using hubzilla directory servers using ↵ | redmatrix | 2015-11-19 | 1 | -3/+9 |
| | | | | | | | | redmatrix flag value | ||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-19 | 4 | -3/+14 |
|\ \ | |||||
| * | | Had to switch these 2. Sorry. | jeroenpraat | 2015-11-20 | 2 | -1/+3 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | jeroenpraat | 2015-11-20 | 3 | -4/+11 |
| |\ \ | |||||
| * | | | Some bits | jeroenpraat | 2015-11-20 | 3 | -4/+13 |
| | | | | |||||
* | | | | new feature: 'suppress_duplicates' issue #146 triggered with less than two ↵ | redmatrix | 2015-11-19 | 3 | -2/+24 |
| |/ / |/| | | | | | | | | minutes between posts having identical content. | ||||
* | | | issue #160 add blablanet to directory fallback list | redmatrix | 2015-11-19 | 1 | -0/+1 |
| | | | |||||
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-19 | 6 | -3/+19 |
|\| | | | | | | | | | | | | | | Conflicts: version.inc | ||||
| * | | move today button from aside to section title | Mario Vavti | 2015-11-19 | 4 | -3/+3 |
| | | | |||||
| * | | css fixes | Mario Vavti | 2015-11-19 | 2 | -0/+16 |
| | | | |||||
| * | | Bump version so migrator tool can verify that mods to account.php etc in ↵ | ken restivo | 2015-11-18 | 1 | -1/+1 |
| | | | | | | | | | | | | 312cc41 and 1f2a408 were applied. | ||||
* | | | issue #173 | redmatrix | 2015-11-19 | 2 | -4/+10 |
|/ / | |||||
* | | rename some menus | Mario Vavti | 2015-11-19 | 1 | -3/+3 |
| | | |||||
* | | remove more unneeded files | Mario Vavti | 2015-11-18 | 7 | -157/+0 |
| | | |||||
* | | move moment.min.js and remove unneeded files | Mario Vavti | 2015-11-18 | 425 | -111600/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-11-18 | 4 | -9/+10 |
|\| | |||||
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-18 | 2 | -8/+8 |
| |\ | |||||
| | * | Pass in account_id. Required for bulk identity importer. | ken restivo | 2015-11-18 | 2 | -5/+5 |
| | | | |||||
| | * | Use provided account_id instead of user's logged in account_id. Necessary ↵ | ken restivo | 2015-11-18 | 1 | -3/+3 |
| | | | | | | | | | | | | for bulk importer. | ||||
| * | | wsod viewing photo widget | redmatrix | 2015-11-18 | 2 | -1/+2 |
| |/ | |||||
* / | some events refacturing | Mario Vavti | 2015-11-18 | 456 | -5770/+128487 |
|/ |