Thomas Willingham
7ac00d02d1
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
mod/page.php
2013-12-18 18:21:47 +00:00
Paolo T
df34aaba47
Merge pull request #245 from tuscanhobbit/master
...
corrections to italian translation
2013-12-18 06:20:49 -08:00
p.tacconi
10ef0cd997
corrections to italian translation
2013-12-18 15:19:02 +01:00
friendica
38fd8410eb
split off mod_connections into mod_connections & mod_connedit - lots of links to fix
2013-12-18 01:00:08 -08:00
friendica
1780684c57
split mod/connections for comanchification
2013-12-17 20:26:08 -08:00
friendica
98b0e0221d
more comanche stuff
2013-12-17 20:03:45 -08:00
friendica
1d82d93078
Merge https://github.com/friendica/red into zpull
2013-12-17 16:36:23 -08:00
friendica
44ead61339
authtest: do a better job of success/failure indication
2013-12-17 16:35:22 -08:00
friendica
26667ffd4f
Merge pull request #244 from zzottel/master
...
JS-less display module
2013-12-17 16:09:36 -08:00
zottel
b3e3073b99
JS-less display
2013-12-17 12:23:39 +01:00
friendica
9728a1303d
There's always more to do...
2013-12-16 20:54:03 -08:00
friendica
c4ca0c634f
Merge https://github.com/friendica/red into zpull
2013-12-16 18:09:43 -08:00
friendica
7b5a42568a
Tricky little bug. Allowed somebody to bypass comment permissions. Hopefully the fix will have no undesired side effects.
2013-12-16 18:07:41 -08:00
friendica
95f7c753a1
Merge pull request #243 from git-marijus/master
...
some more style.css work
2013-12-16 13:51:07 -08:00
friendica
50731fa6a6
bring back the collection edit sidebar widget on the connection edit page until I sort out Comanche on that page.
2013-12-16 13:34:34 -08:00
marijus
afc86875d2
move some stuff back to mod_connections.css
2013-12-16 15:46:18 +01:00
marijus
ae95269c6d
remove some cruft and a typo
2013-12-16 15:41:23 +01:00
marijus
5512d6aa1d
Merge branch 'master' of https://github.com/friendica/red
2013-12-16 12:51:35 +01:00
friendica
a7a775a718
install redbasic during setup so that at least one theme is registered. Otherwise none of the display settings seem to work very well.
2013-12-16 00:25:08 -08:00
friendica
5a3a72604b
some re-work of mod_sources
2013-12-15 20:59:52 -08:00
friendica
61a7bfb942
use 'a' ACL search instead of 'm' ACL search for mod_sources
2013-12-15 20:30:37 -08:00
friendica
065300f7c3
bloody hell - it isn't defined either.
2013-12-15 18:43:54 -08:00
friendica
817d146123
bloody hell... php version incompatibility with openssl - openssl no longer accepts a string as an algorithm. Earlier versions didn't recognise sha256. So we'll look to see if the algorithm constant for sha256 is defined and if so we'll use that instead of the string.
2013-12-15 18:30:10 -08:00
friendica
a6987134e5
headline spacing
2013-12-15 17:19:02 -08:00
friendica
5837ab69b9
use consistent font-size for text
2013-12-15 16:31:58 -08:00
friendica
936845089b
improve the flow of the message a bit
2013-12-15 16:27:39 -08:00
friendica
6c2d29f73f
change the top margin so the headline gets in.
2013-12-15 16:02:07 -08:00
friendica
46fd10a29d
can't use an access file or we can't see the assets
2013-12-15 15:44:36 -08:00
friendica
731ab80ac2
set system.projecthome to 1 if you want the project page for a home page. There was a bit of re-org of mod/home, which might alter the behaviour for some existing sites. Basically we're not showing a login box at all if you've got home.html - there should be a login link in th nav bar. If you haven't defined anything at all we'll fall back to the old behaviour but still allow the home contents to be set via plugin.
2013-12-15 15:37:51 -08:00
friendica
0272ab4cd9
Provide a fallback channel to probe for magic-auth when we have no prior communications with a site.
...
This will be a system channel if one exists, otherwise any channel will do. We'll try to use the first
valid channel on the site because that was probably created when the site was installed and is the
closest thing to a system channel we've got.
2013-12-15 14:36:43 -08:00
friendica
950bd72e02
use sitename for the banner if nothing else has been set
2013-12-14 21:37:37 -08:00
friendica
db11f5af78
missed this
2013-12-14 17:06:50 -08:00
friendica
d14e2db6b4
make home.html fullpage mode - make directory search work for non-logged in, but leave off suggest and invite
2013-12-14 17:03:37 -08:00
friendica
c00f0d4b28
a couple more comanche conversions
2013-12-14 13:26:40 -08:00
marijus
c3c7a06833
Merge branch 'master' of https://github.com/friendica/red
2013-12-14 09:57:57 +01:00
friendica
a4624d2979
Merge https://github.com/friendica/red into zpull
2013-12-13 13:32:28 -08:00
friendica
744d449284
Merge pull request #242 from git-marijus/master
...
move affinity slider to widgets.css and minor cleanup
2013-12-13 13:37:10 -08:00
friendica
0215043826
prepare for Comanchification of mod_photos
2013-12-13 13:30:33 -08:00
friendica
94975f8d30
categories should already be html encoded - ensure this is the case but don't double encode
2013-12-13 12:30:44 -08:00
marijus
ed5f725741
Merge branch 'master' of https://github.com/friendica/red
2013-12-13 21:23:10 +01:00
friendica
1975fa50da
doc additions
2013-12-13 01:14:15 -08:00
friendica
64b16f1e1a
add construct_page hook
2013-12-13 01:13:35 -08:00
friendica
65c0b84313
always load css and js sources using the same url as the page that is being visited so there is no http/https mismatch.
2013-12-12 18:13:52 -08:00
marijus
b994faee9d
mark some things for deletion
2013-12-12 15:15:01 +01:00
marijus
8f6af66a73
move affinity slider to widgets.css and minor cleanup
2013-12-12 14:39:21 +01:00
zzottel
81cf9209f0
Merge pull request #241 from zzottel/master
...
htmspecialchars_decode only takes one argument.
2013-12-12 04:34:34 -08:00
zottel
3a11980e49
htmspecialchars_decode only takes one argument.
2013-12-12 13:32:11 +01:00
friendica
303324cdff
more htmlspecialchars sanitisation
2013-12-12 02:15:02 -08:00
friendica
941f81eb30
check that every invocation of htmlspecialchars has the right arg list
2013-12-12 02:01:42 -08:00
friendica
b3fe221b7f
issue #240 - we were using htmlentities instead of htmlspecialchars in several places, and this was a bit greedy in the set of characters which were converted from utf-8 to HTML entities. Also brought mail attachments up to date so they are rendered identically to item attachments.
2013-12-11 23:13:36 -08:00