| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add Hubzilla Hubsites plugin to deploy script, change git for DeadSuperHero ↵ | Haakon Meland Eriksen | 2016-01-18 | 1 | -1/+6 |
| | | | | | Hubzilla themes | ||||
| * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-18 | 19 | -207/+317 |
| |\ | |||||
| | * | 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 |
| | |\ \ | |||||
| | * | | | generalise the site icon | redmatrix | 2016-01-17 | 5 | -31/+48 |
| | | | | | |||||
| | * | | | various issues from the forums | redmatrix | 2016-01-17 | 13 | -32/+65 |
| | | |/ | |/| | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 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 |
| | |/ | |||||
| * | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-17 | 9 | -23/+21 |
| |\| | |||||
| | * | 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 |
| | |\ | |||||
| | * | | 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 remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-17 | 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 | ||||
| * | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-16 | 18 | -594/+816 |
| |\| | |||||
| | * | 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 | ||||
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-14 | 39 | -7676/+8564 |
| |\| | | |||||
| | * | | bring back opacity for archived contacts | Mario Vavti | 2016-01-14 | 1 | -0/+5 |
| | | | | |||||
| | * | | some work on connections | Mario Vavti | 2016-01-14 | 5 | -190/+79 |
| | | | | |||||
| | * | | some template work on follow widget | Mario Vavti | 2016-01-14 | 4 | -17/+11 |
| | |/ | |||||
| | * | more progress on cover photo cropping and storage | redmatrix | 2016-01-13 | 2 | -4/+395 |
| | | | |||||
| | * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-13 | 1 | -1/+1 |
| | |\ | |||||
| | | * | fix sharing of photo items | Mario Vavti | 2016-01-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | some initial work on uploading and cropping cover photos | redmatrix | 2016-01-13 | 6 | -2/+121 |
| | |/ | |||||
| | * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-13 | 1 | -1/+1 |
| | |\ | |||||
| | | * | 20em is to big for mobile use | Mario Vavti | 2016-01-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | more work on auto channel creation during register | redmatrix | 2016-01-13 | 4 | -1/+116 |
| | |/ | |||||
| | * | very small tweaks to CLI plugin manager utility | redmatrix | 2016-01-13 | 2 | -6/+8 |
| | | | |||||
| | * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-12 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Correct docs. | ken restivo | 2016-01-12 | 1 | -2/+2 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |