Commit Graph

  • e2949ab913 Merge remote branch 'upstream/master' zottel 2013-02-01 20:31:55 +01:00
  • bfe7b5e1c3 ZH-CN: update to the strings Tobias Diekershoff 2013-02-01 10:49:32 +01:00
  • c0af9b2938 Reset network when showing a contact's posts zottel 2013-02-01 09:12:37 +01:00
  • 0eeda1de5d Merge pull request #597 from fermionic/20130131-update-minified-js fermionic 2013-01-31 18:08:09 -08:00
  • 7d3a923294 script for minifying javascript files Zach Prezkuta 2013-01-31 19:05:27 -07:00
  • 303e5e1b10 ZH-CN: update to the strings Tobias Diekershoff 2013-01-31 06:42:10 +01:00
  • d0d9ae3096 Dispy - remove head.tpl. It isn't actually required, and is the main cause of breakage in the theme. Thomas Willingham 2013-01-30 02:51:47 +00:00
  • be29ae0bce poco xml returning 500 - but with contents? friendica 2013-01-29 18:36:10 -08:00
  • de0098a6b4 rev update friendica 2013-01-29 18:35:25 -08:00
  • 1c1902d37c Merge pull request #596 from fermionic/20130129-call-by-reference-error fermionic 2013-01-29 17:46:09 -08:00
  • 22c962f1fa remove deprecated call by reference Zach Prezkuta 2013-01-29 18:44:42 -07:00
  • 2350aa54eb OStatus-Conversation auto completion works now. Some performance issues added as well. Michael Vogel 2013-01-30 01:31:27 +01:00
  • 5f80467a8f Merge remote branch 'friendica/master' Fabrixxm 2013-01-29 05:57:53 -05:00
  • a804f2b5b5 Merge pull request #595 from fermionic/20130127-profile-permissions friendica 2013-01-28 13:55:55 -08:00
  • 50a64a47fc ZH-CN: update to the strings Tobias Diekershoff 2013-01-28 15:23:09 +01:00
  • 612af04b1c DE: update to the strings Tobias Diekershoff 2013-01-28 15:21:57 +01:00
  • 5c3bce30d6 Merge branch 'master' of git://github.com/friendica/friendica Tobias Diekershoff 2013-01-28 07:00:07 +01:00
  • 28e4b8512a ZH-CN: update to the strings Tobias Diekershoff 2013-01-28 06:57:44 +01:00
  • 2635c59c83 don't block private posts to logged in users on the local hub Zach Prezkuta 2013-01-27 22:42:36 -07:00
  • ccb465eccd Merge pull request #594 from fermionic/20130127-add-event-id-index friendica 2013-01-27 19:11:58 -08:00
  • a5ac69c65e Merge pull request #591 from fermionic/20130126-javascript-free-theme friendica 2013-01-27 19:11:36 -08:00
  • b58189bb98 Merge pull request #592 from fermionic/20130126-richtext-feature-fixes friendica 2013-01-27 19:11:06 -08:00
  • d4984bff8d Merge pull request #593 from fermionic/20130127-tinymce-update-and-fixes friendica 2013-01-27 19:10:32 -08:00
  • 38238972b5 really nitty permission tweaking friendica 2013-01-27 18:10:26 -08:00
  • 3f77eb80fe add event-id index to prevent large CPU loads when visiting the events page Zach Prezkuta 2013-01-27 17:52:44 -07:00
  • e0dd8944ce some deleted files for tinymce update Zach Prezkuta 2013-01-27 17:34:10 -07:00
  • 9967c9892d only change parents when parents are changed. Michael Vogel 2013-01-28 01:22:00 +01:00
  • e668fece10 ostatus auto completion now seems to work. Michael Vogel 2013-01-28 01:16:51 +01:00
  • bc972e16ce New function to complete threads from ostatus postings Michael Vogel 2013-01-27 23:25:04 +01:00
  • 6668d22d37 try to improve TinyMCE block handling Zach Prezkuta 2013-01-27 14:41:48 -07:00
  • d39a2e8a9d TinyMCE 3.5.8 update; some fixes Zach Prezkuta 2013-01-27 14:26:43 -07:00
  • c9cce9873d search privacy enhancements for those with blocked walls friendica 2013-01-27 13:14:13 -08:00
  • ce8f31504e rev update friendica 2013-01-27 13:13:08 -08:00
  • 2cb576d305 Bugfixing after adding timestamps Michael Vogel 2013-01-27 13:57:44 +01:00
  • a15fff2fc6 mark experimental Zach Prezkuta 2013-01-26 13:10:10 -07:00
  • acc4d66cd3 update smart templates Zach Prezkuta 2013-01-26 13:07:54 -07:00
  • 187b6441c1 make the richtext feature work for events, wall messages, and contact notes Zach Prezkuta 2013-01-26 12:53:35 -07:00
  • 488a38cd85 Decaf mobile: an (almost) Javascript-free theme Zach Prezkuta 2013-01-26 12:52:21 -07:00
  • fdee002f73 Several improvements for performance measuring Michael Vogel 2013-01-26 18:35:39 +01:00
  • 2c93067682 Performance: Adding several variables for performance measuring. Michael - piratica.eu 2013-01-26 16:46:43 +01:00
  • 8e62c8b27c Merge pull request #590 from balderino/master friendica 2013-01-25 16:55:01 -08:00
  • 37a5ff848d Merge https://github.com/friendica/friendica into pull friendica 2013-01-25 13:50:27 -08:00
  • 04b48688b6 add form security to invite page and set maximum per user invites friendica 2013-01-25 13:48:57 -08:00
  • 8b33873c97 added_new_files balderino 2013-01-25 22:45:48 +01:00
  • ec58e106c2 ZH-CN: update to the strings Tobias Diekershoff 2013-01-24 07:38:13 +01:00
  • cb4edf3928 IT: update to the strings Tobias Diekershoff 2013-01-24 07:37:16 +01:00
  • f542653230 suppress duplicate comment notifications friendica 2013-01-23 17:46:46 -08:00
  • d074656f26 Merge https://github.com/friendica/friendica into pull friendica 2013-01-23 17:08:21 -08:00
  • b3b0a9de24 die forcefully but gracefully on missing api templates friendica 2013-01-23 17:07:55 -08:00
  • 8eb781994b profile_vcard: add correct menu for profile editing when multiple profiles are disabled Fabrixxm 2013-01-23 09:58:30 -05:00
  • 9b394dbe1e Merge pull request #589 from fabrixxm/master fabrixxm 2013-01-23 01:19:05 -08:00
  • a875bec75c update fancybox, remove tiptip from head.tpl Fabrixxm 2013-01-22 08:17:23 -05:00
  • 1f36ebdb2b add display_item hook back around l. 686 to the conversation Tobias Diekershoff 2013-01-22 08:11:13 +01:00
  • 03ec6cabda PL: update to the strings Tobias Diekershoff 2013-01-22 08:01:25 +01:00
  • da12177aea PL: update to the strings Tobias Diekershoff 2013-01-21 08:05:57 +01:00
  • cc9ce39e3f Merge branch 'master' of https://github.com/annando/friendica Michael - piratica.eu 2013-01-20 14:17:09 +01:00
  • 7ab335c9d6 Diaspora: Auto-adding users as friend who already sharing with us Michael - piratica.eu 2013-01-20 14:08:28 +01:00
  • 4e3d0018c6 Merge remote-tracking branch 'upstream/master' Michael Vogel 2013-01-20 14:07:57 +01:00
  • 8c04dde935 a README for the translation process Tobias Diekershoff 2013-01-20 08:58:51 +01:00
  • 95f58426d8 DE: update to the strings Tobias Diekershoff 2013-01-19 15:36:09 +01:00
  • 759f36e7e8 Merge pull request #588 from fermionic/20130118-update-db-error-on-fresh-install friendica 2013-01-19 03:59:49 -08:00
  • bf26af5ac6 insidious set_config bug Zach Prezkuta 2013-01-18 23:38:49 -07:00
  • 83448507b8 Merge https://github.com/friendica/friendica into pull friendica 2013-01-18 17:38:56 -08:00
  • 20eb767b7e don't run two processes for every web access (noticed that dbupdate is always started as a background task under normal operation). friendica 2013-01-18 17:37:45 -08:00
  • 406692c7c6 DE: update to the strings Tobias Diekershoff 2013-01-18 12:40:44 +01:00
  • 01875fff5b PL: update to the strings Tobias Diekershoff 2013-01-18 12:40:24 +01:00
  • 605f94f790 ZH-CN: update to the strings Tobias Diekershoff 2013-01-18 12:39:55 +01:00
  • 82c00660e0 Preloading of items in the cache when receiving them. Michael Vogel 2013-01-17 23:20:40 +01:00
  • 3742d0d5ba events with no finish date don't appear in calendar friendica 2013-01-16 03:16:45 -08:00
  • e45de3503a Merge https://github.com/friendica/friendica into pull friendica 2013-01-15 14:59:41 -08:00
  • 30f1fb2c4d provide a date indication in reshared content friendica 2013-01-15 14:58:50 -08:00
  • 3a89258d8e Merge pull request #587 from oohlaf/fixes Olaf Conradi 2013-01-15 01:34:15 -08:00
  • 492a42eebe Add ttf and svg to skip the front controller Olaf Conradi 2013-01-15 10:28:24 +01:00
  • b42427d576 Merge pull request #586 from fermionic/20130114-maintenance-mode fermionic 2013-01-14 19:35:46 -08:00
  • c32f754b6e remove commented-out check_config() Zach Prezkuta 2013-01-14 20:34:28 -07:00
  • 6d77237f06 check plugins in separate function Zach Prezkuta 2013-01-14 20:31:32 -07:00
  • b920ce732c Merge pull request #585 from fermionic/20130114-maintenance-mode fermionic 2013-01-14 18:18:34 -08:00
  • 2a8e5032e0 run check_config() in a separate process Zach Prezkuta 2013-01-14 16:58:32 -07:00
  • 917acd6eb7 Merge https://github.com/friendica/friendica into pull friendica 2013-01-14 15:51:31 -08:00
  • 66a6970bb8 config cli will also work with Friendica without change - so bringing it over friendica 2013-01-14 15:50:39 -08:00
  • 28c9123ac8 module to show system down message Zach Prezkuta 2013-01-14 16:48:01 -07:00
  • 31c3bbf549 add maintenance mode Zach Prezkuta 2013-01-14 16:35:41 -07:00
  • aea7b84e92 Merge pull request #584 from fermionic/20130113-multiple-delete-comments fermionic 2013-01-13 11:44:20 -08:00
  • 452ff19d73 Redirects sometimes only seems to send the hostname and no path. "fetch_url" respects this. Michael Vogel 2013-01-13 18:51:48 +01:00
  • 98d83f5d0b comments inherit pagedropping state of the top-level Zach Prezkuta 2013-01-13 10:51:19 -07:00
  • 5501dd0759 Searching for tags has been enabled in all places. The tag detection has been improved for imports with missing line feeds. Michael Vogel 2013-01-13 17:13:01 +01:00
  • b9afb38f4d Some more function calls to ensure that the tags are deleted when an item is deleted Michael Vogel 2013-01-13 15:11:06 +01:00
  • 3dc615dd9d Adding the tag creating function to the function when a photo is tagged Michael Vogel 2013-01-13 15:05:24 +01:00
  • 158bfda0ac Changing the tag system to the "term" table. Michael Vogel 2013-01-13 14:50:55 +01:00
  • e8952541af ZH-CN: update to the strings Tobias Diekershoff 2013-01-13 12:55:13 +01:00
  • 8cef0fa80d Mentions are now displayed much faster. Attention: The related database update can last more than one minute. bbcode: The generated HTML is now cleaned up every time (using the DOM) since it happened that bad html broke the network page. Michael Vogel 2013-01-13 09:37:15 +01:00
  • 449b44fe4c Merge https://github.com/friendica/friendica into pull friendica 2013-01-12 15:09:35 -08:00
  • b5c0714bc4 fix live update on display page friendica 2013-01-12 15:08:59 -08:00
  • 8b643d4c88 Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements friendica 2013-01-12 12:28:14 -08:00
  • ceaedb41e4 Merge pull request #582 from fermionic/20130112-various-fixes friendica 2013-01-12 12:24:51 -08:00
  • 8d19dff6dc Merge pull request #583 from fermionic/20130112-diaspora-photo-queue friendica 2013-01-12 12:16:12 -08:00
  • 7f19018cd4 fix leak Zach Prezkuta 2013-01-12 06:56:45 -07:00
  • 1507ec37a4 give post a chance to arrive before rejecting photos from Diaspora Zach Prezkuta 2013-01-12 06:52:15 -07:00
  • 74caf1a4a7 * Add MIME types for file attachments * Restore translatability to mood phrases * Prevent casting of "false" in html2plain * Allow attachments with a comma in the filename * Fix/optimize ACL img data-src jQuery search * Fix bug when uploading files with a comma in the name using Chrome/Chromium * Babel nicer output formatting * Remove obsolete "plaintext" check in mod/parse_url * Restore TinyMCE live insertion of images * Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files Zach Prezkuta 2013-01-12 06:31:32 -07:00
  • 609c45e791 fixes and tweaks to Smarty processing Zach Prezkuta 2013-01-12 05:58:54 -07:00