Commit Graph

10266 Commits

Author SHA1 Message Date
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
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 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
Christian Vogeley 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
Paolo T b28b949e8f Merge pull request #446 from tuscanhobbit/master
IT: strings updated
2014-05-08 14:22:19 +02:00
Paolo Tacconi 2d17eeebcb IT: strings updated 2014-05-08 14:20:51 +02:00
marijus 6e397240a3 add some more bs fu 2014-05-08 13:53:27 +02:00
marijus 8144498803 like indicator rewrite 2014-05-08 13:44:43 +02:00
friendica 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
friendica e22e94cd97 ok *now* shred works with alternate config files 2014-05-07 20:31:21 -07:00
friendica 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
friendica 1ca8584390 Do our best to provide sane cookie defaults. 2014-05-07 16:31:54 -07:00
root 711719ce0c Made some changes to img tags to enforce max-width everywhere, and to the page headers to allow user scaling. 2014-05-07 12:01:12 -07:00
friendica 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
friendica f1eafbf47d core fixes to allow statusnet connector to work 2014-05-06 19:17:06 -07:00
friendica 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
friendica abf0dd5ecf log pickups 2014-05-05 20:15:01 -07:00
friendica 45ce3f4b13 You wouldn't think we need this text, but we really do. 2014-05-05 19:45:30 -07:00
friendica 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
friendica 1fa8bc12e5 try again 2014-05-05 18:49:58 -07:00
friendica 2949030461 revert 2014-05-05 18:38:11 -07:00
friendica f0653ace22 improved cookie security 2014-05-05 18:35:02 -07:00
friendica 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
friendica 94b2ac6abb put permissions dialog inside the form element - should fix issue #444 2014-05-05 16:03:38 -07:00
friendica cea62a0e73 Merge https://github.com/friendica/red into pending_merge 2014-05-05 14:20:30 -07:00
friendica 87aa7446e4 minor text change. 2014-05-05 14:20:09 -07:00
marijus 9df61273db fix some issues with nav-tabs overrides and make their background transparent 2014-05-05 21:58:58 +02:00
jeroenpraat e0b0c58851 Height auto or mini-height 120px. The latter. 2014-05-05 13:59:39 +00:00