aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Merge branch 'dev' into oauth2Andrew Manning2018-02-2422-21/+306
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add channel ID to user_id in clients table. Added TODO comments about ↵Andrew Manning2018-02-244-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynamic client registration protocol.
| * | | | | | | | | | | Merge branch 'dev' into oauth2Andrew Manning2018-02-2219-159/+162
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | The authorization step with client registration and authorization code ↵Andrew Manning2018-02-224-42/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | retrieval working. Might not conform perfectly to OAuth2 spec, but it is a start.
| * | | | | | | | | | | | Merge branch 'dev' into oauth2Andrew Manning2018-02-20219-3299/+4755
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | OAuth2TestVehicle module can create and delete oauth2 database tables.Andrew Manning2018-02-205-43/+117
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Created test vehicle module oauth2testAndrew Manning2018-02-183-0/+60
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | wrong functionzotlabs2018-03-311-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-316-5/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-306-17/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | bump versionMario Vavti2018-03-291-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | undo vcard on display module until we can make it accuratezotlabs2018-03-311-1/+2
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Hubzilla issue #1022 cleanup of post formattingzotlabs2018-03-301-1/+1
| |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Hubzilla issue #1022 - improve the usabilityzotlabs2018-03-302-5/+3
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Hubzilla issue #1022 - provide a way to share wiki pages. Currently this is ↵zotlabs2018-03-302-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only implemented in the 'edit' pane and could use some improvement/enhancement
* | | | | | | | | | | | | | | hubzilla issue #1020 - PM using unicode domain for recipient. May require ↵zotlabs2018-03-302-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | further testing
* | | | | | | | | | | | | | | allow case independence of replacements as well as patternszotlabs2018-03-302-2/+2
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | display and link issues with quoted tagszotlabs2018-03-291-6/+7
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | add directory keyword links to profilezotlabs2018-03-291-2/+13
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | directory: link entry keywords to a directory keyword searchzotlabs2018-03-291-2/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | hubzilla issue #1019 - punycode urls on connedit page when displaying locationszotlabs2018-03-293-7/+10
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | hubzilla issue #1015 - login with unicode domain namezotlabs2018-03-282-3/+5
| | | | | | | | | | | | |
* | | | | | | | | | | | | use context methodzotlabs2018-03-281-0/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | update folder timestamp on uploaded files (fixme - we need to recurse back ↵zotlabs2018-03-271-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the storage root but that is for another day)
* | | | | | | | | | | | | uexport: set content-type to json and add sections info to the default ↵zotlabs2018-03-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filename if present
* | | | | | | | | | | | | put vcard widget with author of top-level post on display pagezotlabs2018-03-273-2/+12
| | | | | | | | | | | | |
* | | | | | | | | | | | | don't include the q and PHPSESSID request variables in a redirected rpostzotlabs2018-03-271-1/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | Hard fail imports of removed channels. This is silly.zotlabs2018-03-271-0/+5
| | | | | | | | | | | | |
* | | | | | | | | | | | | IDN: force baseurl to be punycode; for consistency and federation all ↵zotlabs2018-03-251-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | internal urls are US-ASCII, unicode MAY be used for display.
* | | | | | | | | | | | | php strpos() empty needle warning when a term entry has no urlzotlabs2018-03-251-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-254-36/+45
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-241-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'newmemberwidget'zotlabs2018-03-252-13/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | testing start_menu featurezotlabs2018-03-251-2/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | turn newmember widget into a featurezotlabs2018-03-232-12/+10
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | preserve existing categories when updating an app from an embed sourcezotlabs2018-03-241-0/+6
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | app sellpage not being storedzotlabs2018-03-242-0/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | code optimisations and de-duplication on updating parent commented timestampzotlabs2018-03-242-36/+37
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-23807-19102/+37200
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| / / / / / / / / / / / / | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Update hmessages.pogoofy-bz2018-03-231-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | typofix
| * | | | | | | | | | | | | Update translations for catalan (ca/ca_ES) from transifexfadelkon2018-03-236-6966/+11194
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1009 from dawnbreak/QA_testinggit-marijus2018-03-232-15/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :construction_worker:Extend Travis, add PostgreSQL10.
| | * | | | | | | | | | | | | :construction_worker:Extend Travis, add PostgreSQL10.Klaus Weidenbach2018-03-172-15/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add PostgreSQL10 to TravisCI through Docker container. Use PHP7.2 instead of PHP7.1 as default test environment. Update to current stable MariaDB 10.2 from stable (GA) 10.1.
| * | | | | | | | | | | | | | Merge pull request #1010 from dawnbreak/devgit-marijus2018-03-23795-12112/+25965
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :arrow_up: Update libraries.
| | * | | | | | | | | | | | | | :arrow_up: Update libraries.Klaus Weidenbach2018-03-18795-12112/+25965
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | michelf/php-markdown (1.7.0 => 1.8.0) ezyang/htmlpurifier (v4.9.3 => v4.10.0) commerceguys/intl (v0.7.4 => v0.7.5) sabre/http (4.2.3 => v4.2.4) sabre/vobject (4.1.3 => 4.1.5)
| * | | | | | | | | | | | | | | an attemot to fix the PermissionRolesTestMario Vavti2018-03-231-1/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-236-17/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | new markdown lib seems to handle < and > correct. remove the workaraound.Mario Vavti2018-03-231-2/+2
| | | | | | | | | | | | | | | |