Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #21 from redmatrix/master | mrjive | 2016-02-03 | 17 | -1925/+2395 |
|\ | | | | | updating from original codebase | ||||
| * | more zcard tweaks | redmatrix | 2016-02-02 | 3 | -4/+8 |
| | | |||||
| * | some zcard cleanup - still eneds a lot more work | redmatrix | 2016-02-02 | 4 | -20/+130 |
| | | |||||
| * | Merge pull request #271 from wave72/master | Wave | 2016-02-02 | 2 | -1907/+1968 |
| |\ | | | | | | | Updated Italian strings | ||||
| | * | Updated Italian strings | Paolo Tacconi | 2016-02-02 | 2 | -1907/+1968 |
| | | | |||||
| * | | change aside width to reflect recent widget style changes | Mario Vavti | 2016-02-02 | 3 | -3/+6 |
| | | | |||||
| * | | minor tweaks | redmatrix | 2016-02-01 | 2 | -3/+6 |
| | | | |||||
| * | | slight formatting improvements | redmatrix | 2016-02-01 | 1 | -1/+1 |
| | | | |||||
| * | | adjust for folks that still have 175px profile photos | redmatrix | 2016-02-01 | 1 | -1/+1 |
| | | | |||||
| * | | missing template | redmatrix | 2016-02-01 | 1 | -0/+50 |
| | | | |||||
| * | | profile embeds (still needs a bit of work) | redmatrix | 2016-02-01 | 3 | -0/+87 |
| | | | |||||
| * | | add photos to the profile "likes this" dropdowns | redmatrix | 2016-02-01 | 4 | -6/+8 |
| | | | |||||
| * | | more oembed provider work - channel articles | redmatrix | 2016-02-01 | 5 | -4/+154 |
| | | | |||||
* | | | Merge pull request #20 from redmatrix/master | mrjive | 2016-02-01 | 25 | -2557/+2987 |
|\| | | | | | | | | updating from original codebase | ||||
| * | | oep for the photo top page | redmatrix | 2016-01-31 | 2 | -3/+68 |
| | | | |||||
| * | | add album embed (embed the most recent photo with link to album) | redmatrix | 2016-01-31 | 2 | -1/+62 |
| | | | |||||
| * | | minor changes to changelog | redmatrix | 2016-01-31 | 1 | -4/+4 |
| | | | |||||
| * | | rev update | redmatrix | 2016-01-31 | 2 | -1/+93 |
| | | | |||||
| * | | add zid1.2 | redmatrix | 2016-01-31 | 1 | -0/+4 |
| | | | |||||
| * | | add oembed provider for photos | redmatrix | 2016-01-31 | 7 | -9/+110 |
| | | | |||||
| * | | es-es+nl strings and fixing css maintained schemas | jeroenpraat | 2016-01-30 | 9 | -1990/+2040 |
| | | | |||||
| * | | one more css fix | Mario Vavti | 2016-01-30 | 1 | -1/+1 |
| | | | |||||
| * | | css fixes | Mario Vavti | 2016-01-30 | 2 | -3/+17 |
| | | | |||||
| * | | fix a slight regression | Mario Vavti | 2016-01-30 | 1 | -1/+1 |
| | | | |||||
| * | | do not make a difference if there are images or not for now | Mario Vavti | 2016-01-30 | 1 | -3/+3 |
| | | | |||||
| * | | more on collapsing | Mario Vavti | 2016-01-30 | 1 | -53/+20 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-01-30 | 3 | -530/+532 |
| |\ \ | |||||
| | * | | move permission check before global block check | redmatrix | 2016-01-29 | 3 | -530/+532 |
| | | | | |||||
| * | | | it is not perfect but it still may ease the collapsing of items above the ↵ | Mario Vavti | 2016-01-30 | 1 | -3/+47 |
| |/ / | | | | | | | | | | viewport a little... | ||||
| * | | add peer filtering to all .well-known services | redmatrix | 2016-01-28 | 2 | -1/+18 |
| | | | |||||
| * | | widget_item - provide ability to use the page title instead of the ↵ | redmatrix | 2016-01-28 | 3 | -8/+21 |
| | | | | | | | | | | | | message_id to locate the desired item. You can use either, but the page title is often easier to use and discover. | ||||
* | | | Merge pull request #19 from redmatrix/master | mrjive | 2016-01-28 | 71 | -4968/+5082 |
|\| | | | | | | | | updating from original codebase | ||||
| * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-27 | 3 | -3/+3 |
| |\ \ | |||||
| | * | | remark in the private notes encrypted | Jeroen van Riet Paap | 2016-01-28 | 1 | -1/+1 |
| | | | | | | | | | | | | Notes are not encrypted and are readable in the database by the admin. Made a remark about that. Probably this needs to be fixed, but till than, it's better to warn people. | ||||
| | * | | no trailing slash | Jeroen van Riet Paap | 2016-01-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | no trailing slash | Jeroen van Riet Paap | 2016-01-27 | 1 | -1/+1 |
| | | | | | | | | | | | | it will break your system | ||||
| * | | | block_public_blackout setting | redmatrix | 2016-01-27 | 1 | -0/+4 |
| |/ / | |||||
| * | | lower caution level from danger to warning for ignore button | Mario Vavti | 2016-01-27 | 1 | -1/+1 |
| | | | |||||
| * | | provide an icon to make 'add privacy group' stand out from the list of ↵ | redmatrix | 2016-01-27 | 2 | -2/+2 |
| | | | | | | | | | | | | groups. Please revert if you think it's too messy. | ||||
| * | | rename collections to privacy groups | redmatrix | 2016-01-26 | 16 | -491/+496 |
| | | | |||||
| * | | control the generation or acceptance of directory keywords | redmatrix | 2016-01-26 | 3 | -3/+12 |
| | | | |||||
| * | | bring back the ability to ignore a pending connection request without ↵ | redmatrix | 2016-01-26 | 4 | -3/+8 |
| | | | | | | | | | | | | deleting it and without always having it in your face and without jumping through hoops. | ||||
| * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-26 | 8 | -10/+19 |
| |\ \ | |||||
| | * | | Linking new connection notification to pending connections (see Channel 1) ↵ | jeroenpraat | 2016-01-27 | 8 | -10/+19 |
| | | | | | | | | | | | | | | | | and improved email notifications about new connections. Could not find a way to do this also for the generic notifications. Added hub domain of channel address on the new channel page. A few people on my hub didn't understood. This example will make it more clear. Some minor bits. | ||||
| * | | | add abook_account to cloned abook records, was missing | redmatrix | 2016-01-26 | 1 | -1/+2 |
| |/ / | |||||
| * | | change help text on other channel expiration setting to inform that there is ↵ | redmatrix | 2016-01-26 | 2 | -1/+24 |
| | | | | | | | | | | | | a system limit. Ignore imported feed content that is older than expiration interval. | ||||
| * | | fix undefined variable reference in widget_item | redmatrix | 2016-01-26 | 2 | -7/+15 |
| | | | |||||
| * | | don't provide notification icons on manage page for delegated channels | redmatrix | 2016-01-24 | 2 | -1/+2 |
| | | | |||||
| * | | regression: channel name missing on delegate section of manage page | redmatrix | 2016-01-24 | 1 | -0/+1 |
| | | | |||||
| * | | cleanup and add comments about what we're trying to do here | redmatrix | 2016-01-24 | 2 | -3/+12 |
| | | |