| Commit message (Expand) | Author | Age | Files | Lines |
* | :arrow_up: Update bshaffer/oauth2-server-php library. | Klaus Weidenbach | 2017-03-20 | 128 | -6/+15850 |
* | fix php warning and remove logging | Mario Vavti | 2017-03-19 | 1 | -4/+2 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-18 | 1 | -2/+1 |
|\ |
|
| * | Merge pull request #698 from dawnbreak/dev | Klaus | 2017-03-18 | 1 | -2/+1 |
| |\ |
|
| | * | Missed one old Markdown() | Klaus | 2017-03-18 | 1 | -2/+1 |
| |/ |
|
* | | issue #699 | zotlabs | 2017-03-18 | 49 | -1651/+0 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-15 | 15 | -234/+758 |
|\| |
|
| * | Merge pull request #569 from dawnbreak/QA_testing | zotlabs | 2017-03-16 | 15 | -234/+758 |
| |\ |
|
| | * | :construction_worker: Add Travis' GitHub deployment steps. | Klaus Weidenbach | 2017-03-14 | 2 | -50/+27 |
| | * | :construction_worker: :arrow_up: :heavy_plus_sign: Update PHPUnit to current ... | Klaus Weidenbach | 2017-03-14 | 8 | -224/+372 |
| | * | :construction_worker: Add old MySQL 5.5 to Travis CI again. | Klaus Weidenbach | 2017-03-14 | 3 | -4/+13 |
| | * | :construction_worker: use PHP7.1 and add PostgreSQL9.6 | Klaus Weidenbach | 2017-03-14 | 3 | -28/+39 |
| | * | :green_heart: Update Travis CI's Doxygen. | Klaus Weidenbach | 2017-03-14 | 3 | -14/+42 |
| | * | [FEATURE] :construction_worker: Extend Travis CI integration. | Klaus Weidenbach | 2017-03-14 | 10 | -27/+378 |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-15 | 2 | -18/+6 |
|\| | |
|
| * | | better handling of mimetype security | Mario Vavti | 2017-03-15 | 2 | -18/+6 |
| |/ |
|
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-13 | 2 | -2/+2 |
|\| |
|
| * | Merge pull request #697 from anaqreon/dev | git-marijus | 2017-03-13 | 1 | -1/+1 |
| |\ |
|
| | * | Add id to app-menu for JS access | Andrew Manning | 2017-03-12 | 1 | -1/+1 |
| * | | we need to have this even if we are not the owner. otherwise we loose the acl... | Mario Vavti | 2017-03-13 | 1 | -1/+1 |
| |/ |
|
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-11 | 2 | -2/+26 |
|\| |
|
| * | Login-box css-fix for Bluegrid scheme | jeroenpraat | 2017-03-11 | 1 | -1/+25 |
| * | Merge pull request #693 from anaqreon/dev | git-marijus | 2017-03-11 | 1 | -1/+1 |
| |\ |
|
| | * | Take me home instead of get me home | Andrew Manning | 2017-03-09 | 1 | -1/+1 |
| |/ |
|
* | | strings | zotlabs | 2017-03-10 | 1 | -3838/+3824 |
* | | Monday is a proper name and should be capitalised (except in private conversa... | zotlabs | 2017-03-08 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-03-07 | 3 | -10/+10 |
|\ |
|
| * | allow post_activity_item to be passed an empty ACL without resetting to chann... | zotlabs | 2017-03-06 | 1 | -1/+2 |
| * | add public_policy to the nwiki container also. This should not affect the rec... | zotlabs | 2017-03-06 | 1 | -0/+2 |
| * | correct fix for wiki anonymous read issue (items_permissions_sql checks item.... | zotlabs | 2017-03-06 | 2 | -9/+6 |
* | | Big 2.2 string update Dutch | jeroenpraat | 2017-03-07 | 2 | -6864/+7305 |
|/ |
|
* | allow unauthenticated access to public wiki pages | Mario Vavti | 2017-03-06 | 1 | -2/+10 |
* | do not collapse long nsfw content | Mario Vavti | 2017-03-06 | 1 | -1/+1 |
* | remove include/probe.php which has never completed development and has never ... | zotlabs | 2017-03-05 | 4 | -106/+1 |
* | move emoji emoticons (not reactions) to plugin | zotlabs | 2017-03-05 | 1824 | -18/+2 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-05 | 22 | -4756/+5247 |
|\ |
|
| * | Merge pull request #689 from mjfriaza/dev | zotlabs | 2017-03-05 | 2 | -2329/+2378 |
| |\ |
|
| | * | Translated the last strings into Spanish version | Manuel Jiménez Friaza | 2017-03-05 | 2 | -2329/+2378 |
| * | | Merge pull request #688 from dawnbreak/markdown | zotlabs | 2017-03-05 | 20 | -2427/+2869 |
| |\ \ |
|
| | * | | :arrow_up: :hammer: Upgrade Markdownify library. | Klaus Weidenbach | 2017-03-05 | 20 | -2427/+2869 |
| |/ / |
|
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-04 | 2 | -1/+2 |
|\| | |
|
| * | | update changelog | Mario Vavti | 2017-03-04 | 1 | -0/+1 |
| * | | we need item edited for wiki page history, not item created | Mario Vavti | 2017-03-04 | 1 | -1/+1 |
* | | | minor feed issue | zotlabs | 2017-03-04 | 1 | -0/+8 |
|/ / |
|
* | | string update | zotlabs | 2017-03-03 | 1 | -887/+910 |
* | | fix badge position for narrow navbar | Mario Vavti | 2017-03-03 | 1 | -4/+0 |
* | | reverse sort order | zotlabs | 2017-03-02 | 1 | -1/+1 |
* | | activity widget - turns out the owner is not relevant. | zotlabs | 2017-03-02 | 1 | -9/+5 |
* | | document the activity widget | zotlabs | 2017-03-02 | 1 | -0/+1 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-02 | 9 | -28/+23 |
|\ \ |
|