Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-08-12 | 11 | -28/+160 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-12 | 3 | -2/+18 |
| |\ | |||||
| * \ | Merge branch 'oauth2-ui-pr' into 'dev' | Mario | 2018-08-12 | 2 | -9/+33 |
| |\ \ | |||||
| | * | | OAuth2 UI and settings updates | M.Dent | 2018-08-10 | 2 | -7/+30 |
| | * | | Add user_id = local_channel() to the where clause of updates | M.Dent | 2018-08-10 | 1 | -2/+3 |
| * | | | Merge branch 'oauth2' into 'dev' | Mario | 2018-08-12 | 5 | -12/+81 |
| |\ \ \ | |||||
| | * | | | Fixes to OAuth2 connect-with-openid. Add zothash Claim. Add zotwebbie Claim. | M.Dent | 2018-08-10 | 5 | -12/+81 |
| * | | | | Merge branch 'patch-16' into 'dev' | Mario | 2018-08-12 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Add translation for missed string | Max Kostikov | 2018-08-10 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | revert debug comment from the last commit | Mario Vavti | 2018-08-09 | 1 | -1/+1 |
| * | | | fix zid leaking to nonzot sites if markdown is enabled | Mario Vavti | 2018-08-09 | 1 | -3/+41 |
| * | | | search form action for channel search needs the channel address | Mario Vavti | 2018-08-09 | 1 | -1/+1 |
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-09 | 23 | -1718/+8237 |
| |\ \ \ | |||||
| * | | | | update install.txt | Mario Vavti | 2018-08-08 | 1 | -1/+1 |
| * | | | | Merge branch 'patch-15' into 'dev' | Mario | 2018-08-08 | 1 | -3/+4 |
| |\ \ \ \ | |||||
| | * | | | | Add XMLreader in PHP requirements | Max Kostikov | 2018-08-03 | 1 | -3/+4 |
| |/ / / / | |||||
* | | | / | make channel_remove less memory hungry | zotlabs | 2018-08-12 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | prevent json-ld bombing, turn off browser autocomplete on channel sources cre... | zotlabs | 2018-08-11 | 3 | -2/+18 |
| |/ / |/| | | |||||
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-08-06 | 5 | -16/+33 |
|\| | | |||||
| * | | Merge branch 'fixactivityorderwithfilters' into 'master' | Mario | 2018-08-02 | 1 | -0/+3 |
| * | | Merge branch 'dev' into 'dev' | Mario | 2018-07-31 | 5 | -16/+33 |
| |\ \ | |||||
| | * | | Update Spanish translation | Manuel Jiménez Friaza | 2018-07-30 | 5 | -16/+33 |
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-07-31 | 2 | -9/+14 |
| |\| | | |||||
* | | | | bring some Zot6 libraries and interfaces to red/hubzilla | zotlabs | 2018-08-06 | 13 | -0/+7764 |
* | | | | create alter_pdl hook | zotlabs | 2018-08-05 | 1 | -2/+10 |
* | | | | ability for addons to create .pdl files and load them automatically | zotlabs | 2018-08-04 | 1 | -0/+2 |
* | | | | add app_options field | zotlabs | 2018-08-02 | 7 | -12/+38 |
* | | | | update certs | zotlabs | 2018-08-01 | 2 | -1704/+422 |
* | | | | hubzilla core issue #1258 | zotlabs | 2018-08-01 | 1 | -0/+4 |
* | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-07-30 | 2 | -9/+14 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Merge branch 'patch-13' into 'dev' | Mario | 2018-07-30 | 1 | -8/+13 |
| |\ \ | |||||
| | * | | Workaround on possible error | Max Kostikov | 2018-07-29 | 1 | -5/+6 |
| | * | | Update php2po.php | Max Kostikov | 2018-07-29 | 1 | -2/+3 |
| | * | | Workaround on possible error | Max Kostikov | 2018-07-29 | 1 | -2/+5 |
| * | | | Update network.php | gia vec | 2018-07-30 | 1 | -1/+1 |
| |/ / | |||||
* | | | When checking permissions ignore checking site "Block Public" settings in cas... | zotlabs | 2018-07-30 | 5 | -12/+16 |
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-07-29 | 9 | -85/+99 |
|\| | | |||||
| * | | fix sql empty query error in db update 1216 | Mario Vavti | 2018-07-29 | 1 | -1/+1 |
| * | | Merge branch 'patch-12' into 'dev' | Mario | 2018-07-29 | 1 | -9/+15 |
| |\ \ | |||||
| | * | | Process msgctxt plurals | Max Kostikov | 2018-07-29 | 1 | -9/+15 |
| * | | | version | Mario Vavti | 2018-07-29 | 1 | -1/+1 |
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-07-29 | 8 | -84/+92 |
| |\| | | |||||
| | * | | Merge branch 'patch-11' into 'dev' | Mario | 2018-07-28 | 1 | -59/+62 |
| | |\ \ | |||||
| | | * | | Plural form strings export added | Max Kostikov | 2018-07-28 | 1 | -59/+62 |
| | * | | | Merge branch 'patch-9' into 'dev' | Mario | 2018-07-28 | 1 | -3/+3 |
| | |\ \ \ | |||||
| | | * | | | Update nav.php | Max Kostikov | 2018-07-27 | 1 | -3/+3 |
| | * | | | | Merge branch 'patch-8' into 'dev' | Mario | 2018-07-28 | 1 | -1/+5 |
| | |\ \ \ \ | |||||
| | | * | | | | Update Apps.php | Max Kostikov | 2018-07-27 | 1 | -3/+4 |
| | | * | | | | Update Apps.php | Max Kostikov | 2018-07-27 | 1 | -1/+4 |
| | | |/ / / | |||||
| | * | | | | Merge branch 'patch-7' into 'dev' | Mario | 2018-07-28 | 4 | -20/+21 |
| | |\ \ \ \ |