Commit Graph

  • 11e8fe3085 more work on photos marijus 2014-10-20 15:05:33 +02:00
  • fc12123329 missing custom/ description habeascodice 2014-10-20 04:49:44 -07:00
  • c909b8be06 don't auto-archive connections we can't poll. friendica 2014-10-19 21:41:38 -07:00
  • e414ed7782 link tag closed prematurely friendica 2014-10-19 21:34:31 -07:00
  • 8227be0ab0 show true author of wall-to-wall comments to Diaspora viewers just like we did for wall-to-wall posts. friendica 2014-10-19 19:20:25 -07:00
  • fd492386bf Tried this once before but had to revert. Basically prevent a comment from being relayed more than once - as it's a huge drain on resources. But last time I tried this, wall-to-wall comments stopped getting relayed. This checkin should do the right thing in both conditions. friendica 2014-10-19 17:31:10 -07:00
  • 26d626efe5 Merge https://github.com/friendica/red into pending_merge friendica 2014-10-19 16:13:39 -07:00
  • bae3029c63 merge madness friendica 2014-10-19 16:12:05 -07:00
  • 6d3619c8b1 string update friendica 2014-10-19 16:08:21 -07:00
  • 88d63d1b77 new doc added to doc checkin friendica 2014-10-19 15:55:22 -07:00
  • 478e7c4479 doc updates friendica 2014-10-19 15:54:51 -07:00
  • e8be2ff8da wall-e random signature failures friendica 2014-10-19 15:54:20 -07:00
  • cfd59a9c1b Merge pull request #650 from pafcu/master RedMatrix 2014-10-20 08:54:15 +11:00
  • 281e1fbf6a Merge pull request #651 from 23n/master Thomas Willingham 2014-10-19 22:46:44 +01:00
  • eb05a7f39a edit me 23n 2014-10-19 22:04:27 +02:00
  • 6ee514579f Move registration button to before login in nav to avoid problems with mobile. In the long run a better fix should be found. Stefan Parviainen 2014-10-19 21:08:53 +02:00
  • fe877b68aa Seventy five people you won't believe contributed to RedMatrix! Thomas Willingham 2014-10-19 17:09:06 +01:00
  • 5ded3d5247 Merge pull request #649 from pafcu/master RedMatrix 2014-10-19 20:40:56 +11:00
  • a6c4ae186e Don't display date format, it's already in the placeholder text Stefan Parviainen 2014-10-19 11:09:51 +02:00
  • 519ef48500 Changes in the datetimesel api, prevent user from picking event end date earlier than start date Stefan Parviainen 2014-10-19 10:47:42 +02:00
  • d9817779fb Give an error if event is supposed to end before it starts. Closes friendica/red#534 Stefan Parviainen 2014-10-19 08:33:18 +02:00
  • fb183a29b9 Merge pull request #646 from pafcu/master RedMatrix 2014-10-19 08:53:49 +11:00
  • 7c4f55af9f Oops, forgot one file Stefan Parviainen 2014-10-18 22:17:49 +02:00
  • 7e091c05a1 Initial stab at better general datetime picker Stefan Parviainen 2014-10-18 15:04:47 +02:00
  • e5a17b5d77 Doco - if I ever have to touch dozens of files to change one link again, I'll stab someone - so make sure we don't have to. Thomas Willingham 2014-10-17 17:42:34 +01:00
  • 17d23a52e2 Policy Thomas Willingham 2014-10-17 17:16:53 +01:00
  • 0950f90e66 New util/messages.po Jeroen 2014-10-17 14:19:38 +00:00
  • 5cd6965eef Remote login > Remote authentication as discussed Jeroen 2014-10-17 14:00:58 +00:00
  • 7e2a11ddde oups... forgot to remove some debug stuff marijus 2014-10-17 14:32:44 +02:00
  • fd48d4d81d make lockview for photos work marijus 2014-10-17 14:28:21 +02:00
  • 7bbe700f3f mark signature forgeries friendica 2014-10-16 16:19:19 -07:00
  • 8391e8b1a1 Merge pull request #645 from pafcu/master RedMatrix 2014-10-17 09:43:36 +11:00
  • f290c4b1e4 Merge branch 'master' of https://github.com/friendica/red marijus 2014-10-16 22:53:04 +02:00
  • 1ee2b631db lighttpd sample conf security enhancement marijus 2014-10-16 22:52:28 +02:00
  • e425def2a2 Merge branch 'master' of https://github.com/pafcu/red Stefan Parviainen 2014-10-16 21:37:14 +02:00
  • 6867a8a7f6 Login menu Stefan Parviainen 2014-10-16 17:21:37 +02:00
  • 865f804cfb Merge pull request #1 from friendica/master pafcu 2014-10-16 16:06:20 +03:00
  • e1f88fd15d jsonp support (thankxs fabrixxm) friendica 2014-10-16 02:02:11 -07:00
  • d4abc91d1f Merge https://github.com/friendica/red into pending_merge friendica 2014-10-15 18:36:48 -07:00
  • 4cbe696859 remove log statement friendica 2014-10-15 18:36:36 -07:00
  • ae9e1fa688 missing event permissions friendica 2014-10-15 18:35:56 -07:00
  • 4af0b717de Merge branch 'master' of https://github.com/friendica/red Thomas Willingham 2014-10-16 01:58:17 +01:00
  • 11ad127c68 Let's not play security expert. Use Mozillas recommended server config, even if it's ridiculously verbose. Reasoning - they make the browser, so if they've got it wrong, you're buggered anyway. Thomas Willingham 2014-10-16 01:57:04 +01:00
  • e80c20d258 Don't recognise hashtags starting with #, e.g. ### friendica 2014-10-15 17:55:20 -07:00
  • 80eb84e843 Merge remote branch 'upstream/master' habeascodice 2014-10-15 17:29:38 -07:00
  • 084468670b Merge branch 'master' of https://github.com/habeascodice/red habeascodice 2014-10-15 17:26:48 -07:00
  • cf58122b29 Merge remote branch 'upstream/master' habeascodice 2014-10-15 17:26:07 -07:00
  • 1eb478ba54 SSL is broken you say? Well bah gum. Thomas Willingham 2014-10-16 00:47:02 +01:00
  • 997ec0911c $comments > $commentbox marijus 2014-10-15 22:41:42 +02:00
  • 04a254d94a some work on single photo view comments marijus 2014-10-15 22:23:38 +02:00
  • dc23030dcb one more item_id > id marijus 2014-10-15 21:17:07 +02:00
  • 0c2d9edd83 it seems we do not have an key called item_id here so must be id only marijus 2014-10-15 21:15:20 +02:00
  • aa0aa22b8a chanman is now 'locs' and a couple of post handlers have been defined. friendica 2014-10-14 20:33:38 -07:00
  • 65b84e839a back to wrestling with the !@#$ diaspora recursive reshare from hell friendica 2014-10-14 18:47:08 -07:00
  • 5362943330 missing quote friendica 2014-10-14 18:05:32 -07:00
  • 2db7d88e28 this is the reason Diaspora forum tagging was broken friendica 2014-10-14 18:02:34 -07:00
  • 903f7e73fb if a hubloc primary change results in an xchan primary change, create a directory update packet. friendica 2014-10-13 21:44:46 -07:00
  • 0057612a9f figuring out how to bootstrap the change_primary procedure when all you have is inconsistent data which you think you trust. friendica 2014-10-13 21:38:36 -07:00
  • 79684e05cc fix import sql error friendica 2014-10-13 21:24:06 -07:00
  • 19e1b95837 don't use cached data friendica 2014-10-13 21:01:51 -07:00
  • bd4dd85fbb there's the problem friendica 2014-10-13 20:53:34 -07:00
  • 8a907a789f more diagnostic when changing primary friendica 2014-10-13 17:59:03 -07:00
  • 3d56bb5cd7 this bug has been there for a *long* time. First time I've ever seen it triggered. friendica 2014-10-13 16:21:02 -07:00
  • b740baf6a9 Merge https://github.com/friendica/red into pending_merge friendica 2014-10-13 16:13:13 -07:00
  • 6503b91131 sql friendica 2014-10-13 16:12:32 -07:00
  • b9457c06af Merge pull request #638 from dawnbreak/RedDAV RedMatrix 2014-10-14 09:40:43 +11:00
  • 8710496689 Merge https://github.com/friendica/red into pending_merge friendica 2014-10-13 15:28:40 -07:00
  • 1b0390af06 new function hubloc_change_primary() friendica 2014-10-13 15:27:03 -07:00
  • bc2ad74813 When you delete something in /cloud stay in the right folder. Klaus Weidenbach 2014-10-14 00:08:55 +02:00
  • 1eefed0333 Merge pull request #637 from tuscanhobbit/dev RedMatrix 2014-10-14 06:36:35 +11:00
  • 9f95162593 one more hidden config tuscanhobbit 2014-10-13 21:29:47 +02:00
  • 9dc3b01959 Merge from master tuscanhobbit 2014-10-13 21:19:07 +02:00
  • 240cbc8798 Merge from origin tuscanhobbit 2014-10-13 21:18:59 +02:00
  • a7aa4efc08 Merge branch 'master' of https://github.com/friendica/red marijus 2014-10-13 12:52:41 +02:00
  • c41f314302 really fix connedit > collection > checkbox marijus 2014-10-13 12:52:21 +02:00
  • e4880d07d2 Merge remote branch 'upstream/master' habeascodice 2014-10-13 03:22:26 -07:00
  • 0c5408e22b Merge remote branch 'upstream/master' habeascodice 2014-10-13 03:22:01 -07:00
  • a512d1a4aa tinymce still seems to be referenced. Can't quite get rid of it. friendica 2014-10-13 03:15:03 -07:00
  • 8d27482374 Merge https://github.com/friendica/red into pending_merge friendica 2014-10-13 03:08:58 -07:00
  • 7abaccaf7f bring back PM upload functionality and why oh why are we still loading tinymce? friendica 2014-10-13 03:07:36 -07:00
  • 8406046c5b fix connedit > collection > checkbox position also for webkit - this will need a better solution though marijus 2014-10-13 11:58:49 +02:00
  • 6e238ce5af context check friendica 2014-10-12 21:59:22 -07:00
  • 41b74dd7ac diaspora_send_status() - recalculate markdown translation to pickup any later message changes after original submission like wall-to-wall attributions for instance. Normally this would've come from our cached version which was stored prior to tag_deliver being run and therefore isn't yet aware that wall-to-wall status may have changed after delivery. friendica 2014-10-12 21:20:08 -07:00
  • 084cddb32c Merge https://github.com/friendica/red into pending_merge friendica 2014-10-12 18:00:01 -07:00
  • 1f976fbfe6 bit of cleanup of hidden_configs. This is a start - we've got hundreds more. friendica 2014-10-12 17:59:03 -07:00
  • b1ea4f9e11 Merge pull request #636 from dawnbreak/RedDAV RedMatrix 2014-10-13 09:59:01 +11:00
  • 1dfd74fe39 Merge https://github.com/friendica/red into pending_merge friendica 2014-10-12 15:20:22 -07:00
  • 718bea5d45 cleanup of sync_locations and better logging. There was one significant code change but it is unrelated to current issues, basically if no primary was set we were setting everything as primary. friendica 2014-10-12 15:18:49 -07:00
  • 5aae5862f2 A fix, but I have no case to verify. Klaus 2014-10-12 21:10:04 +02:00
  • 030175bde6 fix connedit > collection > checkbox position marijus 2014-10-12 14:31:51 +02:00
  • 4bf758cc5b content deletion issue friendica 2014-10-12 01:40:48 -07:00
  • 56f6f696bd Merge pull request #6 from tuscanhobbit/master Paolo T 2014-10-12 09:15:39 +02:00
  • 44c4c9c5c2 Merge pull request #4 from friendica/master Paolo T 2014-10-12 09:07:35 +02:00
  • dc4593f5b5 Moved classes from reddav.php into own files. Klaus Weidenbach 2014-10-12 00:33:37 +02:00
  • fd00a24957 Some more previously undocumented configs. Thomas Willingham 2014-10-11 18:37:07 +01:00
  • 82232c6916 Show tag in siteinfo. Not useful for us, quite useful for admins. Thomas Willingham 2014-10-11 17:24:58 +01:00
  • b84b2d5aa5 FFS, another oops Thomas Willingham 2014-10-11 16:19:36 +01:00
  • d46fd7917f Fix webpages. Sycning between too many codebases... Thomas Willingham 2014-10-11 16:18:15 +01:00
  • d196e71962 Also that doesn't work anymore - prettyPhoto relic Thomas Willingham 2014-10-11 15:48:30 +01:00
  • 2b472b2b48 Give Redbasic the -styled back Thomas Willingham 2014-10-11 15:45:00 +01:00