Commit Graph

  • 607d05e48f rev update friendica 2013-04-26 15:06:40 -07:00
  • 24492f271b Merge pull request #49 from beardy-unixer/master friendica 2013-04-26 15:03:52 -07:00
  • 2f43553542 Unbork smarty templates. Thomas Willingham 2013-04-26 23:00:10 +01:00
  • 6383203ebc Stupid mistake Thomas Willingham 2013-04-26 22:45:20 +01:00
  • 60721f4292 Colorbox Thomas Willingham 2013-04-26 22:31:50 +01:00
  • 72e83f69bc photo driver abstraction friendica 2013-04-25 20:01:24 -07:00
  • d3b5e67890 odds and ends in prepearation for photo abstraction, plus red-to-friendica addon friendica 2013-04-25 01:55:35 -07:00
  • 9d564913f6 dba driver cleanup friendica 2013-04-23 04:52:03 -07:00
  • 9bff33f112 remove old driver friendica 2013-04-22 21:40:33 -07:00
  • 150b18005a cleanup debugging code in abstracted db driver friendica 2013-04-22 21:14:11 -07:00
  • 552f03122c db abstraction layer friendica 2013-04-22 20:02:21 -07:00
  • 7621bd3bb1 reverting to fancybox for "save to file" selection box until we find a better way - prettyPhoto just isn't working for this and I really need this functionality ATM until we can figure out how to make prettyPhoto work properly here. friendica 2013-04-21 22:12:18 -07:00
  • 868a1877d2 sql error on contact removal friendica 2013-04-19 04:47:49 -07:00
  • 9e22ec928b more umbilical cutting friendica 2013-04-18 21:06:31 -07:00
  • 0fbb3b6a97 for directory sync, ensure we have a fallback master; even if we have nothing else friendica 2013-04-18 20:47:35 -07:00
  • 2679a5990e small issue with zid returning incorrect result on your own channel link friendica 2013-04-18 19:11:28 -07:00
  • db038c5654 turn naked links in posts into zrl's if we've got a hubloc for the site friendica 2013-04-18 17:55:35 -07:00
  • ba1cb0bb05 move js from module to to module-specific js file friendica 2013-04-17 22:45:22 -07:00
  • e99b9376a0 poke doco and cleanup friendica 2013-04-17 22:44:53 -07:00
  • c2fe3fd8fe poke bugfix friendica 2013-04-17 22:15:38 -07:00
  • 5f27e29bb8 basic poke working friendica 2013-04-17 21:40:40 -07:00
  • 4d5eade991 That was a bit premature. I'll hold these for now until they're more production ready. friendica 2013-04-17 18:55:26 -07:00
  • 3e1b005de0 start of DB driver abstraction class (we'll need similar mechanisms for the GD/ImageMagick photo stuff and perhaps also for abstracting alternate "social networks") friendica 2013-04-17 01:47:36 -07:00
  • f72d351224 Merge branch 'master' into photothread friendica 2013-04-16 20:16:44 -07:00
  • 23f897b8ae fix marking events seen friendica 2013-04-16 19:59:12 -07:00
  • 2217a3033d oops friendica 2013-04-16 16:41:08 -07:00
  • 3c89d3160a add Red detection to parse_url friendica 2013-04-16 16:39:38 -07:00
  • 5c43c57ce1 doc update friendica 2013-04-16 16:23:35 -07:00
  • 2ccb8c2e2b more doco friendica 2013-04-16 16:22:37 -07:00
  • 36bfe90882 update doco friendica 2013-04-16 16:05:05 -07:00
  • 6f24c7cb27 zid fixes friendica 2013-04-16 16:03:41 -07:00
  • 97957e0c1b Merge pull request #48 from beardy-unixer/master friendica 2013-04-15 22:01:47 -07:00
  • 6e2e8f101a Uncripple zids. Thomas Willingham 2013-04-16 05:52:10 +01:00
  • b17cadfd0e Merge pull request #47 from beardy-unixer/master friendica 2013-04-15 20:47:08 -07:00
  • dc80dce95e Fix acl Thomas Willingham 2013-04-16 04:20:29 +01:00
  • 6de5adf0ba fix settable page titles after Red page re-org long ago. friendica 2013-04-15 18:32:02 -07:00
  • 7e6890832b turn all Red links into zrls (not the old zrls, the new bbcode zrl which means we can zidify them) friendica 2013-04-15 03:00:08 -07:00
  • ab5151c470 more Friendica removals friendica 2013-04-14 22:44:11 -07:00
  • 0ce6955889 template update friendica 2013-04-14 22:30:06 -07:00
  • 53c69a17c5 more cleanup friendica 2013-04-14 22:28:45 -07:00
  • b84d8bfbc9 begin to cut the umbilical friendica 2013-04-14 22:24:47 -07:00
  • e411a4bdc2 IMPORTANT: magic-auth protocol update, plus 'zrl' bbcode tag for the privacy-is-more-important-than-ease-of-use folks. friendica 2013-04-14 20:41:58 -07:00
  • 2942155797 Merge https://github.com/friendica/red into zpull friendica 2013-04-10 23:06:11 -07:00
  • 15ceaeb624 magic auth doco friendica 2013-04-10 23:00:41 -07:00
  • 02aa9d3ba0 Merge pull request #46 from omigeot/misc-fixes friendica 2013-04-10 18:45:58 -07:00
  • 2941925782 Upgraded jQuery to 1.9.1, including jQuery Migrate (for the sake of keeping old code working) and upgrade Fullcalendar (because Migrate just wasn't enough for him). Olivier Migeot 2013-04-10 13:15:09 +02:00
  • 17870912e4 document the ability to provide a selective magic-auth filter as a plugin plugin friendica 2013-04-08 20:57:36 -07:00
  • 3e7e0a3c43 some work on updating photo threads for Red friendica 2013-04-08 17:23:26 -07:00
  • f5940b7ddb modify linkify to work correctly with Red mid's containing '@' friendica 2013-04-08 16:58:52 -07:00
  • 989e78137e wrapper function to create arbitrary activities (e.g. for plugins and apps) with a minimal amount of fuss, though the amount of fuss could increase significantly depending on the nature of the activity. For a simple wall post, just set the $arr['body'] to the desired text and we'll do the rest. If the activity requires special verbs, objects or targets, these will all need to be constructed. friendica 2013-04-04 18:54:24 -07:00
  • 6e17be3e85 Merge https://github.com/friendica/red into zpull friendica 2013-04-03 18:06:16 -07:00
  • f353b9ae3d liking comments were reverted to liking the parent after sending item to another channel friendica 2013-04-03 18:04:48 -07:00
  • 0ba7f76bfd Merge pull request #45 from beardy-unixer/master friendica 2013-04-03 17:34:55 -07:00
  • c10e30631a missed channel_default_group key nrename friendica 2013-04-03 15:51:56 -07:00
  • cecf3687bb rev update friendica 2013-04-03 15:48:25 -07:00
  • 2f24bf2efe New mail_list template. Thomas Willingham 2013-03-31 21:05:20 +01:00
  • 3d714638b3 Merge remote-tracking branch 'upstream/master' Thomas Willingham 2013-03-29 20:48:12 +00:00
  • 6803265eba Typo in page_display Thomas Willingham 2013-03-29 20:38:59 +00:00
  • 8741bb20e8 Make prettyPhoto a feature, add slideshow for albums. Thomas Willingham 2013-03-29 20:36:39 +00:00
  • ef09e50514 Merge pull request #44 from beardy-unixer/c8852d455e77624baf9e6ac852c1176f45462e70 friendica 2013-03-28 14:55:50 -07:00
  • fbb4dc69c6 Merge remote-tracking branch 'upstream/master' Thomas Willingham 2013-03-28 21:16:25 +00:00
  • c8852d455e Template clean up. Thomas Willingham 2013-03-28 21:13:18 +00:00
  • d0bf459721 clarify friendica 2013-03-27 20:36:23 -07:00
  • f48510432a updated readme friendica 2013-03-27 20:32:37 -07:00
  • 810a60b912 add new connections to default group (if any) friendica 2013-03-27 19:35:34 -07:00
  • 8148b7c32f update manage table and some documentation friendica 2013-03-27 19:02:01 -07:00
  • ca605a8c83 more doco friendica 2013-03-26 19:53:04 -07:00
  • abd58bce68 set hidden flags on new directory entries, not just existing ones friendica 2013-03-26 19:37:33 -07:00
  • 63c6427dc4 magic auth issue friendica 2013-03-26 16:20:44 -07:00
  • 783d744f02 we don't need this any more friendica 2013-03-25 21:39:34 -07:00
  • 884812bcba doco friendica 2013-03-25 21:32:12 -07:00
  • d0133d6f87 uri to mid friendica 2013-03-25 13:01:48 -07:00
  • fecc7bfad4 Merge pull request #43 from beardy-unixer/master friendica 2013-03-25 12:59:50 -07:00
  • fb8a0e06c4 Updated build_query for mid Thomas Willingham 2013-03-25 19:20:12 +00:00
  • 23cd14329d fix mod_display breakage. friendica 2013-03-24 19:51:23 -07:00
  • 5e47a8a14a descriptive text friendica 2013-03-23 16:18:44 -07:00
  • 85d1300889 Merge https://github.com/friendica/red into zpull friendica 2013-03-23 16:18:16 -07:00
  • 0c5d7cbfae Merge pull request #42 from beardy-unixer/master friendica 2013-03-23 16:17:55 -07:00
  • ab4058eb1a rev update friendica 2013-03-23 16:03:08 -07:00
  • 43af9b1429 Merge remote-tracking branch 'upstream/master' Thomas Willingham 2013-03-23 21:19:54 +00:00
  • 4b6bc77977 Implement prettyPhoto (somewhat). Thomas Willingham 2013-03-23 21:17:44 +00:00
  • 2dafe2952d Remove Twatter/Facebook shit. Thomas Willingham 2013-03-23 21:14:03 +00:00
  • 6b3fb662cb Add prettyPhoto library. Thomas Willingham 2013-03-23 20:12:42 +00:00
  • d9b51c6db5 Redbasic - get rid of max-height for images (got lost in the merge last time it was fixed) Thomas Willingham 2013-03-23 15:58:21 +00:00
  • 0999b88a48 Merge https://github.com/friendica/red into zpull friendica 2013-03-21 18:29:08 -07:00
  • ddf5bf8968 rename 'uri' (and parent_uri) to 'mid' (and parent_mid) since these no longer remotely resemble uri's and are actually message_id's. This change is potentially destabilising because it touches a lot of code and structure. But it has to get done and there's no better time than the present. friendica 2013-03-21 18:25:41 -07:00
  • fe87e7f972 Merge pull request #41 from unary/events friendica 2013-03-21 18:24:41 -07:00
  • fea2f9ac9b small fixes for events Michael Johnston 2013-03-19 00:29:59 -04:00
  • b3c699d49a support various and multiple content_types on the display side - still have some work to do on the posting side. friendica 2013-03-21 16:14:08 -07:00
  • c3590f6454 Merge https://github.com/friendica/red into zpull friendica 2013-03-21 15:41:23 -07:00
  • b3417e4854 main_slider hook friendica 2013-03-21 15:41:00 -07:00
  • 02eb9aa521 update for js_upload friendica 2013-03-21 15:30:51 -07:00
  • 7dfdc4fba7 Merge pull request #40 from MicMee/master friendica 2013-03-21 12:52:43 -07:00
  • c1f3c72099 otherwise add profile wont work Michael Meer 2013-03-21 18:38:34 +01:00
  • d9492a4a76 Merge https://github.com/friendica/red into zpull friendica 2013-03-21 02:21:56 -07:00
  • 4b22c6e531 update friendica 2013-03-21 02:21:44 -07:00
  • 6db6f6640e Merge pull request #38 from beardy-unixer/master friendica 2013-03-21 02:20:32 -07:00
  • 6a82fd609a Merge pull request #39 from zzottel/master friendica 2013-03-21 01:30:16 -07:00
  • 166596939b write notify settings to channel table when saving settings zottel 2013-03-21 09:02:10 +01:00
  • 06c5d0fcc2 Typo Thomas Willingham 2013-03-21 04:18:03 +00:00