Commit Graph

8168 Commits (bae844e36767836ebf9dbfed10759dfd1a2fbbd6)
 

Author SHA1 Message Date
Michael Vogel bae844e367 New style for shared links. Preparation for changes in some addons
9 years ago
Michael Vogel 3b4a20f987 SQL improvements. New parameter for a maximum amount of comments per thread
9 years ago
Michael Vogel 285584e8d6 Minimal: Disable loading of content at the end of the page, since it makes problems at the moment.
9 years ago
Michael Vogel b750379a47 Merge remote-tracking branch 'upstream/master'
9 years ago
Michael Vogel 3e5b9e97e7 New "minimal" mode for displaying the network content. Preparation for e.g. a multicolumn layout.
9 years ago
Tobias Diekershoff 916b2e7438 Merge pull request #845 from annando/master
9 years ago
Michael Vogel b0dd16696a Solving some more SQL warnings ("limit" must never be used in update statements)
9 years ago
Michael Vogel 1d19e056e7 Sorting plugins after priority and name (better for the configuration page)
9 years ago
Michael Vogel e875a104ce dangerous values in usernames for shared messages from diaspora are now encoded.
9 years ago
Michael Vogel 3331e71e8e disable the output of the "posted" value in shares when item cache is enabled.
9 years ago
Michael Vogel 4f38969148 Optional parameter for parseurl to only fetch data from meta information
9 years ago
fabrixxm 5f0cb264af Merge pull request #843 from annando/master
9 years ago
Michael Vogel 70e017745a Just some code beautification.
9 years ago
Michael Vogel e0cf2c5167 Merge remote-tracking branch 'upstream/master'
9 years ago
Michael Vogel 6684107b66 multiple admin mails. It is now possible to define more than one admin mail address. You can now add multiple addresses, separated by comma.
9 years ago
Tobias Diekershoff acd29f22a0 Merge pull request #842 from annando/master
9 years ago
Michael Vogel 9c2b1d39ea mail settings: inflate/deflate settings
9 years ago
Tobias Diekershoff 00180a746a Merge pull request #837 from msjoberg/internal-push
9 years ago
Mats Sjöberg a19289a8bf Merge branch 'internal-push' of github.com:msjoberg/friendica into internal-push
9 years ago
Mats Sjöberg 862a5e1474 Added push_subscriber table to database.sql.
9 years ago
Mats Sjöberg 1234282b8b Use the push value in the push_subscribers table as a push tries counter as well.
9 years ago
Mats Sjöberg 2859ce1483 Initial implementation of internal PuSH server in Friendica. It has been tested with GNU Social/StatusNet, and subscribe, unsubscribe and pushing new items seem to work.
9 years ago
Tobias Diekershoff f19615c21c Merge pull request #836 from msjoberg/master
9 years ago
Mats Sjöberg 19de78e511 Fixed subscription problem with new GNU Social.
9 years ago
Mats Sjöberg f8c48165c6 Added push_subscriber table to database.sql.
9 years ago
Tobias Diekershoff cc53ef4d77 Merge pull request #834 from tobiasd/issue775
9 years ago
Tobias Diekershoff bd2f1f8cb0 Merge pull request #833 from tobiasd/adduserhint
9 years ago
Tobias Diekershoff 32633d1534 PT-BR: update to the strings
9 years ago
Tobias Diekershoff dfc09f4ba1 DE: update to the strings
9 years ago
Tobias Diekershoff 9144dd3780 rename some fields to fix issue #775
9 years ago
Mats Sjöberg 903ea46ea3 Use the push value in the push_subscribers table as a push tries counter as well.
9 years ago
Mats Sjöberg d22d4a293f Initial implementation of internal PuSH server in Friendica. It has been tested with GNU Social/StatusNet, and subscribe, unsubscribe and pushing new items seem to work.
9 years ago
Tobias Diekershoff d4c56b227d add the hint also as a placeholder in the add contact form (issue #786)
9 years ago
Tobias Diekershoff b3b47f5a41 Merge pull request #832 from tobiasd/newstrings_20131117
9 years ago
Tobias Diekershoff 67dccb2fc7 update to the master string files
9 years ago
Tobias Diekershoff db9e738424 Merge pull request #831 from tobiasd/creategroup_wording
9 years ago
Tobias Diekershoff 2414b0bac0 Merge pull request #830 from tobiasd/savesettings_wording
9 years ago
Tobias Diekershoff 5fd58b29e0 wording for the SUBMIT button while handling with contact groups
9 years ago
Tobias Diekershoff 4101127c01 better worting of the SUBMIT button in the settings tab and the admin panel
9 years ago
Tobias Diekershoff 757cef0f11 Merge pull request #826 from fabrixxm/more_relocate
9 years ago
Fabrixxm 0414e0a316 More "relocate":
9 years ago
Olaf Conradi dd7392d2c5 Merge pull request #825 from oohlaf/fixes
9 years ago
Olaf Conradi 0c31ca6c29 Backport Nginx sample config from Red to Friendica
9 years ago
fabrixxm 3964d86020 Merge pull request #817 from annando/master
9 years ago
fabrixxm 15bb34caf0 Merge pull request #820 from maase2/patch-13
9 years ago
fabrixxm 67ce718272 Merge pull request #818 from maase2/patch-12
9 years ago
fabrixxm 8fde6ae202 Merge pull request #824 from maase2/patch-16
9 years ago
maase2 940f55a2ec Update admin.php
9 years ago
Tobias Diekershoff 825ecad89d CS: update to the strings
9 years ago
maase2 e010eb480e Update style.css
9 years ago