Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #125 from wave72/master | Wave | 2015-11-04 | 2 | -638/+678 |
|\ | | | | | Updated Italian strings | ||||
| * | Updated Italian strings | Paolo Tacconi | 2015-11-04 | 2 | -638/+678 |
| | | |||||
* | | Merge pull request #122 from kenrestivo/add-hook-docs | redmatrix | 2015-11-04 | 9 | -1/+382 |
|\ \ | | | | | | | Commit the tool used to generate the hooks docs. | ||||
| * | | Put generated date at end of data. | ken restivo | 2015-11-03 | 2 | -3/+3 |
| | | | |||||
| * | | Commit the tool used to generate the hooks docs. | ken restivo | 2015-11-03 | 9 | -1/+382 |
| | | | |||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-11-03 | 0 | -0/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: include/zot.php mod/post.php | ||||
| * | | | protocol upgrade | redmatrix | 2015-11-03 | 2 | -37/+58 |
| | | | | |||||
* | | | | Merge pull request #121 from kenrestivo/add-hook-docs | redmatrix | 2015-11-04 | 3 | -136/+2 |
|\ \ \ \ | | |/ / | |/| | | Add generated docs for hooks. | ||||
| * | | | Add generated docs for hooks. Link them into the developer docs so they can ↵ | ken restivo | 2015-11-03 | 3 | -136/+2 |
| | | | | | | | | | | | | | | | | be found more easily. | ||||
* | | | | Merge pull request #120 from kenrestivo/document-argv | redmatrix | 2015-11-04 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | Add documentation for argv/argc. | ||||
| * | | | | Add documentation for argv/argc. | ken restivo | 2015-11-03 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge pull request #119 from sasiflo/master | redmatrix | 2015-11-04 | 5 | -20/+20 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Some small rebranding for Hubzilla transition from Red Matrix | ||||
| * | | | | Merge branch 'rebranding' | sasiflo | 2015-11-03 | 5 | -20/+20 |
| |\ \ \ \ | |||||
| | * | | | | Some small rebranding for Hubzilla transition from Red Matrix | sasiflo | 2015-11-03 | 5 | -20/+20 |
| | | | | | | |||||
* | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-11-03 | 7 | -393/+409 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/photo/photo_driver.php include/text.php mod/post.php | ||||
| * | | | | | backport small bits of the re-install fix; at least the damaging bits | redmatrix | 2015-11-03 | 1 | -6/+6 |
| | | | | | | |||||
| * | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-11-03 | 5 | -9/+28 |
| |\ \ \ \ \ | |||||
| | * | | | | | Update nl+es | jeroenpraat | 2015-10-31 | 4 | -4/+14 |
| | | | | | | | |||||
| | * | | | | | move it up | Mario Vavti | 2015-10-29 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | possibly better fix for profile photo image type issue | Mario Vavti | 2015-10-29 | 1 | -5/+14 |
| | | | | | | | |||||
| * | | | | | | version | redmatrix | 2015-11-03 | 2 | -390/+389 |
| |/ / / / / | |||||
| * | | | | | re-enable pathinfo() check and try with getimagesize() if we have not got a ↵ | Mario Vavti | 2015-10-28 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | result | ||||
| * | | | | | pathinfo() does not work in this case. getimagesize() seems more reliabel. ↵ | Mario Vavti | 2015-10-28 | 2 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | this fixes transparent png avatars having a black background. | ||||
| * | | | | | do not treat profile photo change posts like photo-items | Mario Vavti | 2015-10-28 | 1 | -2/+6 |
| | | | | | | |||||
| * | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-25 | 2 | -1/+10 |
| |\ \ \ \ \ | |||||
| | * | | | | | hubzilla compatibility: improve photo item object - we now provide the infos ↵ | Mario Vavti | 2015-10-25 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | for all available photo sizes | ||||
| | * | | | | | photo object compatibility revamped | Mario Vavti | 2015-10-22 | 3 | -20/+9 |
| | | | | | | | |||||
| | * | | | | | hubzilla photo object compatibility | Mario Vavti | 2015-10-20 | 2 | -1/+20 |
| | | | | | | | |||||
| * | | | | | | version and strings | redmatrix | 2015-10-25 | 2 | -3/+7 |
| |/ / / / / | |||||
* | | | | | | better re-install detection/protection. This necessitated a slight protocol ↵ | redmatrix | 2015-11-03 | 2 | -24/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | change but should not introduce any compatibility issues with older software. Things just work better if you use an up-to-date server. | ||||
* | | | | | | need better peer verification due to re-install issue, this is temporary | redmatrix | 2015-11-03 | 3 | -34/+45 |
| | | | | | | |||||
* | | | | | | provide admin setting to change directory server | redmatrix | 2015-11-03 | 3 | -4/+32 |
| | | | | | | |||||
* | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-03 | 9 | -26/+38 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Time for using my real name | jeroenpraat | 2015-11-03 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | small update Ducth strings + fix dark schema | jeroenpraat | 2015-11-03 | 3 | -21/+33 |
| | |/ / / | |/| | | | |||||
| * | | | | timeago() works best with iso format. fix #118 | Mario Vavti | 2015-11-03 | 5 | -4/+4 |
| | |/ / | |/| | | |||||
* / | | | implement unfollow thread | redmatrix | 2015-11-03 | 5 | -99/+41 |
|/ / / | |||||
* | | | bug in hub/location sync | redmatrix | 2015-11-02 | 1 | -4/+3 |
| | | | |||||
* | | | readability | redmatrix | 2015-11-02 | 1 | -4/+4 |
| | | | |||||
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-02 | 1 | -0/+5 |
|\ \ \ | |||||
| * \ \ | Merge pull request #116 from HaakonME/master | redmatrix | 2015-11-03 | 1 | -0/+5 |
| |\ \ \ | | | | | | | | | | | Changed default config for Hubzilla on Openshift | ||||
| | * | | | Changed default config to util/config system expire_delivery_reports 3 ↵ | Haakon Meland Eriksen | 2015-11-02 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | util/config system feed_contacts 0 util/config system diaspora_enabled 0 util/config system disable_discover_tab 1 util/config system directory_server https://blablanet.com util/config directory safemode 0 util/config directory globaldir 1 util/config directory pubforums 0 | ||||
| | * | | | Added new directory server https://blablanet.com | Haakon Meland Eriksen | 2015-11-02 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Added new directory server https://blablanet.com | Haakon Meland Eriksen | 2015-11-02 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | several more hidden configs | redmatrix | 2015-11-02 | 1 | -1/+31 |
|/ / / / | |||||
* | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-02 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #117 from kenrestivo/add-rss-docs | redmatrix | 2015-11-03 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | Update RSS setting docs. | ||||
| | * | | | Update RSS setting docs. | ken restivo | 2015-11-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | revert filtering by metwork | Mario Vavti | 2015-11-02 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | directory doco | redmatrix | 2015-11-02 | 3 | -1/+97 |
|/ / / / |