aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #18 from redmatrix/mastermrjive2016-01-2151-2025/+2343
|\ | | | | updating from original codebase
| * issue #263 - account_default_channel not set to 0 when last channel of an ↵redmatrix2016-01-203-14/+15
| | | | | | | | account is removed
| * 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 ↵redmatrix2016-01-192-7/+12
| | | | | | | | which deal with the author. We should probably also make this info available to themes so they could for instance provide a visual separator.
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-181-3/+10
| |\
| | * Merge pull request #260 from HaakonME/masterredmatrix2016-01-191-3/+10
| | |\ | | | | | | | | Updated Hubzilla on OpenShift deploy script
| | | * 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 ↵Haakon Meland Eriksen2016-01-181-1/+2
| | | | | | | | | | | | | | | | channel upon account registration
| | | * Add Hubzilla Hubsites plugin to deploy script, change git for DeadSuperHero ↵Haakon Meland Eriksen2016-01-181-1/+6
| | | | | | | | | | | | | | | | Hubzilla themes
| | | * 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
| | | * | | | | | | | | | | | | | backup to external device now possible without encryption. Before thisEiner von Vielen2016-01-171-78/+133
| | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | the daily backup did allow LUKS+ext4 compatible file system only.
| * | / | | | | | | | | | | | | 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
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | generalise the site iconredmatrix2016-01-175-31/+48
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | various issues from the forumsredmatrix2016-01-1713-32/+65
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | call build_sync_packet() on pdledit updatesredmatrix2016-01-171-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | minversion issueredmatrix2016-01-172-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-161-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | move dir total ratings button to the left to prevent the connect button ↵Mario Vavti2016-01-161-2/+3
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | beeing shifted on channels with ratings
| * / | | | | | | | | | add $deliver flag to item_store() and item_store_update() [default true]. If ↵redmatrix2016-01-167-21/+18
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | false, do not send any notifications or process tag_deliver. This should avoid any network activity from happening as the result of a channel (actually item) import. Other minor fixes in the handling of the $allow_exec flag and further protecting CSS passed to widgets from rogue code and XSS.
| * | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-158-43/+43
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | minor version rollredmatrix2016-01-153-526/+571
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #17 from redmatrix/mastermrjive2016-01-1517-69/+246
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | updating from original codebase
| * | | | | | | | | | | change button order for consistencyMario Vavti2016-01-151-4/+5
| | | | | | | | | | | |
| * | | | | | | | | | | provide a recent activity link in /connectionsMario Vavti2016-01-152-3/+5
| | | | | | | | | | | |
| * | | | | | | | | | | add an approve button to /connections and get rid of the modal popup in ↵Mario Vavti2016-01-154-29/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /connedit. for quick approval (default collection and perms etc.) we now can use the approve button in /connections else click the edit button and make changes and approval from /connedit. hope thats any better...