| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-18 | 19 | -207/+317 | |
| | | |\ \ | ||||||
| | | * \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-17 | 6 | -1236/+1346 | |
| | | |\ \ \ | ||||||
| | | * \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-17 | 9 | -23/+21 | |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | ||||||
| | | * | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-17 | 1 | -2/+3 | |
| | | |\ \ \ \ | ||||||
| | | * \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-16 | 18 | -594/+816 | |
| | | |\ \ \ \ \ | ||||||
| | | * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-14 | 39 | -7676/+8564 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-11 | 16 | -19556/+20729 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-09 | 8 | -25/+51 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-07 | 7 | -16/+125 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-06 | 4 | -16/+22 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-05 | 1 | -0/+12 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-04 | 5 | -175/+204 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | Fixed deploy | Haakon Meland Eriksen | 2016-01-04 | 1 | -4/+0 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Removed deploy to get from upstream | Haakon Meland Eriksen | 2016-01-03 | 6 | -16/+56 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | Add Hubzilla Chess repo to deploy script | Haakon Meland Eriksen | 2016-01-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | several clarifications on hidden_configs | redmatrix | 2016-01-18 | 1 | -10/+17 | |
| |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | add db_type to sample htconfig | redmatrix | 2016-01-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-18 | 2 | -2/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Added a feature to hide rating buttons from a members channel and profile pages. | jeroenpraat | 2016-01-18 | 2 | -2/+5 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | ||||||
| * / | | | | | | | | | | | | | | db_type not present in international config file templates issue #259 | redmatrix | 2016-01-18 | 12 | -1/+12 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-17 | 1 | -78/+133 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #258 from einervonvielen/backup_to_usb_without_encryption | redmatrix | 2016-01-18 | 1 | -78/+133 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backup to external device now possible without encryption | |||||
| | | * | | | | | | | | | | | | | | backup to external device now possible without encryption. Before this | Einer von Vielen | 2016-01-17 | 1 | -78/+133 | |
| | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | the daily backup did allow LUKS+ext4 compatible file system only. | |||||
| * | / | | | | | | | | | | | | | doc updates | redmatrix | 2016-01-17 | 2 | -66/+71 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-17 | 6 | -1236/+1346 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | update es-es and nl strings. adjusted a few matrix to grid strings | jeroenpraat | 2016-01-17 | 6 | -1236/+1346 | |
| | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | generalise the site icon | redmatrix | 2016-01-17 | 5 | -31/+48 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | various issues from the forums | redmatrix | 2016-01-17 | 13 | -32/+65 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | call build_sync_packet() on pdledit updates | redmatrix | 2016-01-17 | 1 | -0/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | minversion issue | redmatrix | 2016-01-17 | 2 | -3/+3 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-16 | 1 | -2/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | move dir total ratings button to the left to prevent the connect button ↵ | Mario Vavti | 2016-01-16 | 1 | -2/+3 | |
| | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | beeing shifted on channels with ratings | |||||
| * / | | | | | | | | | | add $deliver flag to item_store() and item_store_update() [default true]. If ↵ | redmatrix | 2016-01-16 | 7 | -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_merge | redmatrix | 2016-01-15 | 8 | -43/+43 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | change button order for consistency | Mario Vavti | 2016-01-15 | 1 | -4/+5 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | provide a recent activity link in /connections | Mario Vavti | 2016-01-15 | 2 | -3/+5 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | add an approve button to /connections and get rid of the modal popup in ↵ | Mario Vavti | 2016-01-15 | 4 | -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... | |||||
| | * | | | | | | | | | | provide more contact infos and update some protocol type definitions | Mario Vavti | 2016-01-15 | 4 | -6/+19 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Use ctrl-d for multi-line messages. | ken restivo | 2016-01-14 | 1 | -3/+5 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | minor version roll | redmatrix | 2016-01-15 | 3 | -526/+571 | |
| |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | issue with plugin loadable layouts | redmatrix | 2016-01-14 | 3 | -4/+20 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | update widget docs with widget_cover_photo | redmatrix | 2016-01-14 | 1 | -0/+7 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | cover photo fetch and widget | redmatrix | 2016-01-14 | 3 | -0/+82 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | more cover photo work | redmatrix | 2016-01-14 | 1 | -22/+35 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | this might be controversal - if approving a connection from the popup go ↵ | Mario Vavti | 2016-01-15 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | back to connections page. if the popup is dismissed and the connection is approved from the page stay on /connedit page to be able to adjust perms etc... | |||||
| * | | | | | | | | | | since the perms will be reset on approval better do not provide the perms ↵ | Mario Vavti | 2016-01-14 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tool before we approved a connection | |||||
| * | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-01-14 | 2 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-14 | 8 | -204/+92 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | | revision update | redmatrix | 2016-01-14 | 2 | -3/+3 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | provide some info about our contacts - status (archived, hidden, etc.), ↵ | Mario Vavti | 2016-01-14 | 5 | -7/+61 | |
| | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | public forum (like in directory) and show since when we are connected | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |