aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-244-4/+11
|\
| * update hidden_configs with proc_run_use_execredmatrix2016-01-231-0/+3
| * provide option to use exec in proc_runredmatrix2016-01-233-4/+8
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-229-1297/+1329
|\|
| * 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 remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-2217-8/+31
|\| | |
| * | | 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
| |/ /
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-2112-83/+76
|\| |
| * | 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
* | | Added auto_channel_create to config to ease registrationHaakon Meland Eriksen2016-01-191-0/+1
|/ /
* | 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
| | |\ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 18:30:54 +0000