Commit Graph

  • b7992a5544 Update Swedish email templates Erik Lundin 2014-04-19 00:05:13 +02:00
  • fdcb6052fc Merge branch 'master' of https://github.com/friendica/red Thomas Willingham 2014-04-18 16:35:31 +01:00
  • 4e0b85267a We know why third party zids didn't work now, so don't use hacky workarounds anymore. Thomas Willingham 2014-04-18 16:34:48 +01:00
  • 2ac7fb49b6 This should fix the preview allignment permantly. jeroenpraat 2014-04-18 15:08:16 +00:00
  • 59eb3b3351 Little fix and previous fix on a different place jeroenpraat 2014-04-18 12:57:42 +00:00
  • d2b5bb843f more optimisations for discovery mode of zotfeed friendica 2014-04-17 22:06:35 -07:00
  • ac07b1b0ae Merge https://github.com/friendica/red into pending_merge friendica 2014-04-17 20:07:02 -07:00
  • 30e2e32f19 improve zotfeed for discover channel so it will send updates to posts you've already received. Incidentally I discovered why we had the meltdown replying to discover channel items the other day - but can't fix it easily. friendica 2014-04-17 20:03:28 -07:00
  • e2379f2359 Add Swedish .po file and update strings Erik Lundin 2014-04-17 17:57:26 +02:00
  • c463eb932c tiny fix hover preview button jeroenpraat 2014-04-17 20:46:14 +00:00
  • ca5f7ef446 Last 3 dropdown menus fixed for dark schema. Dark schema completed (by now). jeroenpraat 2014-04-17 15:18:53 +00:00
  • 083cf12d48 Merge https://github.com/friendica/red into pending_merge friendica 2014-04-17 01:36:17 -07:00
  • 8dcf9e78e1 This preserves the alignment work done earlier but provides a more aesthetically pleasing page. friendica 2014-04-17 01:33:44 -07:00
  • 0d0751b925 Merge branch 'master' of https://github.com/friendica/red jeroenpraat 2014-04-17 05:46:45 +00:00
  • 962665b8b5 saved search adjustments friendica 2014-04-16 21:46:06 -07:00
  • be498be840 a few more alignment issues friendica 2014-04-16 21:08:43 -07:00
  • f191637ffa clean up the group selector on the connedit page friendica 2014-04-16 20:33:15 -07:00
  • 9be4cd4dcd Lots of positional changes on sidebar menus - reduce indented margins friendica 2014-04-16 20:28:23 -07:00
  • acc70b9deb fixing widgets friendica 2014-04-16 20:09:19 -07:00
  • d26a433a5e Merge https://github.com/friendica/red into pending_merge friendica 2014-04-16 18:36:26 -07:00
  • c7712d3b45 bug fixes after widget cleanup friendica 2014-04-16 18:35:37 -07:00
  • 558e283260 button cleanup directory page friendica 2014-04-16 18:28:36 -07:00
  • 433d964dd5 this makes conversations look a lot better friendica 2014-04-16 18:07:33 -07:00
  • 3a96691e29 Doc - missing closing tag Thomas Willingham 2014-04-17 01:19:58 +01:00
  • 3f98d57fdd Merge pull request #415 from encyclomundi/master Thomas Willingham 2014-04-17 01:17:49 +01:00
  • 51d7be6f24 added "network" as another user group for davfs Charles 2014-04-16 17:12:49 -07:00
  • 2d86c7317c rev update friendica 2014-04-16 16:42:27 -07:00
  • 1b0bf90d13 first cut - straighten out the margins friendica 2014-04-16 16:41:44 -07:00
  • 68545ceeb6 Dark schema: fixed code view, ACL window and preview jeroenpraat 2014-04-16 21:51:13 +00:00
  • 9589d12c93 Doco - Add some troubleshooting for 0 byte files in Davfs2 Thomas Willingham 2014-04-16 18:50:48 +01:00
  • 077296ccf1 Merge pull request #414 from jeroenpraat/patch-2 RedMatrix 2014-04-16 17:39:51 +10:00
  • 925c63343e The comment submit button seems to have drifted into some strange place friendica 2014-04-15 21:36:51 -07:00
  • e0cccb4cc2 Merge https://github.com/friendica/red into pending_merge friendica 2014-04-15 18:36:05 -07:00
  • 1eb8e570bf tag anyone friendica 2014-04-15 18:35:22 -07:00
  • b0dc9f13ed Merging in conflict sirius 2014-04-16 00:40:01 +02:00
  • 16db393495 Needed for large update dark schema and minor fixes default. jeroenpraat 2014-04-15 21:35:30 +02:00
  • 74ec0530f6 Needed for large update dark schema. jeroenpraat 2014-04-15 21:33:26 +02:00
  • bef2d26484 Large update dark schema jeroenpraat 2014-04-15 21:29:03 +02:00
  • efe80bb8e9 minor css fix marijus 2014-04-15 20:48:15 +02:00
  • 9026ea649a better mapping of visible connections friendica 2014-04-14 17:29:19 -07:00
  • dc9a06ed37 Merge https://github.com/friendica/red into pending_merge friendica 2014-04-14 16:55:57 -07:00
  • 506ae56385 Better handling of restricted /channel and /profile permissions. We will show the name, profile photo and a 'connect' button if appropriate on these pages regardless of permissions. A blank page makes it difficult for folks to figure out how to connect and if it is their real life friend 'x' or not. It also matches our overall policy (adopted from Facebook's lessons learned) that the channel name and default profile photo are always visible and can't really be blocked without messing up the usability of the entire network. This also makes sure that a connect button can be found somewhere besides the directory - where the entry could be blocked; and avoid somebody having to figure out the webbie and find the link to "follow" (another related issue). friendica 2014-04-14 16:45:16 -07:00
  • 02c08d0cda fixes rconnect button for bs-default scheme marijus 2014-04-14 21:47:00 +02:00
  • d371ad3da7 a small fix for bs-default scheme marijus 2014-04-14 21:10:48 +02:00
  • bf8f5d5b2b directory: make "connect" more prominent, but this ultimately needs more theme work. friendica 2014-04-14 02:37:04 -07:00
  • 4feeacb51b until we can figure out how to allow commenting on the discover page without killing the matrix, just turn it off. friendica 2014-04-13 20:26:20 -07:00
  • bc041bdb77 profperm: abook_profile was being handled by profile id rather than profile_guid, causing private profiles to not be activated in many cases. friendica 2014-04-13 19:57:47 -07:00
  • 769b0f6bc9 Often somebody will join the matrix with a dodgy cert and we'll sort that out but their profile photo will remain rainbow man (or the site default). However the photo_date has been updated so we won't try again. This checkin looks for such a failure and leaves the photo_date alone if the photo import failed. friendica 2014-04-13 18:30:06 -07:00
  • 73f459b68d Merge https://github.com/friendica/red into pending_merge friendica 2014-04-13 18:08:15 -07:00
  • e3aa7d2aaf only show forum tags on contact autocomplete, not in the ACL selector friendica 2014-04-13 18:07:19 -07:00
  • 08435e5b1a minor alignment issues friendica 2014-04-13 16:07:47 -07:00
  • 8b8feea12f Added hackish support for permissions-sync between profile and profile-pictures sirius 2014-04-14 00:45:24 +02:00
  • 153cc599a3 Merge pull request #411 from beardy-unixer/master Thomas Willingham 2014-04-13 19:27:19 +01:00
  • abcd835bf0 Tony has been near the Git again. Thomas Willingham 2014-04-13 19:25:41 +01:00
  • 581e999f6c Merge pull request #407 from tonybaldwin/master RedMatrix 2014-04-13 18:16:37 +10:00
  • fe1ecbd012 Merge pull request #408 from beardy-unixer/master RedMatrix 2014-04-13 18:16:04 +10:00
  • dc1a529b63 remove extra tag logging friendica 2014-04-12 23:57:19 -07:00
  • 4fda10db2f don't match quote remnants friendica 2014-04-12 17:04:54 -07:00
  • d7aaff459f let normal hashtags be quoted strings also friendica 2014-04-12 16:58:19 -07:00
  • 5cb7e48dad major cleanup of handle_tag() friendica 2014-04-12 15:53:52 -07:00
  • cdc8454cf1 Update sabre Thomas Willingham 2014-04-12 18:13:37 +01:00
  • 9919d109fd added breaks after added bbcode spoiler line tony baldwin 2014-04-12 08:44:28 -04:00
  • e8de088037 added spoiler tag to bbcode help doc tony baldwin 2014-04-12 08:40:48 -04:00
  • ebd33b185d Merge remote-tracking branch 'upstream/master' tony baldwin 2014-04-12 08:37:56 -04:00
  • 2d9ab91e9f Merge branch 'master' into prvtag friendica 2014-04-12 03:45:46 -07:00
  • d0834c7e13 Merge https://github.com/friendica/red into pending_merge friendica 2014-04-12 03:32:58 -07:00
  • c93353c0a3 we seem to have lost any install text mentioning that subdirs and alternate ports aren't supported friendica 2014-04-12 03:31:55 -07:00
  • 567b5d053d handle new tag declarations friendica 2014-04-12 03:31:24 -07:00
  • 71929c6caa add forum mode to tag handling friendica 2014-04-12 00:56:04 -07:00
  • aa5054d5ba this is looking better, call the forum version of a tag "foobar network", besides altering the icon friendica 2014-04-12 00:41:36 -07:00
  • 2212ddb913 use icons for identification friendica 2014-04-11 23:54:11 -07:00
  • 47096df97e not quite right but I need to check it in so I can switch branches friendica 2014-04-11 20:35:25 -07:00
  • 2b3697c27a the auto-complete part friendica 2014-04-11 20:12:40 -07:00
  • f93b56de55 no this is the way to do it friendica 2014-04-11 20:00:34 -07:00
  • c7d6179a0f Use @+ to tag a forum and also restrict the post to the forum, this leaves @! tags private - period. friendica 2014-04-11 16:31:48 -07:00
  • 163c83a9e5 Ooops, replaced too many Thomas Willingham 2014-04-12 00:11:43 +01:00
  • a82b1fe590 Revert to prepare_text, use bbcode only for with Thomas Willingham 2014-04-12 00:08:50 +01:00
  • 8b39b5ae4e via Mario: default channel permissions not working on channel page friendica 2014-04-11 15:51:25 -07:00
  • 7e6804b599 make sure we can find that function friendica 2014-04-11 15:14:01 -07:00
  • 202582cbd6 we also need a loop breaker friendica 2014-04-11 15:08:40 -07:00
  • df7c2afc68 Merge pull request #405 from beardy-unixer/master RedMatrix 2014-04-12 07:20:44 +10:00
  • aa1f5ce753 Merge pull request #404 from git-marijus/master RedMatrix 2014-04-12 07:20:24 +10:00
  • 0a871c3f14 Merge https://github.com/friendica/red into pending_merge friendica 2014-04-11 14:02:45 -07:00
  • e10509e2bd soft revert 9bb7811 until we can look at it more closely. friendica 2014-04-11 14:01:33 -07:00
  • 2677ee0b49 doc update friendica 2014-04-11 14:01:22 -07:00
  • 2fdcd0c27e Never set background or color unless you set both. If this is needed in future, it should probably be reimplmented with the class anyway. Thomas Willingham 2014-04-11 20:02:52 +01:00
  • 81b06754a4 Don't count deleted channels when figuring out where to send a user on login. Thomas Willingham 2014-04-11 15:11:22 +01:00
  • 3197ccbf5e bootstrapify aclselector marijus 2014-04-11 16:06:39 +02:00
  • 4582b8dd64 Bring BBCode to profiles Thomas Willingham 2014-04-11 14:54:07 +01:00
  • 742e2686ca Don't explicitly deny our strongest features existence. Thomas Willingham 2014-04-11 14:53:18 +01:00
  • 93a56db391 Merge pull request #403 from tuscanhobbit/master Paolo T 2014-04-11 14:23:52 +02:00
  • a36d1d5e92 IT: strings updated Paolo Tacconi 2014-04-11 14:22:27 +02:00
  • e64ec31a9d add the message-id to delivery reports. This _could_ allow an enterprising developer to collect the delivery reports for a given post and store them in a DB table so that the sender could track and verify where a message had been sent on a web page and verify the success or failure of those attempts without requiring admin access. (To be fair this would also need an extra flag which hasn't yet been implemented to indicate that a channel created a second delivery chain of the message). friendica 2014-04-10 22:17:35 -07:00
  • fb88544ae4 Merge https://github.com/friendica/red into pending_merge friendica 2014-04-10 18:50:33 -07:00
  • a798dd767d push notes widget updates to channel clones on focusout (final save). Don't do this for the auto-save events (every ten seconds) which could generate superfluous network traffic. friendica 2014-04-10 18:46:22 -07:00
  • feb3a81623 Merge pull request #402 from sasiflo/master RedMatrix 2014-04-11 11:23:13 +10:00
  • 9bb7811d74 Discover page: when importing public items, alter the item so that it has the characteristics of one that was sourced by the sys channel instead of just being stored under the sys channel uid. This should allow comments and likes to flow upstream if permissions allow and may fix issue #398. Permission may still be denied by the original poster, but without this the comment/like is treated as a forgery and is blocked from transmission. friendica 2014-04-10 18:06:09 -07:00
  • a49069db4e move the deleted flag setting to encode_item_flags() where it belongs now that we aren't giving deleted posts special treatment. friendica 2014-04-10 16:26:27 -07:00
  • bf1f18e172 Include the entire original item when notifying other channels of deletions as it contains important routing and scope information. Previously we were only sending a couple of critical fields like the message-id, flags, and creation date. The thinking was that it is deleted, let's not resend the deleted contents anywhere. But in order to route this through the same path the original post took we really need the entire original post with all of its baggage attached. friendica 2014-04-10 16:14:19 -07:00
  • f16fc1eb4f Added some more details about why browser-valid SSL certificates must be used when SSL is used at all. sasiflo 2014-04-10 23:41:18 +02:00