Commit graph

14196 commits

Author SHA1 Message Date
Mario Vavti
59cddef032 remove padding 2015-07-09 14:05:35 +02:00
Mario Vavti
efa55437d4 increase width of the aside area and make default profile image size 300x300 2015-07-09 13:59:16 +02:00
redmatrix
43354ab385 inconsistent naming of block item types 2015-07-08 18:05:38 -07:00
Mario Vavti
e12d58a75c fix typo to make directory safe mode default to on work again 2015-07-08 21:28:36 +02:00
redmatrix
6b41074396 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-07 16:50:25 -07:00
redmatrix
09e365c797 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-07-07 16:48:54 -07:00
redmatrix
78f0138270 version update 2015-07-07 16:48:36 -07:00
redmatrix
7db1bd23f0 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-07-07 16:07:53 -07:00
redmatrix
dad4ac6c89 incorrect value for hubloc_deleted in zot_get_hublocs() query 2015-07-07 16:06:34 -07:00
Mario Vavti
f6cf992aee fix sorting of channel suggestions 2015-07-07 22:48:01 +02:00
Mario Vavti
f67d9d59af rename function get_directory_settings => get_directory_setting and move sort options to directory title bar 2015-07-07 22:29:27 +02:00
redmatrix
75469a61bf Merge pull request #4 from git-marijus/master
abook_pending should probably be 1 in this place
2015-07-08 06:19:48 +10:00
Mario Vavti
9c577e0422 make public forums only setting sticky and simplify function to get directory settings 2015-07-07 21:41:37 +02:00
Mario Vavti
cc7eaa0d05 code style correction 2015-07-07 14:52:06 +02:00
Mario Vavti
b50151d7bf make directory suggest work with directory options 2015-07-07 14:46:47 +02:00
Mario Vavti
18798b1d12 schema focus: adjust width to match photo width in /photos 2015-07-07 12:23:19 +02:00
Mario Vavti
adfb4072e8 various css fixes 2015-07-07 12:13:15 +02:00
Mario Vavti
2d0d5876ba more word wrap fixes 2015-07-07 10:23:39 +02:00
Mario Vavti
807471d2a5 move if clause outside of the div 2015-07-07 09:56:30 +02:00
Mario Vavti
3456e7ca67 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-07 09:42:00 +02:00
Mario Vavti
ee01e67fa7 use default style for default webpage 2015-07-07 09:41:27 +02:00
redmatrix
862bfbdd2b incorrectly named doc file 2015-07-06 20:29:21 -07:00
redmatrix
7cfaae8d4f ok that's wretchedly inefficient but provides a basic relevance search for strings in doc files. 2015-07-06 20:21:41 -07:00
redmatrix
1b3e046cd2 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-06 17:54:29 -07:00
redmatrix
f8898ba573 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-07-06 17:39:03 -07:00
redmatrix
48972d1e8a version update 2015-07-06 17:38:50 -07:00
Mario Vavti
53f4b260cf abook_pending should probably be 1 in this place 2015-07-06 22:48:12 +02:00
Mario Vavti
05b231b087 fix word wrapping in tagblock and dirtagblock and possibly other places 2015-07-06 10:36:57 +02:00
redmatrix
8fad0187ec Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-05 21:38:21 -07:00
redmatrix
49239c936a Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-07-05 21:37:30 -07:00
redmatrix
f7c562fd21 version update 2015-07-05 21:37:04 -07:00
redmatrix
4abb114474 very crude but working doc search 2015-07-05 21:09:04 -07:00
redmatrix
f20933e1e0 more work on db storage of doco 2015-07-05 19:52:41 -07:00
Mario Vavti
2011784faf schema focus: adjust default width 2015-07-05 22:37:52 +02:00
redmatrix
df8f6e45e2 mod/help: read doc files from the database if present and newer than the copy in the filesystem. 2015-07-04 14:46:40 -07:00
redmatrix
a74631b554 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	boot.php
	include/items.php
	util/messages.po
2015-07-03 15:03:56 -07:00
redmatrix
aa58f68bfd Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	view/it/messages.po
	view/it/strings.php
2015-07-03 14:59:04 -07:00
redmatrix
37c78bcf05 start doco cleanup 2015-07-03 14:56:48 -07:00
redmatrix
cbfb94c55c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-07-03 14:32:17 -07:00
redmatrix
0b9332fde9 in hubzilla we're going to convert doco to items. define it here so that an accidental import/export doesn't chuck a wobbly. 2015-07-03 14:30:42 -07:00
redmatrix
2f12039941 Merge pull request #370 from tuscanhobbit/master
Updated Italian localization
2015-07-03 20:24:13 +10:00
Paolo Tacconi
7d4615e319 Updated Italian localization 2015-07-03 12:01:30 +02:00
zzottel
b0a6e2ce26 Merge pull request #369 from zzottel/master
update German main help file
2015-07-03 11:03:08 +02:00
zottel
8042ae9fe8 update German main help file 2015-07-03 11:01:26 +02:00
redmatrix
90a31f4ad5 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/zot.php
2015-07-02 22:00:15 -07:00
redmatrix
1a5898bf80 sync abook entries from redmatrix
Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
2015-07-02 21:58:28 -07:00
redmatrix
065a50c920 a few clone sync fixes as well as some work on hubzilla clone sync back to redmatrix 2015-07-02 21:55:36 -07:00
redmatrix
9369e521bb a bit of cleanup and explanatory text on mod/pconfig 2015-07-02 20:57:06 -07:00
redmatrix
f6fae2ebd9 web version of util/pconfig 2015-07-02 19:54:22 -07:00
redmatrix
54301a9ff5 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-07-01 18:51:47 -07:00