aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-231-9/+21
|\
| * Merge pull request #182 from anaqreon/url-selectedredmatrix2015-11-241-9/+21
| |\ | | | | | | Place link around selected text
| | * Merge branch 'master' of https://github.com/redmatrix/hubzilla into url-selectedAndrew Manning2015-11-2061-10382/+21638
| | |\
| | * | If text is selected in profile-jot-text when the link button is pressed, the ↵Andrew Manning2015-11-201-9/+21
| | | | | | | | | | | | | | | | input URL is applied around the text. Otherwise, the normal link data fetch occurs.
* | | | issue #184redmatrix2015-11-232-2/+2
|/ / /
* | | doco updatesredmatrix2015-11-222-1/+29
| | |
* | | delivery report tweaksredmatrix2015-11-223-2/+27
| | |
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-229-352/+920
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: version.inc
| * | | update datetimepicker and fix it for finish dateMario Vavti2015-11-223-342/+881
| | | |
| * | | do not hide scrollbarsMario Vavti2015-11-211-1/+1
| | | |
| * | | datetimepicker should also respect first day of week settingMario Vavti2015-11-212-5/+6
| | | |
| * | | make calendar week start (sun or mon) configurableMario Vavti2015-11-214-2/+11
| | |/ | |/|
| * | Use http_status() instead of homegrowing it. Adapt http_status to handle ↵ken restivo2015-11-202-5/+24
| | | | | | | | | | | | replies with data.
| * | Bump version, migrator needs to depend on it for f164ddfken restivo2015-11-201-1/+1
| | |
* | | webpages and design elements weren't being included in the item export query.redmatrix2015-11-222-2/+3
|/ /
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-201-0/+1
|\ \
| * | Report correct HTTP error code, i.e. for API callers.ken restivo2015-11-201-0/+1
| | |
* | | add v4 project roadmap, partial fix for cloning of profile photos on ↵redmatrix2015-11-204-4/+53
|/ / | | | | | | alternate profiles
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-206-3195/+3281
|\ \
| * \ Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-11-204-3192/+3278
| |\ \
| | * | update es+nljeroenpraat2015-11-204-3192/+3278
| | | |
| * | | make calendar language awareMario Vavti2015-11-202-3/+3
| |/ /
* / / change _newwin to _blank because the window named _newwin may be hard to ↵redmatrix2015-11-204-23/+21
|/ / | | | | | | find if you have lots of windows/tabs open.
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-201-0/+6
|\ \
| * | Throw HTTP error and display error message when database is unavailable. #179ken restivo2015-11-191-0/+6
| | |
* | | issue #85, community tags and file tags lost during edits. This required ↵redmatrix2015-11-2014-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'redmatrix2015-11-191-1/+1
| |
* | directory search for pubforums using hubzilla directory servers using ↵redmatrix2015-11-191-3/+9
| | | | | | | | redmatrix flag value
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-194-3/+14
|\ \
| * | Had to switch these 2. Sorry.jeroenpraat2015-11-202-1/+3
| | |
| * | Merge branch 'master' of https://github.com/redmatrix/hubzillajeroenpraat2015-11-203-4/+11
| |\ \
| * | | Some bitsjeroenpraat2015-11-203-4/+13
| | | |
* | | | new feature: 'suppress_duplicates' issue #146 triggered with less than two ↵redmatrix2015-11-193-2/+24
| |/ / |/| | | | | | | | minutes between posts having identical content.
* | | issue #160 add blablanet to directory fallback listredmatrix2015-11-191-0/+1
| | |
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-196-3/+19
|\| | | | | | | | | | | | | | Conflicts: version.inc
| * | move today button from aside to section titleMario Vavti2015-11-194-3/+3
| | |
| * | css fixesMario Vavti2015-11-192-0/+16
| | |
| * | Bump version so migrator tool can verify that mods to account.php etc in ↵ken restivo2015-11-181-1/+1
| | | | | | | | | | | | 312cc41 and 1f2a408 were applied.
* | | issue #173redmatrix2015-11-192-4/+10
|/ /
* | rename some menusMario Vavti2015-11-191-3/+3
| |
* | remove more unneeded filesMario Vavti2015-11-187-157/+0
| |
* | move moment.min.js and remove unneeded filesMario Vavti2015-11-18425-111600/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-11-184-9/+10
|\|
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-182-8/+8
| |\
| | * Pass in account_id. Required for bulk identity importer.ken restivo2015-11-182-5/+5
| | |
| | * Use provided account_id instead of user's logged in account_id. Necessary ↵ken restivo2015-11-181-3/+3
| | | | | | | | | | | | for bulk importer.
| * | wsod viewing photo widgetredmatrix2015-11-182-1/+2
| |/
* / some events refacturingMario Vavti2015-11-18456-5770/+128487
|/
* fix admin plugin hooksredmatrix2015-11-173-3/+25
|
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-1713-230/+599
|\