Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'oauth2' into 'dev' | Mario | 2018-08-12 | 5 | -12/+81 |
|\ | | | | | | | | | Fixes to OAuth2 connect-with-openid. Add zothash Claim. Add zotwebbie Claim. See merge request hubzilla/core!1254 | ||||
| * | 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 See merge request hubzilla/core!1253 | ||||
| * | 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 |
|\ | |||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-08-06 | 5 | -16/+33 |
| |\ | |||||
| * | | 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 |
| |\ \ | |||||
* | | | | 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 See merge request hubzilla/core!1252 | ||||
| * | | | Add XMLreader in PHP requirements | Max Kostikov | 2018-08-03 | 1 | -3/+4 |
|/ / / | |||||
* | | | Merge branch 'fixactivityorderwithfilters' into 'master' | Mario | 2018-08-02 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GET for filtered forums See merge request hubzilla/core!1251 (cherry picked from commit 4e6539efec70027facb70233254e9b47f8e86c6d) ee1fde42 Add GET for filtered forums | ||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2018-07-31 | 5 | -16/+33 |
|\ \ \ | | | | | | | | | | | | | | | | | Update Spanish translation See merge request hubzilla/core!1249 | ||||
| * | | | 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 |
|\| | | |/ |/| | |||||
| * | Merge branch 'patch-13' into 'dev' | Mario | 2018-07-30 | 1 | -8/+13 |
| |\ | | | | | | | | | | | | | Workaround on possible error with php2po See merge request hubzilla/core!1247 | ||||
| | * | 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 |
| |/ | | | | | (cherry picked from commit 8db006d9a1b3401f79ad0458e3a2ebae64c3575c) | ||||
* | | When checking permissions ignore checking site "Block Public" settings in ↵ | zotlabs | 2018-07-30 | 5 | -12/+16 |
| | | | | | | | | cases where site permissions aren't applicable | ||||
* | | 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 See merge request hubzilla/core!1246 | ||||
| | * | 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 See merge request hubzilla/core!1245 | ||||
| | | * | 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 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Respect navbar translations See merge request hubzilla/core!1243 | ||||
| | | * | | Update nav.php | Max Kostikov | 2018-07-27 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Merge branch 'patch-8' into 'dev' | Mario | 2018-07-28 | 1 | -1/+5 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix navbar missed translations See merge request hubzilla/core!1242 | ||||
| | | * | | | 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 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Russian translation update See merge request hubzilla/core!1241 | ||||
| | | * | | | Update hstrings.php | Max Kostikov | 2018-07-26 | 1 | -9/+9 |
| | | | | | | |||||
| | | * | | | Update hmessages.po | Max Kostikov | 2018-07-26 | 1 | -9/+10 |
| | | | | | | |||||
| | | * | | | Update passchanged_eml.tpl | Max Kostikov | 2018-07-26 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Update lostpass_eml.tpl | Max Kostikov | 2018-07-26 | 1 | -1/+1 |
| | | |/ / | |||||
| | * | | | Merge branch 'patch-6' into 'dev' | Mario | 2018-07-28 | 1 | -1/+1 |
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | Fix duplicate transport displaying See merge request hubzilla/core!1240 | ||||
| | | * | | Fix duplicate transport displaying | kostikov | 2018-07-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | wrong class name | Mario Vavti | 2018-07-29 | 1 | -1/+1 |
| | | | | |