clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,645 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

9645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Vogel 237b5a6e40 New page setting for the maximum frontend load value. 2015-05-02 22:05:04 +02:00
Michael Vogel 0812b7a7ac Merge remote-tracking branch 'upstream/develop' into 1503-load-issues 2015-05-02 21:47:34 +02:00
Tobias Diekershoff c9e07fa3ac Merge pull request #1543 from annando/1504-oembed-stylesheet 
The oembed iframe now has a class name to use it for stylesheets.
 2015-05-01 10:34:40 +02:00
Tobias Diekershoff 36188f3727 Merge pull request #1542 from annando/1504-ping 
Highlighting of user names should now work in every case
 2015-05-01 10:34:14 +02:00
Michael Vogel b5e10329f2 The oembed iframe now has a class name to use it for stylesheets. 2015-04-30 06:12:21 +02:00
Michael Vogel 100f6343ad Highlighting of user names should now work in every case 2015-04-30 06:11:05 +02:00
Tobias Diekershoff 37cd2c45d1 Merge pull request #1539 from annando/issue-1536 
Redefined the conditions when notifications and introductions are shown.
 2015-04-27 07:55:37 +02:00
Michael Vogel d8558366aa Redefined the conditions when notifications and introductions are shown. 2015-04-26 22:16:38 +02:00
Tobias Diekershoff 8184eac42f Merge pull request #1538 from annando/1504-api-twidere-conversations 
API: The "conversation" function can now be called with every message id
 2015-04-26 14:02:36 +02:00
Tobias Diekershoff 96d46588f2 Merge pull request #1537 from annando/1504-notifications-android-app 
Bugfix: The android app will have readable notifications again.
 2015-04-26 14:01:42 +02:00
Michael Vogel 58aeb1879b API: The "conversation" function can now be called with every message id of a post in that conversation. Not only the parent. 2015-04-26 13:26:48 +02:00
Michael Vogel 5368fbba82 Bugfix: The android app will have readable notifications again. 2015-04-26 13:25:04 +02:00
Tobias Diekershoff 7e514d56fe Merge pull request #1535 from annando/1504-matrix-detection 
New function that detects red matrix accounts
 2015-04-25 13:46:48 +02:00
Tobias Diekershoff fe1e62560d Merge pull request #1534 from tobiasd/20150425_de 
DE update to the strings
 2015-04-25 11:22:14 +02:00
Tobias Diekershoff e9dd3b38f3 DE update to the strings 2015-04-25 11:18:30 +02:00
Michael Vogel 8e19d36d27 Exchanged the hard coded comparism with the new function. 2015-04-25 11:08:53 +02:00
Michael Vogel 20fc0e5285 Don't generate a preview in an item from Diaspora if it is a posting from red matrix. 2015-04-25 00:50:48 +02:00
Tobias Diekershoff d2d88e25e4 Merge pull request #1530 from tobiasd/20150424 
linefeeds in DE docs part of #1478
 2015-04-24 10:02:42 +02:00
Tobias Diekershoff deee750dc4 linefeeds in DE docs part of #1478 2015-04-24 09:55:16 +02:00
fabrixxm 4f01c4947c Merge pull request #1529 from annando/1504-condensed-notifications 
Condensed notifications
 2015-04-24 08:42:02 +02:00
Michael Vogel c348f27e84 Show unread notifications in a different order than read notifications 2015-04-23 08:59:30 +02:00
Michael Vogel 7254f42333 Show unread mails and introductions as well. 2015-04-23 08:37:31 +02:00
Tobias Diekershoff 893e91a14d Merge pull request #1527 from fraengii/2015-04-22-Chats.md-fraengii 
Chats.md: Linguistic style, capitalization of addresses
 2015-04-22 13:29:03 +02:00
Frank Dieckmann 22fefb731c Chats.md: Linguistic style, capitalization of addresses 2015-04-22 12:28:19 +02:00
Michael Vogel 04cda104ca New function that will prevent notifications from deleted posts 2015-04-22 08:39:27 +02:00
Tobias Diekershoff dd14981ec4 Merge pull request #1526 from fraengii/20150421-Bugs-and-Issues.md 
Bugs-and-Issues.md: Linguistic style and addresses
 2015-04-21 21:56:58 +02:00
Frank Dieckmann f536301d05 Update Bugs-and-Issues.md 2015-04-21 20:02:47 +02:00
Frank Dieckmann b4aecb63e8 Bugs-and-Issues.md: Linguistic style and addresses 2015-04-21 19:22:44 +02:00
Michael Vogel e2827c0af7 The ID field will be stored with notifications as well. 2015-04-21 10:14:20 +02:00
Michael Vogel 261cd441c7 Merge remote-tracking branch 'upstream/develop' into 1504-condensed-notifications 2015-04-21 10:13:28 +02:00
Tobias Diekershoff 604a630fdc Merge pull request #1525 from silke/documentation 
And... still more files
 2015-04-19 20:08:55 +02:00
Silke Meyer 4bea25e32f reformatted and reorganized a bit 2015-04-19 19:15:43 +02:00
Silke Meyer 8a5f6b0a93 line breaks 2015-04-19 18:48:16 +02:00
Silke Meyer 79de00f333 Moved plugin documentation from admin to dev manual 2015-04-19 18:44:12 +02:00
Silke Meyer 7fdde0e547 reformatted 2015-04-19 18:41:42 +02:00
Silke Meyer ec584b164d line breaks 2015-04-19 18:04:08 +02:00
Silke Meyer c62120549e line breaks 2015-04-19 17:50:17 +02:00
Silke Meyer f19fb2d307 reformatted 2015-04-18 19:56:50 +02:00
Silke Meyer 00dc2945ba Reformatted 2015-04-18 19:51:57 +02:00
Silke Meyer 963d76fa37 Reformatting and minor changes to content 2015-04-18 19:46:11 +02:00
Silke Meyer 02f03c0313 Reformatted 2015-04-18 19:31:19 +02:00
Silke Meyer 584c2e4a58 Reformatting and minor changes to content 2015-04-18 18:57:22 +02:00
Silke Meyer f1fc55736b Reformatting and minor changes to content 2015-04-18 18:39:16 +02:00
fabrixxm a677e12b50 Merge pull request #1516 from tobiasd/issue1429 
regarding issue 1429
 2015-04-18 17:15:22 +02:00
Silke Meyer 3bab439540 line breaks 2015-04-18 17:10:14 +02:00
Tobias Diekershoff 32cb1eb9f1 Merge pull request #1524 from silke/documentation 
More updated and reformatted documentation files
 2015-04-18 17:04:05 +02:00
Silke Meyer 00a3960df0 Reformatting, cropped the admin part of SSL documentation out of the users' question 2015-04-18 16:56:56 +02:00
Silke Meyer 90c657e211 Formatting and minor changes 2015-04-18 16:02:39 +02:00
Silke Meyer 5b9f29cade Formatting and some minor changes 2015-04-18 15:51:27 +02:00
Silke Meyer 4f4dc6b7e0 minor formatting stuff mainly 2015-04-17 18:23:00 +02:00