Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | | | | | | | 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. Before this | Einer von Vielen | 2016-01-17 | 1 | -78/+133 | |
| | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | ||||||
| * | / | | | | | | | | | | | | | | 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 beein... | Mario Vavti | 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 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-15 | 8 | -43/+43 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | minor version roll | redmatrix | 2016-01-15 | 3 | -526/+571 | |
* | | | | | | | | | | | | | Merge pull request #17 from redmatrix/master | mrjive | 2016-01-15 | 17 | -69/+246 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | 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 /conn... | Mario Vavti | 2016-01-15 | 4 | -29/+11 | |
| * | | | | | | | | | | | | 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 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | 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 back... | Mario Vavti | 2016-01-15 | 1 | -0/+3 | |
| * | | | | | | | | | | | since the perms will be reset on approval better do not provide the perms too... | Mario Vavti | 2016-01-14 | 1 | -0/+2 | |
| * | | | | | | | | | | | 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.), publi... | Mario Vavti | 2016-01-14 | 5 | -7/+61 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #16 from redmatrix/master | mrjive | 2016-01-14 | 8 | -204/+92 | |
|\| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | 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 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #15 from redmatrix/master | mrjive | 2016-01-14 | 29 | -55/+1043 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ |