Commit graph

13772 commits

Author SHA1 Message Date
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
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
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
05b231b087 fix word wrapping in tagblock and dirtagblock and possibly other places 2015-07-06 10:36:57 +02: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
Mario Vavti
2011784faf schema focus: adjust default width 2015-07-05 22:37:52 +02: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
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
redmatrix
3f38e52caf provide backward compatibility with hubzilla extended item export 2015-07-01 18:49:34 -07:00
git-marijus
e068bdc9d7 Merge pull request #365 from adsfkajlsfdas/master
Clean up
2015-07-01 11:47:17 +02: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
Thomas Willingham
aa41842d24 Clean up 2015-06-30 17:49:09 +01:00
redmatrix
22cb09f537 warn if export data file is from an incompatible project or if the DB version differs significantly from the current DB. This is to avoid people cloning a hubzilla channel back to red and potentially stuffing up the works. Hopefully we can migrate upwards someday. Downwards is always going to be an issue. 2015-06-29 22:37:18 -07:00
redmatrix
0b347ccc14 turn the connection filter into a feature. 2015-06-29 20:35:56 -07:00
redmatrix
2072ea721f Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-29 16:56:45 -07:00
redmatrix
0b012e2995 some prep work 2015-06-29 16:56:18 -07:00
jeroenpraat
aad8fc1946 Update NL + 1 revert css, see comment here: 22b9e97ae2 2015-06-30 00:26:16 +02:00
jeroenpraat
abb153e711 Probably a ugly hack, but it's the only way I could found that cuts off very long channel names in the admin area. If there's a better alternative, be my guest. 2015-06-29 23:09:36 +02:00
Mario Vavti
7ef4397634 fix directory location 2015-06-29 14:25:04 +02:00
redmatrix
090dae46e5 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-28 21:19:28 -07:00
redmatrix
de13497333 no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool. 2015-06-28 21:16:56 -07:00
redmatrix
bad22498bc Merge pull request #363 from solstag/postnotstatus
simply 'post' is a better default term than 'status'
2015-06-28 07:46:15 +10:00
Alexandre Hannud Abdo
7fafcbb6ef simply 'post' is a better default term than 'status' 2015-06-27 18:10:18 -03:00
Mario Vavti
22b9e97ae2 css fixes 2015-06-27 22:27:17 +02:00
redmatrix
1ee1b6a334 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-26 16:38:19 -07:00
redmatrix
002be8f9ce project updates 2015-06-26 16:37:55 -07:00
Mario Vavti
9406c5a55c Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-25 12:54:42 +02:00
Mario Vavti
e9cc06dc11 directory: only provide connect button if we are not already connected 2015-06-24 21:12:20 +02:00
zzottel
364a3cb972 Merge pull request #360 from zzottel/master
update German strings and help files
2015-06-24 16:57:25 +02:00
zottel
38302051f2 update German help files 2015-06-24 16:54:17 +02:00
zottel
50de9325b6 update to German strings 2015-06-24 16:53:46 +02:00