aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19 from redmatrix/mastermrjive2016-01-2871-4968/+5082
|\
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-273-3/+3
| |\
| | * remark in the private notes encryptedJeroen van Riet Paap2016-01-281-1/+1
| | * no trailing slashJeroen van Riet Paap2016-01-271-1/+1
| | * no trailing slashJeroen van Riet Paap2016-01-271-1/+1
| * | block_public_blackout settingredmatrix2016-01-271-0/+4
| |/
| * lower caution level from danger to warning for ignore buttonMario Vavti2016-01-271-1/+1
| * provide an icon to make 'add privacy group' stand out from the list of groups...redmatrix2016-01-272-2/+2
| * rename collections to privacy groupsredmatrix2016-01-2616-491/+496
| * control the generation or acceptance of directory keywordsredmatrix2016-01-263-3/+12
| * bring back the ability to ignore a pending connection request without deletin...redmatrix2016-01-264-3/+8
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-268-10/+19
| |\
| | * Linking new connection notification to pending connections (see Channel 1) an...jeroenpraat2016-01-278-10/+19
| * | add abook_account to cloned abook records, was missingredmatrix2016-01-261-1/+2
| |/
| * change help text on other channel expiration setting to inform that there is ...redmatrix2016-01-262-1/+24
| * fix undefined variable reference in widget_itemredmatrix2016-01-262-7/+15
| * don't provide notification icons on manage page for delegated channelsredmatrix2016-01-242-1/+2
| * regression: channel name missing on delegate section of manage pageredmatrix2016-01-241-0/+1
| * cleanup and add comments about what we're trying to do hereredmatrix2016-01-242-3/+12
| * make exec the default for proc_run - use system.use_proc_open to use proc_ope...redmatrix2016-01-242-5/+5
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-244-3169/+3173
| |\
| | * es-es+nl string updatejeroenpraat2016-01-244-3169/+3173
| * | remote delegation issue when already logged in with different account on same...redmatrix2016-01-243-1/+7
| |/
| * update hidden_configs with proc_run_use_execredmatrix2016-01-231-0/+3
| * provide option to use exec in proc_runredmatrix2016-01-233-4/+8
| * docJeroen van Riet Paap2016-01-221-1/+1
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-223-2/+8
| |\
| | * Merge pull request #266 from anaqreon/activitystreamsredmatrix2016-01-221-0/+6
| | |\
| | | * Merge branch 'master' of https://github.com/redmatrix/hubzilla into activitys...Andrew Manning2016-01-2164-1543/+1805
| | | |\
| | | * | Added more ActivityStreams schema support to boot.php for gamesAndrew Manning2016-01-211-0/+6
| | * | | Merge pull request #267 from bashrc/bashrc/noderedmatrix2016-01-222-2/+2
| | |\ \ \
| | | * | | Change node script typesBob Mottram2016-01-222-2/+2
| | |/ / /
| * / / / provide mechanism for custom .well-known handlers and static files (e.g. for ...redmatrix2016-01-225-1294/+1320
| |/ / /
| * | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-215-0/+1
| |\ \ \ | | | |/ | | |/|
| | * | Merge pull request #265 from bashrc/bashrc/tidyingredmatrix2016-01-225-0/+1
| | |\ \
| | | * | Executable flash files ???Bob Mottram2016-01-211-0/+0
| | | * | css files should not be executableBob Mottram2016-01-212-0/+0
| | | * | README files should not be executableBob Mottram2016-01-211-0/+0
| | | * | Type of scriptBob Mottram2016-01-211-0/+1
| * | | | fix visitor photo uploadsredmatrix2016-01-211-1/+1
| * | | | add a fixmeredmatrix2016-01-211-0/+2
| |/ / /
| * | | set the actual value of the password input field to a single space on remove ...redmatrix2016-01-212-2/+2
| * | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-216-2/+22
| |\ \ \
| | * | | A few minor tweaks in schemas + link to login form in lostpassjeroenpraat2016-01-216-2/+22
| | |/ /
| * / / regression: public forums granting send stream permissions to all connectionsredmatrix2016-01-212-3/+3
| |/ /
| * | make contact block look widget alikeMario Vavti2016-01-213-11/+6
| * | css cleanupMario Vavti2016-01-212-32/+1
| * | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-01-213-14/+15
| |\ \
| * | | bootstrapify rating and connect buttons. position the connect button more pro...Mario Vavti2016-01-214-17/+20
* | | | Merge pull request #18 from redmatrix/mastermrjive2016-01-2151-2025/+2343
|\ \ \ \ | | |/ / | |/| |