Commit graph

14818 commits

Author SHA1 Message Date
redmatrix
54059b2f15 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-10-19 20:36:22 -07:00
redmatrix
f00887ea42 add project info to pubsite list 2015-10-19 20:35:44 -07:00
redmatrix
08a5884c9f revert - we can't guarantee what project name the fallback directory server has and this could cause bugs later 2015-10-19 17:03:34 -07:00
redmatrix
0f3b7dd6e9 update site on initial directory setup 2015-10-19 17:01:59 -07:00
redmatrix
bab73edcef extened the earlier fix 2015-10-19 16:50:53 -07:00
redmatrix
42d26f01d6 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/zot.php
2015-10-19 16:20:20 -07:00
redmatrix
8aadc2837c typo 2015-10-19 16:19:00 -07:00
redmatrix
ea37882b95 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/zot.php
	install/schema_mysql.sql
	install/schema_postgres.sql
	install/update.php
	mod/zfinger.php
2015-10-19 16:18:04 -07:00
redmatrix
599a0c66b2 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-10-19 16:07:59 -07:00
redmatrix
57e0bfc5a9 add the project name to site info packet 2015-10-19 16:07:14 -07:00
redmatrix
9f424bb208 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-19 14:56:02 -07:00
redmatrix
4e5b813aa8 syntax error 2015-10-19 14:55:49 -07:00
redmatrix
6a2c32bd23 Merge pull request #93 from tuscanhobbit/master
Replaced some old redmatrix branding
2015-10-20 06:54:56 +11:00
Mario Vavti
febcb90ece fix typo in mod/connedit.php 2015-10-19 15:33:19 +02:00
Mario Vavti
4b300f8274 fix typo in include/notifier.php 2015-10-19 14:53:13 +02:00
Paolo Tacconi
8da8e02dc8 Replaced some old redmatrix branding 2015-10-19 10:51:33 +02:00
Wave
3e9b6a330d Merge pull request #1 from redmatrix/master
Update to latest hubzilla
2015-10-19 10:28:17 +02:00
redmatrix
b54c4df74d Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-18 20:17:09 -07:00
redmatrix
f0a33c00bc separate permission_update notification into permission_create and permission_update, since some networks send out a notification for duplicate share requests even if connected. 2015-10-18 20:13:12 -07:00
redmatrix
8631b28130 Merge pull request #92 from HaakonME/master
Updated deploy script with new defaults and updated help page Hubzilla on OpenShift
2015-10-19 10:36:01 +11:00
redmatrix
9b3662e5ad issues with "the Register" feed 2015-10-18 16:29:09 -07:00
redmatrix
3fb690a0f6 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-18 15:50:18 -07:00
redmatrix
76d41fc250 re-organise the protocol disabled logic 2015-10-18 15:49:52 -07:00
Haakon Meland Eriksen
15fa300e04 Updated help page about Hubzilla on OpenShift with new info on using mysqlcheck rather than myisamchk and notes about new space preserving defaults in the deploy script given 1Gb gear on OpenShift - fixed link 2015-10-18 20:45:26 +02:00
Haakon Meland Eriksen
47c86828c6 Updated help page about Hubzilla on OpenShift with new info on using mysqlcheck rather than myisamchk and notes about new space preserving defaults in the deploy script given 1Gb gear on OpenShift 2015-10-18 20:39:24 +02:00
jeroenpraat
6eaf35a142 Update es+nl 2015-10-18 19:09:38 +02:00
Haakon Meland Eriksen
ea8364eba5 Added config settings sensible for Hubzilla on OpenShift - fixes 2015-10-18 18:51:29 +02:00
Haakon Meland Eriksen
fc4b1693f9 Added config settings sensible for Hubzilla on OpenShift 2015-10-18 18:40:55 +02:00
jeroenpraat
52f3d6722d Update nl+es 2015-10-18 16:45:11 +02:00
Mario Vavti
126628546b tweak justify gallery options to not load to large previews 2015-10-18 14:21:42 +02:00
redmatrix
2540ecc0ac Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	README.md
2015-10-17 16:53:14 -07:00
redmatrix
b49972a623 start pointing people to hubzilla instead of redmatrix 2015-10-17 16:51:07 -07:00
redmatrix
b82a9a6594 messages.po got truncated due to a failed cron job 2015-10-17 16:47:18 -07:00
redmatrix
be701677d6 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
2015-10-17 16:38:57 -07:00
redmatrix
1e8fc8b062 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-10-17 16:34:00 -07:00
redmatrix
b6c765c9dc allow homepage content to be a full redirect 2015-10-17 16:33:28 -07:00
redmatrix
1d2797dc1f bring back chat expiration setting and adjust chat size for our now smaller content region 2015-10-17 14:54:27 -07:00
redmatrix
4b984f9819 filter delivery reports 2015-10-17 13:26:55 -07:00
redmatrix
e8882a5167 remove one more Friendica table reference from the API 2015-10-16 15:24:48 -07:00
redmatrix
4f0490f26f Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-16 13:06:47 -07:00
redmatrix
7fe6bc52d0 change setup defaults to 127.0.0.1 instead of localhost for DB server, add documentation to the INSTALL.txt explaining the choice. 2015-10-16 13:05:40 -07:00
Mario Vavti
b7408fa39e we now provide images for all suffixes (0-3) -> simplify photo item body creation and provide width x height for any size 2015-10-16 16:27:51 +02:00
jeroenpraat
7ca5b5c928 Update Dutch strings 2015-10-16 15:31:11 +02:00
redmatrix
6f5f613d9f Merge pull request #90 from anaqreon/theme-doc
Documentation for theme repo management
2015-10-16 22:26:38 +11:00
redmatrix
52f2509280 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-16 04:22:09 -07:00
redmatrix
c07f694a07 another try at issue #89 - rotating photos 2015-10-16 04:21:40 -07:00
Mario Vavti
c49198fd71 this is all the info we need 2015-10-16 12:24:27 +02:00
Andrew Manning
864bad0ebb Updated text 2015-10-16 06:23:15 -04:00
Andrew Manning
051858300e Updated formatting and typos 2015-10-16 06:21:02 -04:00
Andrew Manning
75d16e4852 New documentation for theme repo management 2015-10-16 06:18:47 -04:00