harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,802 Commits 6 Branches 36 Tags
febcb90ece65798f169de491d30503770d7f90af
Commit Graph

14802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
redmatrix a756c0b182 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/identity.php
 2015-10-15 21:40:59 -07:00
redmatrix 550cab41fb missing xchan_mail_query 2015-10-15 21:39:33 -07:00
redmatrix 45bd81fe8c missed the xchan_mail_query 2015-10-15 21:38:16 -07:00
redmatrix 3f7ee613fc mail sync debugging 2015-10-15 20:40:24 -07:00
redmatrix 93f061f78a mail sync/migrate continued; also abstract delivery loop to make it re-usable, change refresh_all to use delivery loop. 2015-10-15 18:52:04 -07:00
redmatrix 7517c76ae4 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	install/update.php
 2015-10-15 16:02:37 -07:00
redmatrix e26f771cbe dummy update 2015-10-15 16:00:31 -07:00
redmatrix bf5a1f662a generate all (non-square) photo scales - even if the original photo is smaller than the scale target sizes. 2015-10-15 14:18:40 -07:00
redmatrix d9753989bf issue #89 - rotating photos does not work 2015-10-15 13:23:40 -07:00
Mario Vavti 391b98f72c fix webpages 2015-10-15 20:57:05 +02:00
Mario Vavti d40a087ec2 really fix label name 2015-10-15 16:07:13 +02:00
Mario Vavti 138c14d43f wrong logic 2015-10-15 15:48:13 +02:00
Mario Vavti dc6a594277 fix label name 2015-10-15 15:41:08 +02:00
Mario Vavti 9f5c61b1fd reflect default image size changes in mod/photos 2015-10-15 14:52:31 +02:00
Mario Vavti 3bca640521 do not try to remove photos twice 2015-10-15 13:57:15 +02:00
Mario Vavti 73082a338b (re)add default image-size 320px - it is good for gallery preview. this size has the suffix -3 now 2015-10-15 12:56:22 +02:00