Mario Vavti
|
f41bab6f8a
|
Merge remote-tracking branch 'redmatrix/master'
|
2015-07-11 13:26:27 +02:00 |
|
Mario Vavti
|
138e0fe445
|
fix issue with profile photo
|
2015-07-11 13:25:06 +02:00 |
|
Mario Vavti
|
ec2df365de
|
Merge remote-tracking branch 'redmatrix/master'
|
2015-07-11 12:53:34 +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
|
f7da424b8b
|
Merge remote-tracking branch 'redmatrix/master'
|
2015-07-11 12:07:47 +02:00 |
|
Mario Vavti
|
edb3d970ca
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-11 12:05:56 +02:00 |
|
Mario Vavti
|
d592d911c5
|
add css file for mod display
|
2015-07-11 12:05:39 +02:00 |
|
Mario Vavti
|
54bb2651f5
|
merge
|
2015-07-11 11:58:53 +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 |
|
redmatrix
|
4bf7e4a34d
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-07-10 14:20:38 -07:00 |
|
redmatrix
|
ae6541cf74
|
revision update
|
2015-07-10 14:20:08 -07:00 |
|
Mario Vavti
|
6e30ccdd22
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-10 21:48:42 +02:00 |
|
Mario Vavti
|
b6f28900e6
|
show status editor in /display on share action.
|
2015-07-10 21:48:24 +02:00 |
|
jeroenpraat
|
115097f139
|
update Dutch strings
|
2015-07-10 21:46:19 +02:00 |
|
Mario Vavti
|
b1f926ba89
|
merge redmatrix fixes
|
2015-07-10 20:46:46 +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
|
c7b55f7753
|
revert
do not show status editor in /display - we most probably want to read the thread or comment.
|
2015-07-09 22:31:21 +02:00 |
|
Mario Vavti
|
2b9a480c2f
|
fix vcard title spacing
|
2015-07-09 22:23:24 +02:00 |
|
Mario Vavti
|
0bec45e570
|
do not show status editor in /display - we most probably want to read the thread or comment.
|
2015-07-09 21:03:10 +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
|
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 |
|