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

Commit Graph

  • 237b5a6e40 New page setting for the maximum frontend load value. Michael Vogel 2015-05-02 22:05:04 +02:00
  • 0812b7a7ac Merge remote-tracking branch 'upstream/develop' into 1503-load-issues Michael Vogel 2015-05-02 21:47:34 +02:00
  • 439aee0a82 Automatically resize iframe if no height was provided. Michael Vogel 2015-05-01 14:29:53 +02:00
  • 747607fe97 Merge remote-tracking branch 'upstream/develop' into 1505-oembed-bbcode Michael Vogel 2015-05-01 11:06:39 +02:00
  • be96b1eaa4 rich content in oembed now replaces the content in attachments Michael Vogel 2015-05-01 10:42:43 +02:00
  • c9e07fa3ac Merge pull request #1543 from annando/1504-oembed-stylesheet Tobias Diekershoff 2015-05-01 10:34:40 +02:00
  • 36188f3727 Merge pull request #1542 from annando/1504-ping Tobias Diekershoff 2015-05-01 10:34:14 +02:00
  • b5e10329f2 The oembed iframe now has a class name to use it for stylesheets. Michael Vogel 2015-04-30 06:12:21 +02:00
  • 100f6343ad Highlighting of user names should now work in every case Michael Vogel 2015-04-30 06:11:05 +02:00
  • 37cd2c45d1 Merge pull request #1539 from annando/issue-1536 Tobias Diekershoff 2015-04-27 07:55:37 +02:00
  • d8558366aa Redefined the conditions when notifications and introductions are shown. Michael Vogel 2015-04-26 22:16:38 +02:00
  • 8184eac42f Merge pull request #1538 from annando/1504-api-twidere-conversations Tobias Diekershoff 2015-04-26 14:02:36 +02:00
  • 96d46588f2 Merge pull request #1537 from annando/1504-notifications-android-app Tobias Diekershoff 2015-04-26 14:01:42 +02:00
  • 58aeb1879b API: The "conversation" function can now be called with every message id of a post in that conversation. Not only the parent. Michael Vogel 2015-04-26 13:26:48 +02:00
  • 5368fbba82 Bugfix: The android app will have readable notifications again. Michael Vogel 2015-04-26 13:25:04 +02:00
  • 7e514d56fe Merge pull request #1535 from annando/1504-matrix-detection Tobias Diekershoff 2015-04-25 13:46:48 +02:00
  • fe1e62560d Merge pull request #1534 from tobiasd/20150425_de Tobias Diekershoff 2015-04-25 11:22:14 +02:00
  • e9dd3b38f3 DE update to the strings Tobias Diekershoff 2015-04-25 11:18:30 +02:00
  • 8e19d36d27 Exchanged the hard coded comparism with the new function. Michael Vogel 2015-04-25 11:08:53 +02:00
  • 20fc0e5285 Don't generate a preview in an item from Diaspora if it is a posting from red matrix. Michael Vogel 2015-04-25 00:50:48 +02:00
  • d2d88e25e4 Merge pull request #1530 from tobiasd/20150424 Tobias Diekershoff 2015-04-24 10:02:42 +02:00
  • deee750dc4 linefeeds in DE docs part of #1478 Tobias Diekershoff 2015-04-24 09:55:16 +02:00
  • 4f01c4947c Merge pull request #1529 from annando/1504-condensed-notifications fabrixxm 2015-04-24 08:42:02 +02:00
  • c348f27e84 Show unread notifications in a different order than read notifications Michael Vogel 2015-04-23 08:59:30 +02:00
  • 7254f42333 Show unread mails and introductions as well. Michael Vogel 2015-04-23 08:37:31 +02:00
  • 893e91a14d Merge pull request #1527 from fraengii/2015-04-22-Chats.md-fraengii Tobias Diekershoff 2015-04-22 13:29:03 +02:00
  • 22fefb731c Chats.md: Linguistic style, capitalization of addresses Frank Dieckmann 2015-04-22 12:28:19 +02:00
  • 04cda104ca New function that will prevent notifications from deleted posts Michael Vogel 2015-04-22 08:39:27 +02:00
  • dd14981ec4 Merge pull request #1526 from fraengii/20150421-Bugs-and-Issues.md Tobias Diekershoff 2015-04-21 21:56:58 +02:00
  • f536301d05 Update Bugs-and-Issues.md Frank Dieckmann 2015-04-21 20:02:47 +02:00
  • b4aecb63e8 Bugs-and-Issues.md: Linguistic style and addresses Frank Dieckmann 2015-04-21 19:22:44 +02:00
  • e2827c0af7 The ID field will be stored with notifications as well. Michael Vogel 2015-04-21 10:14:20 +02:00
  • 261cd441c7 Merge remote-tracking branch 'upstream/develop' into 1504-condensed-notifications Michael Vogel 2015-04-21 10:13:28 +02:00
  • 604a630fdc Merge pull request #1525 from silke/documentation Tobias Diekershoff 2015-04-19 20:08:55 +02:00
  • 4bea25e32f reformatted and reorganized a bit Silke Meyer 2015-04-19 19:15:43 +02:00
  • 8a5f6b0a93 line breaks Silke Meyer 2015-04-19 18:48:16 +02:00
  • 79de00f333 Moved plugin documentation from admin to dev manual Silke Meyer 2015-04-19 18:44:12 +02:00
  • 7fdde0e547 reformatted Silke Meyer 2015-04-19 18:41:42 +02:00
  • ec584b164d line breaks Silke Meyer 2015-04-19 18:04:08 +02:00
  • c62120549e line breaks Silke Meyer 2015-04-19 17:50:17 +02:00
  • f19fb2d307 reformatted Silke Meyer 2015-04-18 19:56:50 +02:00
  • 00dc2945ba Reformatted Silke Meyer 2015-04-18 19:51:57 +02:00
  • 963d76fa37 Reformatting and minor changes to content Silke Meyer 2015-04-18 19:46:11 +02:00
  • 02f03c0313 Reformatted Silke Meyer 2015-04-18 19:31:19 +02:00
  • 584c2e4a58 Reformatting and minor changes to content Silke Meyer 2015-04-18 18:57:22 +02:00
  • f1fc55736b Reformatting and minor changes to content Silke Meyer 2015-04-18 18:39:16 +02:00
  • a677e12b50 Merge pull request #1516 from tobiasd/issue1429 fabrixxm 2015-04-18 17:15:22 +02:00
  • 3bab439540 line breaks Silke Meyer 2015-04-18 17:10:14 +02:00
  • 32cb1eb9f1 Merge pull request #1524 from silke/documentation Tobias Diekershoff 2015-04-18 17:04:05 +02:00
  • 00a3960df0 Reformatting, cropped the admin part of SSL documentation out of the users' question Silke Meyer 2015-04-18 16:56:56 +02:00
  • 90c657e211 Formatting and minor changes Silke Meyer 2015-04-18 16:02:39 +02:00
  • 5b9f29cade Formatting and some minor changes Silke Meyer 2015-04-18 15:51:27 +02:00
  • 4f4dc6b7e0 minor formatting stuff mainly Silke Meyer 2015-04-17 18:23:00 +02:00
  • f4eaf5842d sorted out the headings' md syntax Silke Meyer 2015-04-17 18:17:44 +02:00
  • 7faf4de3af md syntax, fixed minor typos Silke Meyer 2015-04-17 18:05:54 +02:00
  • 27c101e041 line breaks Silke Meyer 2015-04-17 18:00:57 +02:00
  • 40f9568ee4 Proper markdown subheadings Silke Meyer 2015-04-17 17:10:27 +02:00
  • 60f963c685 line breaks Silke Meyer 2015-04-17 17:03:20 +02:00
  • 86c3d16726 Proper markdown subheadings Silke Meyer 2015-04-17 16:58:48 +02:00
  • ecb33e2b6f Added branching workflow, reformatted markdown syntax Silke Meyer 2015-04-17 16:56:41 +02:00
  • e6d516a355 Just added linebreaks Silke Meyer 2015-04-17 16:04:10 +02:00
  • 9210e4f0d4 Merge pull request #1521 from tugelbend/develop fabrixxm 2015-04-17 10:05:24 +02:00
  • 62b4f117bf bug fix: "local_" has 6 not 5 characters Hauke Altmann 2015-04-17 10:02:17 +02:00
  • fdb74b6a42 Merge pull request #1520 from tugelbend/develop fabrixxm 2015-04-17 10:01:51 +02:00
  • c292d01723 bug fix: substring is not a PHP function %-) Hauke Altmann 2015-04-17 09:59:28 +02:00
  • 519018d430 Merge pull request #1512 from fraengii/2015-04-12-Account-Basics.md Tobias Diekershoff 2015-04-17 09:45:41 +02:00
  • 8e5f224730 Merge pull request #1503 from fraengii/20150408-H-de-fraengii Tobias Diekershoff 2015-04-17 09:45:22 +02:00
  • c6aeaa8fc1 Merge pull request #1519 from silke/documentation Tobias Diekershoff 2015-04-17 09:42:49 +02:00
  • 99cc1419f6 Modified according to #1478 (line break after each sentence) Silke Meyer 2015-04-17 09:13:40 +02:00
  • 803a9328b4 Corrected typo Silke Meyer 2015-04-17 09:08:57 +02:00
  • cbe4e2bf8c Merge pull request #1518 from tugelbend/develop fabrixxm 2015-04-17 08:41:59 +02:00
  • 00cbc383f5 code cleanup hauke 2015-04-16 21:07:46 +02:00
  • 0d61e462fe preserve local index of friendica database when updating hauke 2015-04-16 21:05:37 +02:00
  • d42cea51a2 The item id is now stored in every notification as well Michael Vogel 2015-04-16 07:18:06 +02:00
  • 7a1db2e083 Only show one notification per parent Michael Vogel 2015-04-16 06:47:09 +02:00
  • 94451a5eb5 Merge pull request #1517 from tobiasd/20150414_lng fabrixxm 2015-04-14 20:08:24 +02:00
  • 14d61b5644 FR update of the strings Tobias Diekershoff 2015-04-14 13:41:56 +02:00
  • 60a17ef88e CS update of the strings Tobias Diekershoff 2015-04-14 13:40:24 +02:00
  • 8367cadeef dont normalise OpenID URLs and fallback to https if no protocol is specified Tobias Diekershoff 2015-04-14 12:27:36 +02:00
  • 2285b3b7a7 Storing the parent with every notification Michael Vogel 2015-04-14 06:54:41 +02:00
  • 3525df9e11 Schreibfehler korrigiert Frank Dieckmann 2015-04-13 18:16:42 +02:00
  • fd065e6aec Klicke auf "Pinnwand" Frank Dieckmann 2015-04-13 18:13:59 +02:00
  • 1089521249 Some more adds Frank Dieckmann 2015-04-13 18:09:05 +02:00
  • 178b7eba1b Merge pull request #1487 from fabrixxm/projects Michael Vogel 2015-04-13 15:47:11 +02:00
  • ef6ddfcb15 Merge pull request #1515 from treellama/develop Tobias Diekershoff 2015-04-13 07:44:04 +02:00
  • ce821d0891 use ImageMagick for orientation when available Gregory Smith 2015-04-12 21:09:25 -04:00
  • 1f5ee8a9e9 Capitalization of addresses an linguistic style in Account-Basics.md Frank Dieckmann 2015-04-12 15:32:02 +02:00
  • ccba86b384 Merge pull request #1511 from annando/1504-contact-last-item Tobias Diekershoff 2015-04-12 15:09:47 +02:00
  • b8542e336c Merge remote-tracking branch 'upstream/develop' into 1504-contact-last-item Michael Vogel 2015-04-12 11:56:02 +02:00
  • 9a35e861ce New field in the contact table to better detect "dead profiles" Michael Vogel 2015-04-12 11:40:38 +02:00
  • d5ad32a309 Merge pull request #1510 from annando/1504-contact-update Tobias Diekershoff 2015-04-12 10:56:36 +02:00
  • 64e343ed4b Some refinement to the contact update Michael Vogel 2015-04-12 10:32:02 +02:00
  • 1058d055d1 Merge remote-tracking branch 'upstream/develop' into 1504-contact-update Michael Vogel 2015-04-12 09:59:28 +02:00
  • a0adf8c6a2 change remoteauth endpoint path fabrixxm 2015-04-12 08:53:30 +02:00
  • 8b2742dc7d Merge pull request #1505 from annando/1504-unified-follow fabrixxm 2015-04-12 08:48:36 +02:00
  • 1731db45c2 Merge pull request #1509 from annando/1504-code-rework fabrixxm 2015-04-12 08:45:31 +02:00
  • 04d9d9863d Fixed "Copy and paste" bug. Michael Vogel 2015-04-11 23:56:53 +02:00
  • 2c3e2908b2 There is now a new possibility to update contact data. Michael Vogel 2015-04-11 23:51:47 +02:00
  • 0e895e24f7 Code reworks: replaced hardcoded network text with the corresponding constants. Michael Vogel 2015-04-11 22:14:56 +02:00
  • 190b7d6070 Merge remote-tracking branch 'upstream/develop' into 1504-unified-follow Michael Vogel 2015-04-10 11:34:21 +02:00