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

14835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mario Vavti 5395b173aa implement the new anchor target behaviour 2015-10-22 12:09:19 +02:00
Mario Vavti 735f9c7a45 define $photo 2015-10-22 11:37:34 +02:00
Mario Vavti 6f8d29ad80 move photo object stuff from itemObject to prepare_body() so we can do more stuff with it 2015-10-22 10:52:10 +02:00
redmatrix eb947acebe set link target window for many links that are included in posts, but not in rest of application 2015-10-21 18:34:09 -07:00
redmatrix 01e84edd0a Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-21 15:02:32 -07:00
redmatrix b7538b6ada turn relative links in app_render() into absolute links, without affecting the install. 2015-10-21 15:00:41 -07:00
Mario Vavti 232742a5e6 warn if quota exceeds 90% of storage limit 2015-10-21 12:52:03 +02:00
Mario Vavti a33ddf373b move file storage quota display to upload section. add a warning if remaining space is less than 100MB and fix % calculation 2015-10-21 12:40:09 +02:00
redmatrix b57e735199 old merge conflict 2015-10-20 21:34:58 -07:00
redmatrix 38816d7e41 move quota display to where it's visible on a tablet 2015-10-20 18:48:14 -07:00
jeroenpraat 3a89bb0db2 fix image path 2015-10-20 17:25:44 +02:00
Mario Vavti 865c38995d some photos cant be deleted under certain circumstances - needs more investigation. revert this until a better fix is found. 2015-10-20 13:43:35 +02:00
Mario Vavti beae28f2db add obj_type and object again 2015-10-20 13:19:05 +02:00
Mario Vavti 81b2c5ac68 fix jot photo upload 2015-10-20 13:03:28 +02:00
Mario Vavti 35b5f60f99 update large photo feature setting description 2015-10-20 09:58:48 +02:00
Mario Vavti 13d0db5f9a css cleanup 2015-10-20 09:47:30 +02:00
Mario Vavti f7601756e9 create photo object if feature large photos is enabled and display those slightly different 2015-10-20 09:36:15 +02:00
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