Commit Graph

  • d090dc19a7 Merge pull request #2231 from annando/1601-dont-send-to-archive fabrixxm 2016-01-01 17:59:02 +01:00
  • 2ed3ae1aab Bugfix: The request process from DFRN hadn't worked anymore since the last pull request Michael Vogel 2016-01-01 17:49:07 +01:00
  • 38ee2def5d Don't send messages to contacts that are archived Michael Vogel 2016-01-01 13:05:05 +01:00
  • 9d4d29ad9e Merge pull request #2228 from fabrixxm/issue_api Tobias Diekershoff 2015-12-31 09:49:28 +01:00
  • 8a5fada863 Merge pull request #2138 from fabrixxm/dbstructure_multicolumn_primarykey Tobias Diekershoff 2015-12-31 09:49:00 +01:00
  • 2a9affe818 Fix small bug in api fabrixxm 2015-12-31 09:46:59 +01:00
  • 907d20940a Merge pull request #2221 from rabuzarus/2812_vier_mobile_icons fabrixxm 2015-12-31 09:38:27 +01:00
  • 6a8f5f9204 Merge pull request #2226 from rabuzarus/3012_colorbox fabrixxm 2015-12-31 09:18:39 +01:00
  • a3448e4156 Merge pull request #2227 from tobiasd/20151231-DE fabrixxm 2015-12-31 09:17:59 +01:00
  • ab5d0aa5e6 DE update to the strings Tobias Diekershoff 2015-12-31 07:32:15 +01:00
  • 77a230342f perfect-scrollbar: added Source link to the lib rabuzarus 2015-12-30 16:26:57 +01:00
  • 466968952c colorbox: update library to 1.6.3 rabuzarus 2015-12-30 14:53:02 +01:00
  • 8a51e470e7 perfect scrollbars: added README rabuzarus 2015-12-30 14:22:13 +01:00
  • 077dd6a6b5 Merge pull request #2225 from tobiasd/20151230-FR Michael Vogel 2015-12-30 11:44:05 +01:00
  • 6961fa636a FR update to the strings Tobias Diekershoff 2015-12-30 08:55:59 +01:00
  • f8256fc53b make perfect scrollbars work with quattro rabuzarus 2015-12-30 03:12:52 +01:00
  • 89c0a8f8a8 vier: remove double available accesskeys rabuzarus 2015-12-30 00:48:11 +01:00
  • 3366e530cd photo aside widget: little polish rabuzarus 2015-12-30 00:37:24 +01:00
  • 20fbf670db photo aside widget for profile page rabuzarus 2015-12-30 00:26:50 +01:00
  • b41ab85feb Merge pull request #2220 from rabuzarus/2812_notify_menu Michael Vogel 2015-12-29 14:31:41 +01:00
  • 4e47b26e17 Merge pull request #2222 from rabuzarus/2912_vier_clear_widget Michael Vogel 2015-12-29 14:24:45 +01:00
  • 871fb609d4 vier: add missing clear divs to right aside rabuzarus 2015-12-29 02:01:17 +01:00
  • 51a8864519 vier: make TopNavBar mobile friendly rabuzarus 2015-12-29 00:23:59 +01:00
  • e93156427e use perfect-scrollbars for nav-notifications-menu (and in vier aside) rabuzarus 2015-12-28 23:16:34 +01:00
  • 43d35315db vier nav-notification-menu: further polishing rabuzarus 2015-12-28 22:04:54 +01:00
  • c7d2d95705 vier nav-notification-menu: small cleanup rabuzarus 2015-12-28 20:52:11 +01:00
  • 093a3e6742 some work on vier nav-notification-menu rabuzarus 2015-12-28 20:40:04 +01:00
  • 99861b9fa6 Merge pull request #2216 from fabrixxm/feature-api-like Tobias Diekershoff 2015-12-28 18:39:21 +01:00
  • 03000beac6 Merge pull request #2219 from fabrixxm/quattro Tobias Diekershoff 2015-12-28 18:39:03 +01:00
  • 9a307a4e2b Merge pull request #2218 from annando/1512-mail-participiants fabrixxm 2015-12-28 18:31:54 +01:00
  • c2d1016014 remove linebreak in doc/api.md fabrixxm 2015-12-28 18:30:28 +01:00
  • a1c1a6cae8 workaround for media.ccc.de oembed with size 0 fabrixxm 2015-12-28 18:28:02 +01:00
  • 7965f72c8c don't resize iframe if we can't find a final size greater than 0 fabrixxm 2015-12-28 18:27:24 +01:00
  • 2f13506180 Bugfix: The participants on the mail page were displayed wrong Michael Vogel 2015-12-28 18:13:03 +01:00
  • 6da04d16bd get rid of unwanted <br>s in items with oembed fabrixxm 2015-12-28 18:07:31 +01:00
  • 0896f3a4f5 Merge pull request #2217 from annando/1512-key-hcard fabrixxm 2015-12-28 17:26:39 +01:00
  • 4c08b0ceb6 code cleanup Michael Vogel 2015-12-28 17:09:22 +01:00
  • 3476e21b28 Scrape the public key from the hcard if not present in webfinger Michael Vogel 2015-12-28 16:49:19 +01:00
  • 9d83892151 Merge pull request #2215 from rabuzarus/2812_vier_mobile_fix Michael Vogel 2015-12-28 10:41:39 +01:00
  • f579b2af55 Fix TOC links href, no TOC in home fabrixxm 2015-12-28 10:21:34 +01:00
  • 1776b19dbf Add table of content in aside of help pages fabrixxm 2015-12-28 10:13:28 +01:00
  • e752d41389 Update API docs fabrixxm 2015-12-28 09:47:51 +01:00
  • 696fe53d8f sizes links in xml output of api/frienidca/photo is an array fabrixxm 2015-12-28 09:46:18 +01:00
  • 79c32105fc datasize not meaningful when all size are returned in api/friendica/photo fabrixxm 2015-12-28 09:45:23 +01:00
  • 0664ace260 Fix ignore doxigen output in .gitignore fabrixxm 2015-12-28 09:44:30 +01:00
  • 6b60560ea2 Changes in api fabrixxm 2015-12-27 17:45:20 +01:00
  • 835ad28d83 do_like() return false if verb is invalid fabrixxm 2015-12-27 17:31:34 +01:00
  • f27fad7b47 Move Like/Dislike/Attend add/remove code to include/like.php fabrixxm 2015-12-27 13:52:46 +01:00
  • cf86162a08 Merge pull request #2214 from rabuzarus/2612_db_docu fabrixxm 2015-12-28 10:22:33 +01:00
  • 497175c56e Merge pull request #2213 from annando/1512-dfrn-request Tobias Diekershoff 2015-12-28 05:25:50 +01:00
  • b09fd2c39e Merge pull request #2212 from annando/1512-xrd Tobias Diekershoff 2015-12-28 05:24:36 +01:00
  • 3dd08094ca Merge pull request #2210 from annando/1512-diaspora-p Tobias Diekershoff 2015-12-28 05:23:00 +01:00
  • e68fcc146a vier: fix for 2205 rabuzarus 2015-12-28 04:57:49 +01:00
  • 038611bcb4 add documentation rabuzarus 2015-12-28 03:17:55 +01:00
  • 72f7ee7fd3 Support for remote subscription in Diaspora Michael Vogel 2015-12-28 03:14:38 +01:00
  • 12f8b0630d docu - add schema of each db table rabuzarus 2015-12-28 02:50:25 +01:00
  • 8b25f51116 XRD now should react more like an OStatus server Michael Vogel 2015-12-28 01:04:14 +01:00
  • 435a29026d Diaspora: The /p/ only should return top level posts - not comments Michael Vogel 2015-12-27 21:12:53 +01:00
  • 44afff9514 Merge pull request #2198 from rabuzarus/2312_code_cleanup fabrixxm 2015-12-27 18:20:48 +01:00
  • 8d8dc2d060 Merge pull request #2197 from annando/1512-ostatus-comment Tobias Diekershoff 2015-12-27 15:58:32 +01:00
  • fe141e4441 Merge pull request #2207 from tobiasd/20151227-typo Michael Vogel 2015-12-27 09:43:24 +01:00
  • bc9c3d80fa typos in OStatus (re)subscribing Tobias Diekershoff 2015-12-27 08:44:23 +01:00
  • 06defed4cb Merge pull request #2206 from annando/1512-diaspora-sql Tobias Diekershoff 2015-12-27 07:02:21 +01:00
  • 7825704bd6 Diaspora: Fixed possible SQL injection Michael Vogel 2015-12-27 03:54:20 +01:00
  • 7530c950e3 help - make use of subfolders rabuzarus 2015-12-26 16:06:38 +01:00
  • 28317ed9ae added databas schema to the help rabuzarus 2015-12-26 15:51:41 +01:00
  • 6e2c09b1ea Merge pull request #2203 from rabuzarus/2512_doxy-hooks Tobias Diekershoff 2015-12-26 10:53:30 +01:00
  • 1eae40592c Merge pull request #2204 from rabuzarus/2512_todo_list Tobias Diekershoff 2015-12-26 08:50:17 +01:00
  • fa88bdf2e2 Merge pull request #2202 from tobiasd/20151225-doxygen Michael Vogel 2015-12-26 07:27:39 +01:00
  • 3df5c17124 reformat todo according to doxygen style rabuzarus 2015-12-25 23:17:34 +01:00
  • 8e83e423f4 boot.php - doxygen - organize constants in groups rabuzarus 2015-12-25 20:58:26 +01:00
  • 5b94c4fe41 Yes is no and no is yes ... Michael Vogel 2015-12-25 19:57:38 +01:00
  • ba2517fd71 Merge develop into 2512_rebase_cleanup rabuzarus 2015-12-25 19:18:12 +01:00
  • be2d6fa85e little fix for @hooks in Doxyfile rabuzarus 2015-12-25 18:37:38 +01:00
  • 64989781ff add custom tag @hooks to boot.php & identity.php rabuzarus 2015-12-25 18:36:13 +01:00
  • f3395dd6f3 add custom tag @hooks to doxygen rabuzarus 2015-12-25 17:30:55 +01:00
  • 839895e434 identity.php - code cleanup + doxygen rabuzarus 2015-12-25 17:26:04 +01:00
  • 5f7e0c71b3 missing http Tobias Diekershoff 2015-12-25 12:25:39 +01:00
  • e855043439 added a brief note how to generate docs with Doxygen to the developers intro page Tobias Diekershoff 2015-12-25 12:23:57 +01:00
  • c3ae4a03bb Merge pull request #2201 from annando/1512-location-bbcode Tobias Diekershoff 2015-12-25 10:02:59 +01:00
  • 9ab5bfb507 Merge remote-tracking branch 'upstream/master' Michael Vogel 2015-12-24 13:09:18 +01:00
  • 0c924d36cb Bugfix: The location wasn't parsed through bbcode Michael Vogel 2015-12-24 12:56:27 +01:00
  • e42bbcd6c4 boot.php - small clean up rabuzarus 2015-12-24 11:58:42 +01:00
  • 40b0d383d5 boot.php - code cleanup + doxygen rabuzarus 2015-12-24 01:31:17 +01:00
  • 61956e1098 There is now a config value for the session management to not use the database Michael Vogel 2015-12-22 22:11:08 +01:00
  • 7faa111c9b Merge pull request #2196 from fabrixxm/asparagus Michael Vogel 2015-12-22 17:57:16 +01:00
  • abe0d22784 Update codename Fabrixxm 2015-12-22 16:43:07 +01:00
  • a91ce7c0d1 Merge remote-tracking branch 'upstream/master' Michael Vogel 2015-12-22 11:27:49 +01:00
  • 307beb47fd Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment Michael Vogel 2015-12-22 11:25:37 +01:00
  • 71255d04a2 Friendica 3.5-dev Fabrixxm 2015-12-22 10:52:00 +01:00
  • 7f76c3dd41 Merge branch 'master' into develop Fabrixxm 2015-12-22 10:50:52 +01:00
  • 21f044e305 Friendica 3.4.3 Fabrixxm 2015-12-22 10:45:43 +01:00
  • c007722041 Merge branch 'release-3.4.3-rc' Fabrixxm 2015-12-22 10:43:57 +01:00
  • 989d949bd0 Merge pull request #2193 from fabrixxm/changelog Michael Vogel 2015-12-22 09:52:12 +01:00
  • 156be7a17b Update CHANGELOG Fabrixxm 2015-12-22 09:08:53 +01:00
  • 1b0b4d8c57 Merge pull request #2195 from fabrixxm/last-minute Michael Vogel 2015-12-21 22:50:51 +01:00
  • 770bba021e call resizeIframe() function until size is stable Fabrixxm 2015-12-21 16:41:55 +01:00
  • d4dd863b4b quattro: style managed unread notification Fabrixxm 2015-12-21 16:19:56 +01:00
  • bb7330cf2e Update CHANGELOG Fabrixxm 2015-12-21 15:51:21 +01:00
  • 7faa88613d Merge pull request #2192 from fabrixxm/quattro-message-aside Tobias Diekershoff 2015-12-21 09:57:17 +01:00