56eb9e75cc
Merge branch 'master' of https://github.com/friendica/red
2014-05-09 07:39:27 +02:00
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
22b79207f9
event form hard-wired tinymce=on, made selectable
2014-05-08 19:59:26 -07:00
4cf684a701
better checking for SSL servers, even though it probably doesn't fix the cookie bug
2014-05-08 18:50:33 -07:00
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
350e6490b8
Merge https://github.com/friendica/red into pending_merge
2014-05-08 16:33:59 -07:00
c410406922
remove the redundant install check
2014-05-08 16:33:35 -07:00
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
b9320c9fac
Merge pull request #449 from cvogeley/master
...
another one
2014-05-08 23:48:15 +02:00
a8cc1770b1
another one
2014-05-08 23:45:54 +02:00
afa9a62fa0
Merge pull request #448 from cvogeley/master
...
Small adjustment
2014-05-08 23:36:20 +02:00
4b9c80aca9
Small adjustment
2014-05-08 23:33:04 +02:00
cd8095211f
Merge pull request #447 from cvogeley/master
...
Trying to make the conversation better readable
2014-05-09 06:56:08 +10:00
167e397706
Trying to make the conversation better readable
...
by adding borders and adding more space between the threads. If you
don’t like it feel free to revert it.
2014-05-08 22:41:13 +02:00
b28b949e8f
Merge pull request #446 from tuscanhobbit/master
...
IT: strings updated
2014-05-08 14:22:19 +02:00
2d17eeebcb
IT: strings updated
2014-05-08 14:20:51 +02:00
6e397240a3
add some more bs fu
2014-05-08 13:53:27 +02:00
8144498803
like indicator rewrite
2014-05-08 13:44:43 +02:00
1a4c99ec02
fix events until the new event subscription mechanism goes in, as shared events have been broken
2014-05-07 22:28:19 -07:00
e22e94cd97
ok *now* shred works with alternate config files
2014-05-07 20:31:21 -07:00
b26edefe3e
shred: perhaps alternate configs will work now - unable to test at the moment. Was a typo in FriendicaOAuth.sh so it's unlikely anybody has been using this recently. We'll probably need it for apps.
2014-05-07 17:42:58 -07:00
1ca8584390
Do our best to provide sane cookie defaults.
2014-05-07 16:31:54 -07:00
92be2e1081
make it easier to plug into .well_known, for instance to tell the EFF to fuck off and not block pages from the free web just because they use cookies.
2014-05-06 22:25:36 -07:00
f1eafbf47d
core fixes to allow statusnet connector to work
2014-05-06 19:17:06 -07:00
cc68e06dee
setup: check for open https port with an invalid cert, even if configured to use http. Also a bit more word-smithing on the resultant error text but it's still not perfect.
2014-05-06 17:32:22 -07:00
abf0dd5ecf
log pickups
2014-05-05 20:15:01 -07:00
45ce3f4b13
You wouldn't think we need this text, but we really do.
2014-05-05 19:45:30 -07:00
8584b13e9c
added text on concensus building and hints on when to make a feature optional or a plugin.
2014-05-05 19:33:48 -07:00
1fa8bc12e5
try again
2014-05-05 18:49:58 -07:00
2949030461
revert
2014-05-05 18:38:11 -07:00
f0653ace22
improved cookie security
2014-05-05 18:35:02 -07:00
bdbda6074c
add message_id to reshared items so that we can eventually notify the original poster via an activity that their item was shared.
2014-05-05 16:16:32 -07:00
94b2ac6abb
put permissions dialog inside the form element - should fix issue #444
2014-05-05 16:03:38 -07:00
cea62a0e73
Merge https://github.com/friendica/red into pending_merge
2014-05-05 14:20:30 -07:00
87aa7446e4
minor text change.
2014-05-05 14:20:09 -07:00
9df61273db
fix some issues with nav-tabs overrides and make their background transparent
2014-05-05 21:58:58 +02:00
e0b0c58851
Height auto or mini-height 120px. The latter.
2014-05-05 13:59:39 +00:00
d93df86298
Fixed some wrapping problems when the user has set a larger font size. And some UI love for the file permissions page (as requested by Mike ;) and changed the position of the file properties link on the cloud page.
2014-05-05 13:54:56 +00:00
806f1f0fa1
UI for deleting chatrooms
2014-05-04 20:30:52 -07:00
3ae67c517e
Merge https://github.com/friendica/red into pending_merge
2014-05-04 17:11:29 -07:00
fc550ae330
issue #432 permission changes lost editing webpage (and other non-post items)
2014-05-04 17:10:33 -07:00
fc5ae78079
Merge pull request #442 from cvogeley/master
...
system notifications mark seen link
2014-05-05 06:43:56 +10:00
5344e73cda
Merge pull request #443 from sasiflo/master
...
ifpending repaired again. Hope it works as intended now.
2014-05-05 06:43:31 +10:00
b472cc0fd3
ifpending repaired again. Hope it works as intended now.
2014-05-04 20:42:05 +02:00
f7c77c7821
Add link to system notifications page
...
to mark notifications seen
2014-05-04 18:17:11 +02:00
b2e0b6f11d
system notifications mark seen link
2014-05-04 17:28:43 +02:00
98a942bd95
Dark schema: Quick fix for new search dropdown
2014-05-04 14:26:20 +00:00
3da4656e41
hopefully this will fix it
2014-05-04 03:11:28 -07:00
6771aaec90
Merge pull request #441 from sasiflo/master
...
ifpending repaired. Show page "all contacts" directly if no pending conn...
2014-05-04 20:08:22 +10:00
3f9513010f
ifpending repaired. Show page "all contacts" directly if no pending connections.
...
Tried to repair. Think the merge of flags was wrong in the last
commit.
2014-05-04 11:41:31 +02:00
marijus
friendica
cvogeley
Paolo T
Paolo Tacconi
jeroenpraat
sasiflo