Commit graph

13649 commits

Author SHA1 Message Date
redmatrix
507e10fa45 remove debugging 2015-06-08 16:57:30 -07:00
redmatrix
39f0e6fe62 add site_dead flag to prevent delivery to dead sites. Allow sys channel webpages to be viewed even if site is configured "block public". 2015-06-08 16:55:17 -07:00
redmatrix
5b482c1daf magic auth issues on dreamhost 2015-06-07 23:04:46 -07:00
redmatrix
10e88a3e45 Merge branch 'frontpage' 2015-06-07 21:38:11 -07:00
redmatrix
9823541c4b make sure these are included 2015-06-07 21:36:50 -07:00
redmatrix
77314bfa1c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-07 18:59:48 -07:00
redmatrix
3c5a5a9ebf more frontpage tweaks 2015-06-07 18:59:14 -07:00
redmatrix
60cfea5d1f reverse logic of homepage login setting 2015-06-07 18:27:05 -07:00
redmatrix
0537ff1e4a frontpage tweaks 2015-06-07 18:15:26 -07:00
redmatrix
65bea5e02c frontpage changes 2015-06-07 16:19:59 -07:00
redmatrix
04c4ad9448 version update 2015-06-07 15:15:24 -07:00
jeroenpraat
fd73ffe291 Upd NL 2015-06-07 16:39:00 +02:00
Mario Vavti
f5e439236c missing comma 2015-06-06 20:23:00 +02:00
jeroenpraat
93237f8d0a Added translatable strings to the Display Settings page and refreshed util/messages.po. 2015-06-06 19:49:30 +02:00
Mario Vavti
2c52be8780 css fixes 2015-06-06 17:05:38 +02:00
Mario Vavti
d60c2b1621 whitespace 2015-06-06 15:51:15 +02:00
Mario Vavti
1d80c33207 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-06 15:06:48 +02:00
Mario Vavti
dff402293f some cleanup after scheme transition 2015-06-06 15:06:27 +02:00
redmatrix
3fc5b854cb Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-06 00:06:44 -07:00
redmatrix
b832444dc2 string/version update 2015-06-06 00:06:26 -07:00
jeroenpraat
f51cfa6960 More schemas in new format 2015-06-05 21:15:21 +02:00
Mario Vavti
d84f77bbc6 use the right webpage layout for an installed webpage if it exists 2015-06-04 23:04:58 +02:00
Mario Vavti
33a122aaa8 some doco on webpage blocks 2015-06-04 22:27:55 +02:00
jeroenpraat
6e336d680d Schemas: should be ok now. 2015-06-03 22:53:48 +02:00
jeroenpraat
03361acce5 2 more schemas in new format 2015-06-03 15:45:50 +02:00
jeroenpraat
83d42710df Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-03 13:58:18 +02:00
jeroenpraat
76d7278c0a empty php schema back 2015-06-03 13:57:10 +02:00
redmatrix
86ff31f500 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-02 17:46:47 -07:00
redmatrix
b2fde73952 asjld work 2015-06-02 17:46:22 -07:00
jeroenpraat
89fbd5c0f6 First schema completely to the new format. git-marijus: Can you please quickly check if I'm doing it right? 2015-06-02 23:22:12 +02:00
Mario Vavti
6277fb76dd update help link 2015-06-02 11:09:57 +02:00
Mario Vavti
12408ba181 update comanche doco 2015-06-02 10:59:57 +02:00
redmatrix
e3606ec56f move the photo and attachment permission syncing past the tag replacement so that attachments get the correct permissions when private mentions are used. 2015-06-01 16:26:12 -07:00
redmatrix
c1e139a550 error in directory bbcode image filter 2015-05-31 22:22:37 -07:00
redmatrix
84c085dcd7 bare bones ASLD 2015-05-31 22:16:14 -07:00
redmatrix
5cc5e0fafd some basic background work for activitystreams-json-ld-2.0 conversions 2015-05-31 18:35:35 -07:00
Habeas Codice
0df0fb4b46 fix unable to crop profile pic on postgres 2015-05-30 19:49:32 -07:00
redmatrix
cd3284d081 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-30 15:04:11 -07:00
redmatrix
edd228decb strip images from directory text entries 2015-05-30 15:03:44 -07:00
Mario Vavti
5040506184 should not redefine $var in the function call 2015-05-29 17:59:31 +02:00
Mario Vavti
2514af6524 fix menu render for menu item edit - menu preview 2015-05-29 17:51:50 +02:00
Mario Vavti
8516b3259f whitespace 2015-05-29 16:14:54 +02:00
Mario Vavti
d11d130021 add some yes/no labels and minor template fixes 2015-05-29 15:23:51 +02:00
Mario Vavti
b8d3280763 some fixes to make menu sharing work and expose it in the ui. 2015-05-29 13:08:01 +02:00
Mario Vavti
5f1ae2930b show created/edited dates for menus 2015-05-29 11:07:57 +02:00
redmatrix
3a9139f76e there was a reason we included that file 2015-05-28 22:06:22 -07:00
redmatrix
9ff988e3d7 parse error 2015-05-28 21:27:48 -07:00
redmatrix
07203c1de3 another case of committing with unsaved changes in a second window 2015-05-28 20:54:57 -07:00
redmatrix
3c82156d63 untested menu element import, be aware that the menu api does not over-write on duplicate name - it just fails. We'll need to sort this out eventually. Also it was planned to offer a choice of whether to preserve links from the source site or change the baseurl to the local one. Currently we convert them all to local links. 2015-05-28 20:50:29 -07:00
redmatrix
df5223fe98 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-28 17:00:30 -07:00