aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/hubzilla into activitys...Andrew Manning2016-01-2164-1543/+1805
|\
| * 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
| * | 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
| |\
| | * issue #263 - account_default_channel not set to 0 when last channel of an acc...redmatrix2016-01-203-14/+15
| * | bootstrapify rating and connect buttons. position the connect button more pro...Mario Vavti2016-01-214-17/+20
| |/
| * update docs - plugin listingredmatrix2016-01-191-2/+17
| * honour poco_rating_enable in item_photo_menuredmatrix2016-01-191-1/+6
| * hook changed, up the std_versionredmatrix2016-01-191-1/+1
| * Separate item_photo_menu() into links which deal with the post and those whic...redmatrix2016-01-192-7/+12
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-181-3/+10
| |\
| | * Merge pull request #260 from HaakonME/masterredmatrix2016-01-191-3/+10
| | |\
| | | * Add config workflow_channel_next and set to channelHaakon Meland Eriksen2016-01-181-0/+1
| | | * Add default_permissions_role social_private to autocreate a social private ch...Haakon Meland Eriksen2016-01-181-1/+2
| | | * Add Hubzilla Hubsites plugin to deploy script, change git for DeadSuperHero H...Haakon Meland Eriksen2016-01-181-1/+6
| | | * Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-1819-207/+317
| | | |\
| | | * \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-176-1236/+1346
| | | |\ \
| | | * \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-179-23/+21
| | | |\ \ \
| | | * \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-171-2/+3
| | | |\ \ \ \
| | | * \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-1618-594/+816
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-1439-7676/+8564
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-1116-19556/+20729
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-098-25/+51
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-077-16/+125
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-064-16/+22
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-051-0/+12
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-045-175/+204
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fixed deployHaakon Meland Eriksen2016-01-041-4/+0
| | | * | | | | | | | | | | | | Removed deploy to get from upstreamHaakon Meland Eriksen2016-01-036-16/+56
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Add Hubzilla Chess repo to deploy scriptHaakon Meland Eriksen2016-01-031-1/+1
| * | | | | | | | | | | | | | | | several clarifications on hidden_configsredmatrix2016-01-181-10/+17
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | add db_type to sample htconfigredmatrix2016-01-181-1/+1
| * | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-182-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Added a feature to hide rating buttons from a members channel and profile pages.jeroenpraat2016-01-182-2/+5
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| * / | | | | | | | | | | | | | db_type not present in international config file templates issue #259redmatrix2016-01-1812-1/+12
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-171-78/+133
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #258 from einervonvielen/backup_to_usb_without_encryptionredmatrix2016-01-181-78/+133
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | backup to external device now possible without encryption. Before thisEiner von Vielen2016-01-171-78/+133
| | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | |
| * | / | | | | | | | | | | | | doc updatesredmatrix2016-01-172-66/+71
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-176-1236/+1346
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | update es-es and nl strings. adjusted a few matrix to grid stringsjeroenpraat2016-01-176-1236/+1346
| | |/ / / / / / / / / / / /