Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 07:35:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
14852 commits 7 branches 30 tags 160 MiB
Commit graph

14852 commits

This branch
This branch
All branches
Author SHA1 Message Date
Haakon Meland Eriksen
f1b5c333ff Adding Hubzilla addons to deploy script 2015-10-25 17:01:13 +01:00
Mario Vavti
123fe58c26 new line between photo and description 2015-10-24 22:16:08 +02:00
Mario Vavti
fd1e163bf4 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-10-24 21:44:45 +02:00
Mario Vavti
ab8b4d5c36 another try to avoid dubble photo deletion. allow to set a photo caption and simple status body (if create status post is enabled) on upload 2015-10-24 21:44:25 +02:00
Wave
4a044351a9 Merge pull request #97 from wave72/master 
Italian strings updated
 2015-10-24 12:15:15 +02:00
wave72
e0a2268b0e Italian strings updated 2015-10-24 12:13:17 +02:00
redmatrix
3432771150 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-23 21:36:40 -07:00
redmatrix
768615f2f1 version and strings 2015-10-23 21:36:18 -07:00
Mario Vavti
9ae215291f fix app.tpl missing </div> tag if not authenticated 2015-10-23 10:20:01 +02:00
redmatrix
1cf206d764 update the to-do list 2015-10-22 17:27:20 -07:00
redmatrix
4c406ec9c0 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-22 17:20:52 -07:00
redmatrix
500b896d50 revision 2015-10-22 17:20:35 -07:00
git-marijus
18a239e808 Merge pull request #96 from mcnesium/master 
fix placeholder font-family
 2015-10-22 13:54:52 +02:00
mcnesium
5aa07bda7c Merge pull request #1 from mcnesium/placeholder-font 
fix placeholder font-family
 2015-10-22 13:45:34 +02:00
mcnesium
379fd33484 fix placeholder font-family 
[Imgur](http://i.imgur.com/Cegabd5.png)
 2015-10-22 13:44:33 +02:00
Mario Vavti
ed6629002f photo object fixes 2015-10-22 13:01:33 +02:00
Mario Vavti
bcb4ac7aae experiment: put the photo-item photo on top of the post 2015-10-22 12:58:11 +02:00
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