Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Space between Preview and Submit in jot.tpl | Haakon Meland Eriksen | 2015-11-20 | 1 | -1/+1 | |
* | | | | | Space between Preview and Submit in jot.tpl | Haakon Meland Eriksen | 2015-11-20 | 1 | -0/+2 | |
* | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-20 | 20 | -4575/+4735 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | 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 | |
| |/ / / | ||||||
| * | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-20 | 1 | -0/+6 | |
| |\ \ \ | ||||||
| * | | | | issue #85, community tags and file tags lost during edits. This required spli... | redmatrix | 2015-11-20 | 14 | -1380/+1454 | |
* | | | | | Rearranging buttons | Haakon Meland Eriksen | 2015-11-20 | 1 | -1/+1 | |
* | | | | | Rearranging buttons | Haakon Meland Eriksen | 2015-11-20 | 1 | -10/+3 | |
* | | | | | Rearranging buttons | Haakon Meland Eriksen | 2015-11-20 | 1 | -3/+5 | |
* | | | | | Rearranging buttons | Haakon Meland Eriksen | 2015-11-20 | 1 | -6/+8 | |
* | | | | | Rearranging buttons | Haakon Meland Eriksen | 2015-11-20 | 1 | -6/+6 | |
* | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-20 | 13 | -13/+65 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Throw HTTP error and display error message when database is unavailable. #179 | ken restivo | 2015-11-19 | 1 | -0/+6 | |
| |/ / / | ||||||
| * | | | 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 redmatr... | redmatrix | 2015-11-19 | 1 | -3/+9 | |
| * | | | 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 mi... | redmatrix | 2015-11-19 | 3 | -2/+24 | |
| | |/ / / | |/| | | | ||||||
| * | | | | 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 | |
| |\| | | | ||||||
| * | | | | issue #173 | redmatrix | 2015-11-19 | 2 | -4/+10 | |
* | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-19 | 6 | -3/+19 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | 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 | |
* | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-19 | 2 | -4/+4 | |
|\| | | | | ||||||
| * | | | | Bump version so migrator tool can verify that mods to account.php etc in 312c... | ken restivo | 2015-11-18 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | rename some menus | Mario Vavti | 2015-11-19 | 1 | -3/+3 | |
* | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-19 | 26 | -5770/+16731 | |
|\| | | | ||||||
| * | | | 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 | |
| |\| | | ||||||
| * | | | some events refacturing | Mario Vavti | 2015-11-18 | 456 | -5770/+128487 | |
* | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 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 for... | ken restivo | 2015-11-18 | 1 | -3/+3 | |
| | |/ / | ||||||
| * / / | wsod viewing photo widget | redmatrix | 2015-11-18 | 2 | -1/+2 | |
| |/ / | ||||||
* | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-18 | 3 | -3/+25 | |
|\| | | ||||||
| * | | fix admin plugin hooks | redmatrix | 2015-11-17 | 3 | -3/+25 | |
* | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-18 | 10 | -19/+23 | |
|\| | | ||||||
| * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-17 | 13 | -230/+599 | |
| |\ \ | ||||||
| | * | | whitespace | Mario Vavti | 2015-11-17 | 1 | -1/+1 | |
| | * | | more css fixes | Mario Vavti | 2015-11-17 | 6 | -16/+14 | |
| * | | | photo album widget permissions issue | redmatrix | 2015-11-17 | 4 | -3/+9 | |
* | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-17 | 14 | -233/+622 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | missing closing " for src attribute | Mario Vavti | 2015-11-17 | 1 | -1/+1 |