aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * Removed my version of jot.tplHaakon Meland Eriksen2015-11-2831-2752/+2496
| | * Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-249-42/+96
| | |\ | |_|/ |/| |
* | | more database docoredmatrix2015-11-234-29/+52
* | | issue #185 - prevent liveUpdate from updating while the built-in html5 media ...redmatrix2015-11-231-1/+20
* | | issue #183redmatrix2015-11-231-1/+1
* | | 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
| |\ \ \
| | * \ \ 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
* | | | | | issue #184redmatrix2015-11-232-2/+2
|/ / / / /
| | | | * Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-237-5/+59
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | 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
|\ \ \ \ \
* | | | | | webpages and design elements weren't being included in the item export query.redmatrix2015-11-222-2/+3
| | | | | * Documenting the need to change database server address from 127.0.0.1 to loca...Haakon Meland Eriksen2015-11-221-1/+1
| | | | | * Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-224-346/+886
| | | | | |\ | | |_|_|_|/ | |/| | | |
| * | | | | 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
| | | | | * Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-214-2/+11
| | | | | |\ | | |_|_|_|/ | |/| | | |
| * | | | | make calendar week start (sun or mon) configurableMario Vavti2015-11-214-2/+11
| | |/ / / | |/| | |
| | | | * Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-213-6/+25
| | | | |\ | | |_|_|/ | |/| | |
| * | | | Use http_status() instead of homegrowing it. Adapt http_status to handle repl...ken restivo2015-11-202-5/+24
| * | | | Bump version, migrator needs to depend on it for f164ddfken restivo2015-11-201-1/+1
|/ / / /
| | | * Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-219-27/+75
| | | |\ | |_|_|/ |/| | |
* | | | 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 alternat...redmatrix2015-11-204-4/+53
|/ / / /
* | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-206-3195/+3281
|\ \ \ \
* | | | | change _newwin to _blank because the window named _newwin may be hard to find...redmatrix2015-11-204-23/+21
| | | | * Space between Preview and Submit in jot.tplHaakon Meland Eriksen2015-11-201-1/+1
| | | | * Space between Preview and Submit in jot.tplHaakon Meland Eriksen2015-11-201-0/+2
| | | | * Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-2020-4575/+4735
| | | | |\ | | |_|_|/ | |/| | |
| * | | | 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
|/ / / /
* | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-201-0/+6
|\ \ \ \
* | | | | issue #85, community tags and file tags lost during edits. This required spli...redmatrix2015-11-2014-1380/+1454
| | | | * Rearranging buttonsHaakon Meland Eriksen2015-11-201-1/+1
| | | | * Rearranging buttonsHaakon Meland Eriksen2015-11-201-10/+3
| | | | * Rearranging buttonsHaakon Meland Eriksen2015-11-201-3/+5
| | | | * Rearranging buttonsHaakon Meland Eriksen2015-11-201-6/+8
| | | | * Rearranging buttonsHaakon Meland Eriksen2015-11-201-6/+6
| | | | * Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-2013-13/+65
| | | | |\ | | |_|_|/ | |/| | |
| * | | | Throw HTTP error and display error message when database is unavailable. #179ken restivo2015-11-191-0/+6
|/ / / /
* | | | change action label from 'stop following' to 'unfollow thread'redmatrix2015-11-191-1/+1
* | | | directory search for pubforums using hubzilla directory servers using redmatr...redmatrix2015-11-191-3/+9
* | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-194-3/+14
|\ \ \ \
| * | | | Had to switch these 2. Sorry.jeroenpraat2015-11-202-1/+3