friendica
b3cc05c41d
try to fix random logouts
2014-05-12 17:04:03 -07:00
jeroenpraat
6f78d4785c
Docu update: https://redmatrix.nl/channel/jeroenpraat/?f=&mid=00eeea0d6df910aa92a02bcd292cf0b9e5f918281e34a771eddc485085e4ba0a@redmatrix.nl&zid=jeroenpraat%40redmatrix.nl
2014-05-12 20:15:25 +00:00
marijus
0bf68af0a7
make comment_indent an option and removeitem_opacity as it is not working properly at the current state - we have got item background opacity now (allthough not yet for custom colors because the colorpicker does not work with rgba colors). Reset left comment border width to 3px as it is barely visible otherwise.
2014-05-12 20:33:14 +02:00
marijus
0446db8104
fix bootstrap override position issue with dropdown menu
2014-05-12 16:57:13 +02:00
marijus
c7a0891bbe
Typo
2014-05-12 11:27:53 +02:00
RedMatrix
d1841911b3
Merge pull request #458 from pixelroot/master
...
modified: view/ru/messages.po
2014-05-12 18:27:05 +10:00
pixelroot
5830e85912
modified: view/ru/messages.po
...
modified: view/ru/strings.php
2014-05-12 09:57:48 +02:00
friendica
ef5ffad690
log IP mis-matches even if paranoia isn't set.
2014-05-11 22:01:53 -07:00
friendica
3eae3fd496
a bit more progress on using shred to pick through API results. Commented out because the array storage is kindof weird so the first try (assuming simple arrays) didn't work out. I'll have to rethink how to index these things and may have to rewrite the js() function to do the kinds of things I want.
2014-05-11 18:36:00 -07:00
friendica
045d23a27c
Merge https://github.com/friendica/red into pending_merge
2014-05-11 17:38:22 -07:00
friendica
b5372f8152
button styling mitemlist
2014-05-11 17:37:54 -07:00
RedMatrix
c455663509
Merge pull request #456 from cvogeley/master
...
Move "boxy" conversation design into a schema file
2014-05-12 09:43:58 +10:00
Christian Vogeley
3fbac93619
grrr
2014-05-11 13:23:38 +02:00
Christian Vogeley
889aaad668
For the moment last change
2014-05-11 13:16:01 +02:00
Christian Vogeley
2d69a81c00
saved 2
2014-05-11 04:22:52 +02:00
Christian Vogeley
f9ad959f17
saved
2014-05-11 04:13:54 +02:00
Christian Vogeley
7da462ada1
some corrections and cleanup
2014-05-11 03:16:39 +02:00
Christian Vogeley
5f1f82df5d
Move "boxy" conversation design into a schema file
...
Default design is now again basically the previous one
2014-05-11 02:22:27 +02:00
Christian Vogeley
e2b96df27b
another experiment
2014-05-10 23:43:37 +02:00
RedMatrix
b4fd20c624
Merge pull request #455 from encyclomundi/master
...
correct minor typo
2014-05-11 07:38:01 +10:00
RedMatrix
1ed210ef0a
Merge pull request #454 from chriswinstead/master
...
Detect high-resolution displays (like retina) and serve higher resolution photo thumbnails
2014-05-11 07:36:59 +10:00
Charles
3f5852c30e
correct minor typo
2014-05-10 12:50:20 -07:00
root
d1e0479f58
Removed some unnecessary changes.
2014-05-10 11:35:16 -07:00
root
874b8d40ff
Changed some comments.
2014-05-10 11:22:00 -07:00
root
ed5cebd3d6
Made code changes to serve higher resolution images in displays with high pixel density.
2014-05-10 11:15:27 -07:00
root
80796c78f5
Merge branch 'master' of https://github.com/chriswinstead/red
2014-05-10 10:55:50 -07:00
friendica
7524cf4e39
Merge https://github.com/friendica/red into pending_merge
2014-05-10 00:29:00 -07:00
RedMatrix
481b4c21c9
Merge pull request #453 from unary/bbcode
...
add support for h1, h2, etc. to bbcode
2014-05-10 17:28:21 +10:00
Michael Johnston
0e336fc092
add support for h1, h2, etc. to bbcode
2014-05-10 00:54:59 -04:00
friendica
b854e58a7b
issue #452
2014-05-09 15:24:54 -07:00
friendica
7302a3690e
Merge https://github.com/friendica/red into pending_merge
2014-05-09 01:53:41 -07:00
friendica
6d56c9b603
better button theming on oauth connected apps page
2014-05-09 01:53:03 -07:00
friendica
dbb83abff6
doc updates
2014-05-09 01:52:44 -07:00
Paolo T
f518528ac2
Merge pull request #450 from tuscanhobbit/master
...
IT: strings updated
2014-05-09 10:14:25 +02:00
Paolo Tacconi
dd6c09d096
IT: strings updated
2014-05-09 10:10:19 +02:00
friendica
a8dcd68579
Merge https://github.com/friendica/red into pending_merge
2014-05-08 22:45:13 -07:00
friendica
d3b5509b33
shred: ability to execute somewhat arbitrary API functions and echo results
2014-05-08 22:44:12 -07:00
marijus
56eb9e75cc
Merge branch 'master' of https://github.com/friendica/red
2014-05-09 07:39:27 +02:00
friendica
831b18cf28
move the event "unknown finish time" checkbox up so it actually precedes entering the finish time.
...
TODO: we should probably disable the finish time selector with jquery if this is checked.
2014-05-08 21:22:07 -07:00
friendica
22b79207f9
event form hard-wired tinymce=on, made selectable
2014-05-08 19:59:26 -07:00
friendica
4cf684a701
better checking for SSL servers, even though it probably doesn't fix the cookie bug
2014-05-08 18:50:33 -07:00
friendica
2fe8bae7a5
show hidden connections in contact block if and only if the observer is the profile owner
2014-05-08 17:08:34 -07:00
friendica
350e6490b8
Merge https://github.com/friendica/red into pending_merge
2014-05-08 16:33:59 -07:00
friendica
c410406922
remove the redundant install check
2014-05-08 16:33:35 -07:00
friendica
d4e00c7bde
turn off ssl cookie protection by default since nobody that has problems with it is apparently able to debug it. PLEASE turn it on by
...
util/config system ssl_cookie_protection 1
if you use SSL. Please debug it if you have a problem and have any basic technical skills at all and tell us why it doesn't work so we can fix it and turn this on by default because it is very very very important.
2014-05-08 16:28:40 -07:00
cvogeley
b9320c9fac
Merge pull request #449 from cvogeley/master
...
another one
2014-05-08 23:48:15 +02:00
Christian Vogeley
a8cc1770b1
another one
2014-05-08 23:45:54 +02:00
cvogeley
afa9a62fa0
Merge pull request #448 from cvogeley/master
...
Small adjustment
2014-05-08 23:36:20 +02:00
Christian Vogeley
4b9c80aca9
Small adjustment
2014-05-08 23:33:04 +02:00
RedMatrix
cd8095211f
Merge pull request #447 from cvogeley/master
...
Trying to make the conversation better readable
2014-05-09 06:56:08 +10:00