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

Commit Graph

  • 4de12dacc7 New API /api/friendica/profile/show to return data of all profiles a user has to a client gerhard6380 2016-09-23 19:06:41 +02:00
  • 4caaeb9978 Merge pull request #2789 from annando/1609-escaping Tobias Diekershoff 2016-09-23 08:46:02 +02:00
  • 5f9a392fc4 At the search we should do it as well. Michael Vogel 2016-09-23 06:36:48 +00:00
  • 3f35fed35a Special characters should be escaped Michael Vogel 2016-09-23 06:29:02 +00:00
  • 4948460232 Merge pull request #2787 from annando/1609-xmpp-auth Tobias Diekershoff 2016-09-22 23:28:46 +02:00
  • a04100cef7 changing gitignore gerhard6380 2016-09-22 22:08:24 +02:00
  • 7c9a0ec459 Merge branch 'master' gerhard6380 2016-09-22 21:59:51 +02:00
  • 8f4d4962ce add Visual Studio special files to gitignore gerhard6380 2016-09-22 21:55:16 +02:00
  • 5a3b3cddda Merge pull request #2788 from tobiasd/20160922-de Michael Vogel 2016-09-22 20:23:15 +02:00
  • 6fd54df940 Some additional beautification Michael Vogel 2016-09-22 18:18:26 +00:00
  • abbf501602 The string is an array ... Michael Vogel 2016-09-22 18:07:32 +00:00
  • 529d2fc74b DE update to the translation Tobias Diekershoff 2016-09-22 12:37:39 +02:00
  • c6f50d0468 Reworked ejabberd authentification Michael Vogel 2016-09-22 02:57:40 +00:00
  • adb0c0c0a3 Merge pull request #2785 from tobiasd/20160921-msg Michael Vogel 2016-09-21 14:29:45 +02:00
  • d5b37c3dd0 Merge pull request #2784 from tobiasd/20160921-ptbr Michael Vogel 2016-09-21 14:29:23 +02:00
  • ac395c2136 regenerated messages.po Tobias Diekershoff 2016-09-21 12:13:32 +02:00
  • 754dc02753 PT BR update to the strings Tobias Diekershoff 2016-09-21 11:44:01 +02:00
  • c1a15befc5 Some improvements/fix: - fixed curly brace bug (introduced by myself) - make all SQL keywords upper-case, column and table names lower-case - used some more dbm::is_result Roland Haeder 2016-09-20 22:18:35 +02:00
  • 225369230f Merge pull request #2782 from tobiasd/20160920-adm Michael Vogel 2016-09-20 19:25:45 +02:00
  • bb59acce80 Merge pull request #2783 from tobiasd/20160920-license Michael Vogel 2016-09-20 19:24:05 +02:00
  • 38c9a53da8 it is 2016 by now Tobias Diekershoff 2016-09-20 16:57:18 +02:00
  • e5c2c66487 Show the worker queue count if the workers are active Tobias Diekershoff 2016-09-20 15:45:55 +02:00
  • 50d168ab6b Use more dbm::is_result() Roland Haeder 2016-09-19 22:13:33 +02:00
  • e171a1cd22 Some fixes: - avoids warning if no result is coming back - brought back init variable before using it Roland Haeder 2016-09-18 23:34:50 +02:00
  • 636164e9ef Opps, wrong brace and removed invert of dbm::is_result() Roland Haeder 2016-09-18 23:27:54 +02:00
  • c825cc8d0d This merge brings back dbm::is_result() where I could find it. Roland Haeder 2016-09-18 23:21:18 +02:00
  • 8e6f9abedb Merge pull request #2779 from tobiasd/20160913-admin Michael Vogel 2016-09-14 07:00:38 +02:00
  • 88285b4cbf The info is not that important Tobias Diekershoff 2016-09-14 06:45:05 +02:00
  • 75ec222a31 Merge pull request #2778 from annando/1609-xmpp-auth Tobias Diekershoff 2016-09-13 23:04:34 +02:00
  • f85821839b display current state of PHP logging in admin panel logging informations Tobias Diekershoff 2016-09-13 22:52:21 +02:00
  • 4f5997f30a XMPP authentification for multi domain systems Michael Vogel 2016-09-13 20:29:47 +00:00
  • bdd4aed9ba Bump version fabrixxm 2016-09-13 18:52:29 +02:00
  • 3d6e3cbb78 Merge branch 'master' into develop fabrixxm 2016-09-13 17:19:57 +02:00
  • 9702081722 Friendica 3.5 fabrixxm 2016-09-13 16:46:11 +02:00
  • 4270c90584 Merge pull request #2776 from tobiasd/20160913-installtxt fabrixxm 2016-09-13 15:48:23 +02:00
  • e5825af04b Merge pull request #2777 from tobiasd/20160916-fr fabrixxm 2016-09-13 15:48:07 +02:00
  • 4eec289522 FR update to the strings, THX Damien Goutte-Gattat Tobias Diekershoff 2016-09-13 15:41:38 +02:00
  • ac9dca2d7f reflect requirements from install.md also in install.txt Tobias Diekershoff 2016-09-13 14:49:21 +02:00
  • 0472f0594f Merge pull request #2768 from tobiasd/20160906-changes Michael Vogel 2016-09-12 07:56:08 +02:00
  • d6211c1839 missing bracket Tobias Diekershoff 2016-09-11 08:03:12 +02:00
  • 1807f13a6d work on forumdirectory Tobias Diekershoff 2016-09-09 23:22:59 +02:00
  • 949a5f722a Merge pull request #2774 from annando/1609-worker-processes Tobias Diekershoff 2016-09-09 23:14:02 +02:00
  • 1caa87dce6 Restructured the way, processes are inserted and removed Michael Vogel 2016-09-09 20:55:49 +00:00
  • 22f32d9721 New process table for a better detection of running workers Michael Vogel 2016-09-09 20:33:54 +00:00
  • b312e3591f two more issues closed Tobias Diekershoff 2016-09-09 12:06:21 +02:00
  • 4d959f2f9d Merge pull request #2771 from rabuzarus/0709-frio-dropItem-fix Michael Vogel 2016-09-07 06:53:53 +02:00
  • d506b0906c frio: fix dropItem() didn't work for hubzila posts rabuzarus 2016-09-07 03:22:02 +02:00
  • 7b37a916a3 Merge branch '3.5rc' of https://github.com/friendica/friendica into 20160906-changes Tobias Diekershoff 2016-09-06 21:52:33 +02:00
  • 5ebeb7e85c Merge pull request #2770 from annando/sql-default-value Tobias Diekershoff 2016-09-06 21:37:28 +02:00
  • 6b1b72e1fc Merge remote-tracking branch 'upstream/3.5rc' into sql-default-value Michael Vogel 2016-09-06 19:10:57 +00:00
  • dcca992279 Merge pull request #2767 from tobiasd/20160906-credits Michael Vogel 2016-09-06 21:04:26 +02:00
  • 0a50dbaece New database version Michael Vogel 2016-09-06 19:01:05 +00:00
  • 43cbb02d99 Merge pull request #2769 from rabuzarus/0609-frio-attachment Tobias Diekershoff 2016-09-06 16:33:31 +02:00
  • ced8923323 frio: show attachment icons in posts rabuzarus 2016-09-06 16:21:14 +02:00
  • af29294926 one missing issue Tobias Diekershoff 2016-09-06 08:39:47 +02:00
  • cb0c8335fa changes since 3.4.2 Tobias Diekershoff 2016-09-06 08:36:47 +02:00
  • 80ecb64f03 new contributor to the docs Tobias Diekershoff 2016-09-06 08:30:15 +02:00
  • ac1787d1e5 Merge remote-tracking branch 'upstream/3.5rc' into sql-default-value Michael Vogel 2016-09-05 11:52:41 +00:00
  • 4f1f7c73ca Merge pull request #2765 from annando/1609-attachments rabuzarus 2016-09-05 12:50:31 +02:00
  • e6c5be18cc Merge pull request #2766 from ben-utzer/patch-1 Michael Vogel 2016-09-05 05:18:21 +02:00
  • 2040cb4473 Update htconfig.md ben-utzer 2016-09-05 00:22:39 +02:00
  • 1cb6043aea Attachments are now displayed again. Michael Vogel 2016-09-04 18:06:07 +02:00
  • 6e25077893 Merge pull request #2760 from gerhard6380/3.5rc Michael Vogel 2016-09-03 20:47:52 +02:00
  • 6df40b1161 sQL: No "NOT NULL" on text fields. Michael Vogel 2016-09-03 15:06:42 +00:00
  • eec626f6bf Merge pull request #2762 from annando/1609-tagged rabuzarus 2016-09-03 13:06:43 +02:00
  • c02b1c3f36 The "tagged with" message now works again. Michael Vogel 2016-09-03 12:48:51 +02:00
  • 3a31619509 API: change friendica_activities to include arrays of users gerhard6380 2016-09-02 17:01:52 +02:00
  • 014fc5dccb Merge pull request #2758 from annando/1609-sql-charset Tobias Diekershoff 2016-09-01 09:22:07 +02:00
  • 35813ab377 Set the PHP requirements to php 5.4 Michael Vogel 2016-09-01 06:47:36 +00:00
  • 59ff309ee5 Add the new charset parameter to the database creation Michael Vogel 2016-09-01 04:44:29 +00:00
  • 9209d88c4a Set the charset for the SQL connection for new installations Michael Vogel 2016-09-01 03:50:41 +00:00
  • 02c29f1313 Merge pull request #2748 from rabuzarus/rabuzarus-pending Tobias Diekershoff 2016-08-31 15:55:26 +02:00
  • c62a28d95e Merge pull request #2755 from rabuzarus/theme-init-identity Tobias Diekershoff 2016-08-31 15:53:42 +02:00
  • aedd2cfa60 Update identity.php rabuzarus 2016-08-31 13:49:24 +02:00
  • 1bfe7b432a Merge pull request #2753 from annando/1608-sql-errors rabuzarus 2016-08-29 22:24:37 +02:00
  • 41613ec55d Bugfix: Fixed two bad sql queries Michael Vogel 2016-08-29 18:40:40 +00:00
  • e0d329ece9 Merge pull request #2750 from annando/1608-worker-priority-again rabuzarus 2016-08-28 00:39:58 +02:00
  • fde0665d6d Merge pull request #2749 from annando/1608-dbstructure rabuzarus 2016-08-28 00:39:15 +02:00
  • 6a167cf8b1 Prevent lowest priority calls from never being called Michael Vogel 2016-08-27 21:05:38 +00:00
  • e46dae3937 Removed some accidentally written code Michael Vogel 2016-08-27 19:53:09 +02:00
  • a156d59e2a dbstructure: Set the version when updating manually Michael Vogel 2016-08-27 19:50:19 +02:00
  • c1555b623a best_link_url: don't use redirect for pending contacts rabuzarus 2016-08-26 15:47:45 +02:00
  • 48c216b048 Merge pull request #2747 from rabuzarus/2308-frio_autosize Tobias Diekershoff 2016-08-23 17:23:38 +02:00
  • 9653ae98ae frio: resize textareas on typing. rabuzarus 2016-08-23 16:48:13 +02:00
  • dc6cce4080 Merge pull request #2746 from annando/1608-diaspora-handle-lowercase Tobias Diekershoff 2016-08-23 07:52:35 +02:00
  • 80bfcc7694 The handle (user@domain.tld) for Diaspora contacts must always be lowercase Michael Vogel 2016-08-23 07:48:48 +02:00
  • be4ce36a97 Merge pull request #2745 from annando/1608-atachments Tobias Diekershoff 2016-08-23 07:48:18 +02:00
  • 50dc7a6047 Bugfix: Handle attachments with bbcode inside/handle the [p] bbcode Michael Vogel 2016-08-23 07:40:16 +02:00
  • f9bd6894de Merge pull request #2744 from tobiasd/20160820-cal Michael Vogel 2016-08-23 06:31:49 +02:00
  • 7092bfed0c Merge pull request #2743 from tobiasd/20160819-credits Michael Vogel 2016-08-23 06:30:17 +02:00
  • f344813054 events with no finish should not export it to ical Tobias Diekershoff 2016-08-20 16:16:19 +02:00
  • 24197c30bc updated the credits Tobias Diekershoff 2016-08-19 12:38:45 +02:00
  • 9fa4a3bac6 Merge pull request #2742 from annando/1608-priority-rearranges Tobias Diekershoff 2016-08-19 07:19:32 +02:00
  • 108a1c4ac6 New priority level for stale processes. Michael Vogel 2016-08-18 12:33:17 +02:00
  • 834e6dfb7f Merge pull request #2741 from rabuzarus/1708-frio_fix_contact_edit_delete Tobias Diekershoff 2016-08-17 16:58:00 +02:00
  • 37ae63e120 fix contact dropping on contact edit page also for other themes rabuzarus 2016-08-17 16:51:04 +02:00
  • 03062866f9 Merge pull request #2740 from rabuzarus/1708-frio_fix_contact_edit_delete Tobias Diekershoff 2016-08-17 15:29:37 +02:00
  • 212aa99f28 frio: fix contact dropping on contact edit page rabuzarus 2016-08-17 14:32:43 +02:00
  • 1519ac3bf4 Merge pull request #2739 from annando/1608-session-close Tobias Diekershoff 2016-08-17 07:37:33 +02:00
  • 1bfdc216d0 Only close the session if it had been opened. Michael Vogel 2016-08-16 21:35:12 +02:00