Commit Graph

4721 Commits

Author SHA1 Message Date
Paolo Tacconi
c9b5046fc0 Updated Italian strings 2015-07-16 11:33:49 +02:00
redmatrix
6046fe9c9e Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-15 17:50:24 -07:00
Mario Vavti
0c77a127f2 show inherited state in Connection Default Permissions 2015-07-15 14:03:34 +02:00
redmatrix
e8f19c1e15 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	mod/connedit.php
2015-07-14 17:10:13 -07:00
Mario Vavti
104cbcab72 make strings translateable 2015-07-14 21:32:18 +02:00
Mario Vavti
4fe64179c8 disable the inherited checkboxes for notself 2015-07-14 19:29:49 +02:00
Mario Vavti
cc1764989f fix mod_connedit.js after cleanup 2015-07-14 17:37:33 +02:00
Mario Vavti
f267bd55d6 revert this until further investigation 2015-07-14 14:20:23 +02:00
Mario Vavti
a28da40fa8 css fixes 2015-07-14 12:52:50 +02:00
Mario Vavti
7f71297383 cleanup connedit 2015-07-14 12:46:40 +02:00
redmatrix
6916c1076c Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-13 17:43:10 -07:00
Mario Vavti
f81874ca49 fix sys channel menu in a morre standard way 2015-07-12 01:04:57 +02:00
Mario Vavti
d8f03450e7 make menu creation for sys channel work 2015-07-12 00:40:12 +02:00
redmatrix
69a4cf73a3 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-11 15:03:23 -07:00
Mario Vavti
138e0fe445 fix issue with profile photo 2015-07-11 13:25:06 +02:00
Mario Vavti
d3581d8562 more revert 2015-07-11 12:52:06 +02:00
Mario Vavti
d8e7f36c74 revert moving section and aside padding to style.css - it brings trouble to other layouts 2015-07-11 12:42:11 +02:00
Mario Vavti
d592d911c5 add css file for mod display 2015-07-11 12:05:39 +02:00
redmatrix
a497d8ee66 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	mod/editpost.php
	util/messages.po
	view/nl/messages.po
	view/nl/strings.php
2015-07-10 14:27:41 -07:00
jeroenpraat
115097f139 update Dutch strings 2015-07-10 21:46:19 +02:00
Mario Vavti
071a233fb8 css fixes 2015-07-10 13:44:23 +02:00
Mario Vavti
39d68bf7c7 do not change selected/active class color on hover 2015-07-10 13:34:36 +02:00
Mario Vavti
ebb07de788 re-enable selected/active class 2015-07-10 13:25:50 +02:00
Mario Vavti
fee607db56 more webpages - generic-content-wrapper fixes 2015-07-10 13:16:45 +02:00
Mario Vavti
1554b5a2ee add generic content wrapper to post/webpage editor and make editpost render correctly 2015-07-10 12:46:20 +02:00
Mario Vavti
7eb614c8aa schema focus: refine content width to be more in balance with the recent aside width 2015-07-10 11:15:05 +02:00
Mario Vavti
e1f64b6748 move section and aside padding from default.css to style.css 2015-07-10 10:09:54 +02:00
Mario Vavti
2b9a480c2f fix vcard title spacing 2015-07-09 22:23:24 +02:00
Mario Vavti
08996e5b9b fix aside width for collapsed state 2015-07-09 20:54:13 +02:00
Mario Vavti
115c18353e move profile image up and refine the aside width 2015-07-09 14:44:24 +02:00
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
6b41074396 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-07 16:50:25 -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
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
ee01e67fa7 use default style for default webpage 2015-07-07 09:41:27 +02:00
redmatrix
1b3e046cd2 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-06 17:54:29 -07: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
Mario Vavti
2011784faf schema focus: adjust default width 2015-07-05 22:37:52 +02:00
Paolo Tacconi
7d4615e319 Updated Italian localization 2015-07-03 12:01:30 +02: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
Mario Vavti
f54688a547 since we can now use plain upstream justifiedGallery library - switch to minified version 2015-07-01 11:42:17 +02:00
Mario Vavti
9c4e9f8759 update justifiedGallery to versio 3.6.0 2015-07-01 11:34:36 +02:00
redmatrix
97e8275dc2 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-29 22:19:44 -07:00
redmatrix
0b347ccc14 turn the connection filter into a feature. 2015-06-29 20:35:56 -07:00