clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 8eb05fd1bd Merge pull request #2415 from annando/1603-dfrn-hash Tobias Diekershoff 2016-03-16 16:08:32 +01:00
  • 071ffd43bf DFRN: Mentions were imported as hash tags Michael Vogel 2016-03-16 11:44:45 +01:00
  • be001d171b Values are sanitized, messages are not relayed when there is no signature Michael Vogel 2016-03-15 20:14:08 +01:00
  • a4dd0b835c Merge branch 'develop' of https://github.com/friendica/friendica into develop Silke Meyer 2016-03-15 11:18:15 +01:00
  • 8027854886 Removed moved function Michael Vogel 2016-03-15 07:18:11 +01:00
  • 3f2a23d48c Unused files are removed Michael Vogel 2016-03-15 07:05:10 +01:00
  • eed55664fc Reshares now store the original XML as well. Michael Vogel 2016-03-15 00:26:28 +01:00
  • 4b5e7007a7 Bugfix: XML copy had problems with "&" Michael Vogel 2016-03-14 23:54:01 +01:00
  • dc2e7a66b3 The Diaspora class is now productive Michael Vogel 2016-03-14 23:11:43 +01:00
  • 6f43d3a4c4 Profile update is now working with the new function as well Michael Vogel 2016-03-14 22:10:26 +01:00
  • 56cb6cc897 Removed just more old diaspora function calls. Michael Vogel 2016-03-14 20:53:44 +01:00
  • 3734555715 Conversations are working now too Michael Vogel 2016-03-14 20:04:17 +01:00
  • 9ae2b2292f Some more function calls changed to the new class Michael Vogel 2016-03-14 08:11:14 +01:00
  • 75f5cfe63e Retraction and reshares work Michael Vogel 2016-03-13 21:11:48 +01:00
  • 2841aa0281 New implementation is now live. Michael Vogel 2016-03-13 19:47:02 +01:00
  • 07818a6553 Decode function is now there as well. Michael Vogel 2016-03-13 16:14:51 +01:00
  • 7841837ec3 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora Michael Vogel 2016-03-13 13:49:06 +01:00
  • e884b0e579 Merge pull request #2414 from annando/1603-display-query Tobias Diekershoff 2016-03-13 13:18:53 +01:00
  • 99d5f8afc6 The display contained bad sql queries Michael Vogel 2016-03-13 13:04:12 +01:00
  • f8f19038bf XML generation is now improved Michael Vogel 2016-03-13 09:57:44 +01:00
  • f978bc9cc8 Some code cleaning, changes to the xml generation Michael Vogel 2016-03-13 07:10:24 +01:00
  • e48c446a29 Merge branch 'rewrites/is_filled_array_introduced' into rhaeder-develop Roland Haeder 2016-03-12 23:03:06 +01:00
  • 47b591c09a Fixes another warning because of count()'s lazyness. #2390 Roland Haeder 2016-03-12 23:02:42 +01:00
  • a589e5a49a Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop Roland Haeder 2016-03-12 22:57:10 +01:00
  • 7f0ae9843f count() didn't notice about FALSE ... #2390 Roland Haeder 2016-03-12 22:54:06 +01:00
  • 74d4f7fcd6 count() didn't notice about FALSE ... #2390 Roland Haeder 2016-03-12 22:54:06 +01:00
  • 4020b51f8f Merge pull request #2413 from tobiasd/20160312-socnetsettings Michael Vogel 2016-03-12 19:49:03 +01:00
  • 0f65eee695 Everything could work - needs some beautification and documentation Michael Vogel 2016-03-12 19:19:20 +01:00
  • 9cfc249b12 Moved is_filled_array() to both dba classes and named it is_result(). Roland Haeder 2016-03-12 18:54:55 +01:00
  • c60605ce0c Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop Roland Haeder 2016-03-12 18:50:14 +01:00
  • 2a864d889e missing include file for the SocNet settings Tobias Diekershoff 2016-03-12 16:25:17 +01:00
  • 57fb0a9129 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora Michael Vogel 2016-03-12 11:06:43 +01:00
  • cabb84a42a Merge pull request #2411 from tobiasd/20160312-dos Michael Vogel 2016-03-12 10:23:45 +01:00
  • bc574328bd Merge pull request #2412 from annando/1603-double-encode-ping Tobias Diekershoff 2016-03-12 09:43:41 +01:00
  • 14a2aa552a The name in the notifications has to be double encoded Michael Vogel 2016-03-12 09:21:13 +01:00
  • b5851931d1 Hotkey documentation Tobias Diekershoff 2016-03-12 08:57:07 +01:00
  • 5cbd8ea132 Merge pull request #2410 from tobiasd/20160312-messagespo Michael Vogel 2016-03-12 08:42:55 +01:00
  • a0aeea4a89 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora Michael Vogel 2016-03-12 07:38:25 +01:00
  • 9d52a89c51 regenerated messages.po file for picking up the workers Tobias Diekershoff 2016-03-12 07:36:44 +01:00
  • ee2020caff Merge pull request #2409 from annando/1503-worker-setting Tobias Diekershoff 2016-03-12 07:30:55 +01:00
  • 08b69892e8 Merge pull request #2408 from annando/1603-goaway Tobias Diekershoff 2016-03-12 07:29:32 +01:00
  • 02d14eafda Merge pull request #2407 from annando/1603-optimize-table Tobias Diekershoff 2016-03-12 07:28:44 +01:00
  • bc21fca345 Remove the setting description from the documentation since it isn't a hidden one anymore. Michael Vogel 2016-03-11 23:44:46 +01:00
  • b12dbe8831 The worker settings are now available in the admin settings Michael Vogel 2016-03-11 23:28:11 +01:00
  • 3189f0e23c Another fix for "goaway". Hopefully now finale. Michael Vogel 2016-03-11 20:43:31 +01:00
  • 2718c8150f The table optimisation level calculation is now using the index size as well Michael Vogel 2016-03-11 20:32:22 +01:00
  • cd0fbc5e9a Merge remote-tracking branch 'upstream/develop' into 1602-diaspora Michael Vogel 2016-03-10 08:22:52 +01:00
  • a28d44a9ba Merge pull request #2405 from annando/1603-ostatus4-bugfix fabrixxm 2016-03-10 06:08:30 +01:00
  • df312402e4 Bugfix: A parameter was missing for the OStatus author check Michael Vogel 2016-03-09 22:51:17 +01:00
  • 60a01242ea Merge pull request #2404 from annando/1603-no-lock fabrixxm 2016-03-09 22:08:41 +01:00
  • c0bd7a866d Some small addition to the OStatus part. Better check if we follow the actor. Michael Vogel 2016-03-09 21:53:30 +01:00
  • 32c66246c4 Some fixes for the fetching of postings by using /p/ Michael Vogel 2016-03-09 19:30:04 +01:00
  • c30b369a1a Added documentation Michael Vogel 2016-03-08 22:42:37 +01:00
  • 65d6d45f8c Changed parameter order Michael Vogel 2016-03-08 22:28:49 +01:00
  • beb2346cfc The function to check for maxload and the lockfile is centralized Michael Vogel 2016-03-08 20:28:09 +01:00
  • ec9c9f0be7 Don't create lock files if the process is called from the poller via the worker Michael Vogel 2016-03-08 00:20:06 +01:00
  • 16eb8fd9bf Small things ... Michael Vogel 2016-03-07 15:20:48 +01:00
  • 373beb0343 Relayed Likes and relayed comments should work, code needs beautification Michael Vogel 2016-03-07 08:17:21 +01:00
  • db15f76177 Relaying is nearly done Michael Vogel 2016-03-07 01:34:06 +01:00
  • 182bee265e Sending like and comment should work now. Michael Vogel 2016-03-06 22:49:50 +01:00
  • 918efbafac Merge remote-tracking branch 'upstream/develop' into 1602-diaspora Michael Vogel 2016-03-06 21:20:00 +01:00
  • fa652ad1bc Merge pull request #2401 from annando/1603-ostatus-completion Tobias Diekershoff 2016-03-06 21:13:05 +01:00
  • 4ef44c67b8 Added documentation Michael Vogel 2016-03-06 21:06:52 +01:00
  • 27905cc21a Merge remote-tracking branch 'upstream/develop' into 1603-ostatus-completion Michael Vogel 2016-03-06 20:37:51 +01:00
  • ef2bc47cc6 New way of fetching the conversation id for thread completion Michael Vogel 2016-03-06 20:36:28 +01:00
  • d30d13959b Merge pull request #2328 from rabuzarus/0602_contact_profile fabrixxm 2016-03-06 19:56:59 +01:00
  • bdfd81e723 Merge pull request #2400 from annando/1603-ostatus-thread Tobias Diekershoff 2016-03-06 19:40:01 +01:00
  • 9579725d4d This should work better ... Michael Vogel 2016-03-06 19:27:34 +01:00
  • 279a0453f9 Or back ... Michael Vogel 2016-03-06 15:13:19 +01:00
  • 7f48df63a3 Relocated the check. Michael Vogel 2016-03-06 15:11:04 +01:00
  • 4bd1061a09 Only import OStatus threads if we follow the thread starter Michael Vogel 2016-03-06 14:53:30 +01:00
  • 1127150c79 Merge pull request #2399 from annando/1603-default-group Tobias Diekershoff 2016-03-06 14:42:27 +01:00
  • bb06026147 Settings for only importing threads from our ostatus contacts Michael Vogel 2016-03-06 14:09:04 +01:00
  • 4ef33b4d5b Clarification of description Michael Vogel 2016-03-06 13:26:30 +01:00
  • 8752ec11b2 Central function for default group, special setting for OStatus Michael Vogel 2016-03-06 13:15:27 +01:00
  • af7b028b13 Preparation for followups Michael Vogel 2016-03-06 11:41:51 +01:00
  • 305f6f9a7b Merge remote-tracking branch 'upstream/develop' into 1602-diaspora Michael Vogel 2016-03-06 08:41:24 +01:00
  • 6072e17a64 Merge pull request #2398 from annando/1603-fontawesome4 Tobias Diekershoff 2016-03-06 01:49:46 +01:00
  • 6468fbb905 Retraction could work now as well. Michael Vogel 2016-03-06 01:37:47 +01:00
  • 71227b5d0d Receiving should be complete, sending partially works Michael Vogel 2016-03-06 00:53:30 +01:00
  • f05cbf9ed8 Merge pull request #2397 from Quix0r/fixes/poller-warning Michael Vogel 2016-03-05 13:35:43 +01:00
  • 996cd8c24e The Font Awesome library is now updated, the replxy button is changed Michael Vogel 2016-03-05 13:29:01 +01:00
  • 2a4ebaa438 Small cleanup Michael Vogel 2016-03-05 01:30:49 +01:00
  • 5bbc8a14ce "import" is now "receive" Michael Vogel 2016-03-05 00:27:44 +01:00
  • ef3620c191 Conversations should work now too. Michael Vogel 2016-03-04 23:28:43 +01:00
  • 08630ca6f8 Merge branch 'rewrites/is_filled_array_introduced' into rhaeder-develop Roland Haeder 2016-03-04 22:53:42 +01:00
  • b56a9bfacc Fixes E_WARNING from foreach() because count() seem to return TRUE even when $r is no array ?! Roland Haeder 2016-03-04 22:46:30 +01:00
  • 5a439a31f3 Fixes E_WARNING from foreach() because count() seem to return TRUE even when $r is no array ?! Roland Haeder 2016-03-04 22:46:30 +01:00
  • d88606321d Just easier code ... Roland Haeder 2016-03-04 22:39:08 +01:00
  • 425665795d Merge branch 'fixes/poller-warning' into rhaeder-develop Roland Haeder 2016-03-04 22:38:47 +01:00
  • d5c1ce490b No processing if error or empty array Roland Haeder 2016-03-04 22:38:18 +01:00
  • cc4349777a Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop Roland Haeder 2016-03-04 20:05:15 +01:00
  • 2edf4548dc Retractions could work now. Michael Vogel 2016-03-03 23:34:17 +01:00
  • 5adecf5b50 Some beautification Michael Vogel 2016-03-02 23:39:50 +01:00
  • 66919761ab Some work at the retractions. Michael Vogel 2016-03-02 23:28:20 +01:00
  • 8b524c1b2e Merge branch 'develop' of https://github.com/friendica/friendica into develop Silke Meyer 2016-03-02 20:45:41 +01:00
  • 3184a6263b Merge pull request #2392 from Quix0r/minor/logging fabrixxm 2016-03-02 12:21:18 +01:00
  • 1f7f964bb7 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora Michael Vogel 2016-03-02 11:59:13 +01:00
  • 73f4c3c8da Merge pull request #2394 from annando/1603-federation Tobias Diekershoff 2016-03-02 10:41:02 +01:00
  • 40209b2554 Merge pull request #2393 from annando/1603-api-speed Tobias Diekershoff 2016-03-02 10:40:23 +01:00