Commit Graph

14994 Commits

Author SHA1 Message Date
redmatrix 42c0f83ec5 typo 2015-11-04 18:21:36 -08:00
redmatrix 5dfaeaf526 add bookmarking to FF social api provider 2015-11-04 18:15:03 -08:00
redmatrix 1214469311 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-04 17:48:21 -08:00
redmatrix f4a9529968 Firefox Share API provider interface (first cut, only has share ability) 2015-11-04 17:47:24 -08:00
redmatrix 3d55134953 Merge pull request #124 from kenrestivo/add-app-example2
Add app example
2015-11-05 10:15:33 +11:00
jeroenpraat 1c0fe89368 Chat page improved (I think). Works now better with diff. resolutions, font sizes and languages. Fixed follow field on conn. page. Small schemas updates. 2015-11-04 22:52:40 +01:00
Wave 9398e49eb7 Merge pull request #125 from wave72/master
Updated Italian strings
2015-11-04 15:04:20 +01:00
Paolo Tacconi 50cf095c00 Updated Italian strings 2015-11-04 14:58:52 +01:00
ken restivo 5d64fb5946 Clarify format. 2015-11-04 00:39:48 -08:00
ken restivo bf55a8e98c Add app object detailed example. 2015-11-04 00:39:24 -08:00
redmatrix 59e0a0fd7c Merge pull request #122 from kenrestivo/add-hook-docs
Commit the tool used to generate the hooks docs.
2015-11-04 19:14:32 +11:00
redmatrix d15be53034 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/zot.php
	mod/post.php
2015-11-03 23:56:15 -08:00
redmatrix b6b2420ff7 protocol upgrade 2015-11-03 23:54:53 -08:00
ken restivo 4bd0e083d1 Put generated date at end of data. 2015-11-03 21:19:16 -08:00
ken restivo d9c7b39b88 Commit the tool used to generate the hooks docs. 2015-11-03 21:15:49 -08:00
redmatrix 583f7df9c8 Merge pull request #121 from kenrestivo/add-hook-docs
Add generated docs for hooks.
2015-11-04 16:00:57 +11:00
redmatrix 8377aa72a8 Merge pull request #120 from kenrestivo/document-argv
Add documentation for argv/argc.
2015-11-04 16:00:44 +11:00
redmatrix c57926d799 Merge pull request #119 from sasiflo/master
Some small rebranding for Hubzilla transition from Red Matrix
2015-11-04 16:00:32 +11:00
ken restivo 380e3e64cb Add generated docs for hooks. Link them into the developer docs so they can be found more easily. 2015-11-03 20:57:07 -08:00
redmatrix 77a03e376c Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/photo/photo_driver.php
	include/text.php
	mod/post.php
2015-11-03 20:46:47 -08:00
redmatrix 5dade2b608 backport small bits of the re-install fix; at least the damaging bits 2015-11-03 20:40:43 -08:00
redmatrix 877b3361c8 better re-install detection/protection. This necessitated a slight protocol change but should not introduce any compatibility issues with older software. Things just work better if you use an up-to-date server. 2015-11-03 20:28:56 -08:00
redmatrix 2fbfc2a8f1 need better peer verification due to re-install issue, this is temporary 2015-11-03 19:50:40 -08:00
redmatrix e09b49288f provide admin setting to change directory server 2015-11-03 18:34:16 -08:00
redmatrix 6aa98a1e91 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-11-03 17:40:31 -08:00
redmatrix 14b74069f8 version 2015-11-03 17:40:05 -08:00
redmatrix c1cfcc78fe Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-03 14:59:43 -08:00
redmatrix 2c299a9f37 implement unfollow thread 2015-11-03 14:59:14 -08:00
ken restivo 288697cda2 Add documentation for argv/argc. 2015-11-03 12:24:29 -08:00
jeroenpraat 9fa771f9fe Time for using my real name 2015-11-03 21:24:28 +01:00
jeroenpraat d1aa672388 small update Ducth strings + fix dark schema 2015-11-03 21:19:23 +01:00
sasiflo b21f6fd619 Merge branch 'rebranding' 2015-11-03 11:35:44 +01:00
sasiflo 39245238fd Some small rebranding for Hubzilla transition from Red Matrix 2015-11-03 11:31:19 +01:00
Mario Vavti 43d8090182 timeago() works best with iso format. fix #118 2015-11-03 11:19:22 +01:00
redmatrix d13dae6b06 bug in hub/location sync 2015-11-02 21:02:30 -08:00
redmatrix 0998ef0c4e readability 2015-11-02 17:10:47 -08:00
redmatrix 543bf51eff Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-02 17:07:58 -08:00
redmatrix 5513feb15b several more hidden configs 2015-11-02 17:07:40 -08:00
redmatrix e03faaeb8f Merge pull request #116 from HaakonME/master
Changed default config for Hubzilla on Openshift
2015-11-03 09:47:15 +11:00
redmatrix 966dd03195 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-02 14:46:24 -08:00
redmatrix 5041774fd3 directory doco 2015-11-02 14:46:02 -08:00
redmatrix c5453d476d Merge pull request #117 from kenrestivo/add-rss-docs
Update RSS setting docs.
2015-11-03 09:45:33 +11:00
ken restivo 54eae7830e Update RSS setting docs. 2015-11-02 12:52:23 -08:00
Haakon Meland Eriksen 4e74c7e3b1 Changed default config to util/config system expire_delivery_reports 3 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 2015-11-02 19:57:49 +01:00
Haakon Meland Eriksen fe52400b75 Added new directory server https://blablanet.com 2015-11-02 19:40:34 +01:00
Haakon Meland Eriksen 18feef0753 Added new directory server https://blablanet.com 2015-11-02 18:53:40 +01:00
Mario Vavti 6ec021aafa revert filtering by metwork 2015-11-02 08:36:43 +01:00
redmatrix 954957bd8a provide discovery for local deletes in zot-finger and mark the hublocs invalid/deleted 2015-11-01 19:07:32 -08:00
redmatrix 14e92f53f1 hubloc filtering to eliminate dead and deleted entries 2015-11-01 16:19:28 -08:00
redmatrix d3183467e0 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-01 15:52:35 -08:00