aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * 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 mi...redmatrix2015-11-193-2/+24
| | |/ | |/|
| * | 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
| |\|
| * | issue #173redmatrix2015-11-192-4/+10
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-196-3/+19
|\ \ \ | | |/ | |/|
| * | move today button from aside to section titleMario Vavti2015-11-194-3/+3
| * | css fixesMario Vavti2015-11-192-0/+16
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-192-4/+4
|\| |
| * | Bump version so migrator tool can verify that mods to account.php etc in 312c...ken restivo2015-11-181-1/+1
| |/
| * rename some menusMario Vavti2015-11-191-3/+3
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-1926-5770/+16731
|\|
| * 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
| |\
| * | some events refacturingMario Vavti2015-11-18456-5770/+128487
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-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 for...ken restivo2015-11-181-3/+3
| | |/
| * / wsod viewing photo widgetredmatrix2015-11-182-1/+2
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 19:17:57 +0000