aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | 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
| |/
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-183-3/+25
|\|
| * fix admin plugin hooksredmatrix2015-11-173-3/+25
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-1810-19/+23
|\|
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-1713-230/+599
| |\
| | * whitespaceMario Vavti2015-11-171-1/+1
| | * more css fixesMario Vavti2015-11-176-16/+14
| * | photo album widget permissions issueredmatrix2015-11-174-3/+9
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-1714-233/+622
|\ \ \ | | |/ | |/|
| * | missing closing " for src attributeMario Vavti2015-11-171-1/+1
| * | update bootstrap lib 3.3.4 -> 3.3.5Mario Vavti2015-11-176-195/+568
| * | css fixesMario Vavti2015-11-172-7/+9
| * | show jotnets toggle button only if there are jotnets and whitespace fixesMario Vavti2015-11-171-14/+10
| |/
| * fix api/direct_messages/new at least for the json case. We seem to have a mis...redmatrix2015-11-164-16/+34
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-1610-26/+51
|\|
| * tag_deliver of an edit to an already uplinked item wasn't resetting permissio...redmatrix2015-11-151-1/+4
| * allow plugins to also log to a different named logfile and also alter the log...redmatrix2015-11-151-1/+1
| * add logger plugin hookredmatrix2015-11-151-0/+16
| * permission issues editing wall-to-wall postsredmatrix2015-11-153-9/+19
| * issue with dead hub detectionredmatrix2015-11-151-1/+1
| * revert html in markdown for posts, but trim the input before processing the m...redmatrix2015-11-152-2/+2
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-157-1138/+1160
| |\
| * | issues connecting to local forumredmatrix2015-11-153-13/+9
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-157-1138/+1160
|\ \ \ | | |/ | |/|
| * | nl+es and some other bitsjeroenpraat2015-11-147-1138/+1160
| |/
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-144-533/+543
|\|
| * superblock enhancementsredmatrix2015-11-134-533/+543
* | Reorder buttons HMEHaakon Meland Eriksen2015-11-131-45/+43
* | Adding original jot.tpl from GitHubHaakon Meland Eriksen2015-11-131-49/+54