aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * whitespaceMario Vavti2015-11-171-1/+1
| |
| * more css fixesMario Vavti2015-11-176-16/+14
| |
| * 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
| |
* | photo album widget permissions issueredmatrix2015-11-174-3/+9
|/
* fix api/direct_messages/new at least for the json case. We seem to have a ↵redmatrix2015-11-164-16/+34
| | | | missing template for XML
* tag_deliver of an edit to an already uplinked item wasn't resetting ↵redmatrix2015-11-151-1/+4
| | | | permissions and ownership bits before starting delivery chain on the edit.
* allow plugins to also log to a different named logfile and also alter the ↵redmatrix2015-11-151-1/+1
| | | | log message
* 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 ↵redmatrix2015-11-152-2/+2
| | | | markdown
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-157-1138/+1160
|\
| * nl+es and some other bitsjeroenpraat2015-11-147-1138/+1160
| |
* | issues connecting to local forumredmatrix2015-11-153-13/+9
|/
* superblock enhancementsredmatrix2015-11-134-533/+543
|
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-123-4/+4
|\
| * Add note about base64 and urlencode.ken restivo2015-11-121-2/+2
| |
| * Fix spelling of documentation.ken restivo2015-11-122-2/+2
| |
* | really basic photo album widget for content regionsredmatrix2015-11-123-0/+87
|/
* allow pdl contentredmatrix2015-11-124-1/+23
|
* issue #154redmatrix2015-11-121-0/+11
|
* small fixes, removed old unused database row, and log more prominently a ↵redmatrix2015-11-123-2/+3
| | | | missing directory server URL
* Small update to Bluegrid and generic-content-wrapper-styled to dreportjeroenpraat2015-11-122-3/+4
|
* will also need api docoredmatrix2015-11-112-1/+24
|
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-111-7/+7
|\
| * Merge pull request #149 from waitman/masterredmatrix2015-11-121-7/+7
| |\ | | | | | | updates to Postgres schema
| | * updates to Postgres schemaWaitman Gobble2015-11-111-7/+7
| | |
* | | run markdown through html purifier for those who insist on mixing html with ↵redmatrix2015-11-112-2/+3
|/ / | | | | | | markdown.
* | Merge pull request #144 from kenrestivo/api-auth-fixken restivo2015-11-111-0/+1
|\ \ | |/ |/| api_auth.php must be included since the function moved.