Commit Graph

  • 86cb638637 notification issue on wall-to-wall posts friendica 2012-07-11 02:58:57 -07:00
  • 3076f838f6 Merge https://github.com/friendica/friendica into pull friendica 2012-07-10 20:33:28 -07:00
  • bb817cb76d Merge pull request #388 from fermionic/diaspora-signature-small-cleanup fermionic 2012-07-10 18:30:55 -07:00
  • fc6f7daf38 small cleanup Zach Prezkuta 2012-07-10 19:28:38 -06:00
  • 12255dded5 rev update friendica 2012-07-10 18:05:13 -07:00
  • 1fda9e9365 rev update friendica 2012-07-10 01:06:11 -07:00
  • 2096a5782e Merge pull request #387 from fermionic/diaspora-slight-signature-bug fermionic 2012-07-09 19:38:16 -07:00
  • d89b4cea64 missed a couple of variable names when I redid comment and like code Zach Prezkuta 2012-07-09 20:35:59 -06:00
  • 61ff2ecab2 Merge pull request #385 from fermionic/peculiar-queue-hangup friendica 2012-07-09 15:47:55 -07:00
  • 6621de63d9 Better (well, different) reshares. Thomas Willingham 2012-07-09 19:07:33 +01:00
  • 00eb000e36 don't check for was_recently_delayed in diaspora_transmit during a queue run Zach Prezkuta 2012-07-09 09:39:09 -06:00
  • ab710bce3b Merge https://github.com/friendica/friendica into pull friendica 2012-07-08 22:34:21 -07:00
  • caabb43326 diaspora message receive security issue - check message crypto signer against purported message author and bail if they don't match. friendica 2012-07-08 22:32:04 -07:00
  • fcf971fea9 Merge pull request #383 from fermionic/auto-orient-all-uploaded-images friendica 2012-07-08 15:32:20 -07:00
  • 9ae7555143 Merge pull request #384 from tomtom84/master tomtom84 2012-07-08 12:53:42 -07:00
  • f475850739 diabook: add notification in website-title, whenever new notifications arrive tomtom84 2012-07-08 21:50:17 +02:00
  • 47c48aa438 DBA: Possibility to log the database speed Michael Vogel 2012-07-08 21:27:20 +02:00
  • fb4295f07f better check for image EXIF support Zach Prezkuta 2012-07-08 11:17:50 -06:00
  • db2f0f7919 Bugfix: API: No extra encoding for the status text - makes it more compatible to statusnet Bugfix: BBCode: Fixed charset problems. Michael Vogel 2012-07-08 18:27:11 +02:00
  • 5fc47d03bc Merge pull request #382 from fermionic/archive-widget-bug tobiasd 2012-07-08 08:39:01 -07:00
  • 9fbe921051 auto-orient uploaded wall photos and profile photos also Zach Prezkuta 2012-07-08 09:18:05 -06:00
  • c8378260bc check for posted dates based on month only Zach Prezkuta 2012-07-08 08:46:46 -06:00
  • 63f10f6c6b Merge https://github.com/friendica/friendica into pull friendica 2012-07-07 21:55:15 -07:00
  • a3640b4e9f Merge pull request #381 from fermionic/embed-multiple-private-photos friendica 2012-07-07 21:15:52 -07:00
  • 6d10374c17 cleanup Zach Prezkuta 2012-07-07 18:48:20 -06:00
  • da2ccebed8 fix bugs Zach Prezkuta 2012-07-07 18:47:13 -06:00
  • e94f7ed23d rev update friendica 2012-07-07 16:20:34 -07:00
  • 173b3a1b9a allow more than one embedded private photo Zach Prezkuta 2012-07-07 16:20:24 -06:00
  • 57635e7684 add function to exclude embedded images when checking message length Zach Prezkuta 2012-07-06 17:09:23 -06:00
  • e9d7f85297 network: Small changes Michael Vogel 2012-07-07 20:40:15 +02:00
  • 0c5af9f303 Merge pull request #379 from fermionic/events-display-wrong-in-diaspora friendica 2012-07-07 04:19:15 -07:00
  • 7788a93258 Merge pull request #380 from copyninja/master friendica 2012-07-07 04:18:13 -07:00
  • 1b3d84422e orient function uses exif_read_data for which valid image types are only JPEG and TIFF as per the document [1]. Vasudev Kamath 2012-07-07 16:17:26 +05:30
  • 4fb996d9f7 remove check for event description, since it's not required to create an event Zach Prezkuta 2012-07-06 17:10:40 -06:00
  • ba4db236ec Merge branch 'master' of git://github.com/friendica/friendica Vasudev Kamath 2012-07-06 22:47:27 +05:30
  • a122fecf50 add additional page types to admin user report friendica 2012-07-05 22:30:13 -07:00
  • 8b19168999 a bit more colour friendica 2012-07-05 22:20:27 -07:00
  • a6514e81bb remove obsolete zot encapsulation functions friendica 2012-07-05 20:58:45 -07:00
  • 868e04f5eb Merge pull request #378 from fermionic/apparent-typo-in-function-name friendica 2012-07-05 19:56:38 -07:00
  • 47c7fd89ba my php thinks this is a typo Zach Prezkuta 2012-07-05 20:39:22 -06:00
  • a71365d566 Merge pull request #377 from fermionic/local-delete-blank-out-title-and-body friendica 2012-07-05 19:14:27 -07:00
  • 5395cf5bd9 clear title and body of items on local delete Zach Prezkuta 2012-07-05 20:07:01 -06:00
  • 854abcf612 Merge pull request #376 from fermionic/diaspora-prevent-fcontact-race-conditions friendica 2012-07-05 18:10:32 -07:00
  • 528d250ded slightly better way of handling last loop Zach Prezkuta 2012-07-05 19:08:30 -06:00
  • 09959b1b1c Merge pull request #375 from fermionic/diaspora-prevent-fcontact-race-conditions friendica 2012-07-05 18:05:32 -07:00
  • 5dcce1ed93 add some timeouts to prevent deadlock Zach Prezkuta 2012-07-05 19:01:13 -06:00
  • d7920c4c25 term (tag, mention, category, file, etc.) table friendica 2012-07-05 17:59:56 -07:00
  • 8af78079cb Merge https://github.com/friendica/friendica into pull friendica 2012-07-05 16:06:43 -07:00
  • 9951071b5b rev update friendica 2012-07-05 16:06:01 -07:00
  • fe984963ed Merge pull request #373 from fermionic/more-list-fixes friendica 2012-07-05 16:03:29 -07:00
  • 10336651ba Merge pull request #374 from fermionic/diaspora-prevent-fcontact-race-conditions friendica 2012-07-05 15:57:28 -07:00
  • dafc84390d Improvments of the HTML to make a better bb2markdown conversion (nested lists, youtube, vimeo, ...) Michael Vogel 2012-07-05 23:36:00 +02:00
  • 2edfc3b539 final db updates after testing Zach Prezkuta 2012-07-05 14:31:19 -06:00
  • e0607e0238 cleanup some syntax errors in lock.php Zach Prezkuta 2012-06-23 14:25:18 -06:00
  • 75ed37fb3d "lock" is a reserved MySQL keyword Zach Prezkuta 2012-06-17 11:25:36 -06:00
  • 46068935d0 minor cleanup in lock.php Zach Prezkuta 2012-06-16 11:28:44 -06:00
  • 20c4ecbcd9 cleanup obsolete comments Zach Prezkuta 2012-06-14 21:01:59 -06:00
  • 168ae40dd2 add rudimentary locking capability to Friendica functions Zach Prezkuta 2012-06-14 20:58:25 -06:00
  • 041aeaf4a1 fix small bug in lists and revert Diaspora list processing to non-Markdownify version Zach Prezkuta 2012-07-05 12:52:20 -06:00
  • 360c35e438 recycle symbol woes with multiple html entity encode/decode cycles going on friendica 2012-07-04 23:24:59 -07:00
  • e29dd081ca render the recycle symbol correctly on Diaspora reshares friendica 2012-07-04 22:44:04 -07:00
  • f40b056e3b some initial code and benchmarking for "red" content rendering engine friendica 2012-07-04 20:37:15 -07:00
  • 0990269555 restore translation of bbcode videos, events, bookmarks, etc. to diaspora friendica 2012-07-04 19:12:09 -07:00
  • 5589bca1e0 fix !@#$ tinymce linebreaks for the thousandth time friendica 2012-07-04 17:15:43 -07:00
  • fd626022ec add smarty engine, remove some obsolete zot1 stuff friendica 2012-07-03 22:23:08 -07:00
  • 13b4962531 Merge https://github.com/friendica/friendica into pull friendica 2012-07-03 21:41:05 -07:00
  • c726a92a3f punycode hostname friendica 2012-07-03 21:40:13 -07:00
  • badaa68340 Diabook directory wide variants. Thomas Willingham 2012-07-04 01:08:50 +01:00
  • b550b1326b Merge https://github.com/friendica/friendica into pull friendica 2012-07-03 16:26:58 -07:00
  • 7926a0d171 add link to shares friendica 2012-07-03 16:26:14 -07:00
  • e3828fe675 Merge pull request #372 from rdc/master Thomas Willingham 2012-07-03 12:58:57 -07:00
  • 424797138f Limiting .directory-photo-wrapper styles to <section> so as not to interfere with .directory-photo-wrapper in <aside> Zvi ben Yaakov (a.k.a rdc) 2012-07-03 21:49:02 +03:00
  • 14d4635be6 Merge pull request #371 from fermionic/option-to-limit-max-image-pixel-length friendica 2012-07-02 19:12:58 -07:00
  • 3fe5bdbd8d add ability to set maximum pixel length of uploaded pictures Zach Prezkuta 2012-06-28 10:33:21 -06:00
  • f7144e671c fix diabook directory pages (only the normal style - any volunteers for the wide?) friendica 2012-07-02 16:56:37 -07:00
  • ced0a208d8 fix double lines friendica 2012-07-02 16:34:01 -07:00
  • 64fc1318c6 Merge https://github.com/friendica/friendica into pull friendica 2012-07-02 01:13:30 -07:00
  • 315784444a try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up to harder stuff friendica 2012-07-02 01:11:19 -07:00
  • a9c65dfe27 "babel" diagnostic - convert bbcode to different formats and back again friendica 2012-07-01 23:00:25 -07:00
  • 610c78f9e0 Merge branch 'master' of https://github.com/friendica/friendica Thomas Willingham 2012-07-02 03:41:27 +01:00
  • 74a819980f Various theme stuff. Thomas Willingham 2012-07-02 03:40:12 +01:00
  • ab2b3304dc ...and the other bit friendica 2012-07-01 19:40:03 -07:00
  • e2a725ff98 pagination start off by one friendica 2012-07-01 19:17:21 -07:00
  • dd71f9446b config to disable email validation friendica 2012-07-01 18:56:00 -07:00
  • 696d78d658 Merge pull request #369 from rdc/master friendica 2012-07-01 16:44:21 -07:00
  • c102a5f7cd Merge pull request #370 from mschmitt/master friendica 2012-07-01 15:37:19 -07:00
  • 85c078f862 Esperanto -> 100% Martin Schmitt 2012-07-01 19:13:24 +02:00
  • 2214cd74e5 Added more profile data and CSS styling to the /directory page Zvi ben Yaakov (a.k.a rdc) 2012-07-01 14:46:03 +03:00
  • 7747f6fc96 rev update friendica 2012-06-30 17:38:02 -07:00
  • a3dfb55029 bug #437 friendica 2012-06-30 06:27:46 -07:00
  • 6cc844b2f9 restore 'shareable' to feeds after recent feed privacy re-factoring friendica 2012-06-30 05:16:30 -07:00
  • 31718968c6 advanced profile theming friendica 2012-06-30 01:29:29 -07:00
  • bcca817b9a Removing of the title if it is the same (or part) from the body. Helps against auto generated titles from tumblr. Michael Vogel 2012-06-30 09:25:22 +02:00
  • ffd5217ffa Merge https://github.com/friendica/friendica into pull friendica 2012-06-29 20:12:44 -07:00
  • 78e03abed8 convert ent_quotes for jquery calendar title/summary friendica 2012-06-29 20:11:36 -07:00
  • 1b27e24bb7 Merge pull request #368 from fabrixxm/master friendica 2012-06-29 16:34:23 -07:00
  • 65268d25e6 Merge remote branch 'upstream/master' Michael Vogel 2012-06-29 21:43:49 +02:00
  • 52569e536e Tests considering removing of the title Michael Vogel 2012-06-29 21:40:54 +02:00
  • a03e6b96ea quattro: fix Forum widget, hide edit profile link Fabrixxm 2012-06-29 05:47:53 -04:00
  • 8b18ee49ff quattro: some updates - add makefile to rebuild both css with single command - fix icons in Forums widget - style photos pages Fabrixxm 2012-06-29 05:29:58 -04:00