Commit graph

8626 commits

Author SHA1 Message Date
Tobias Diekershoff b5785c3f16 Merge pull request #852 from annando/master
Bugfix: Problem with page switching with the old pager solved
2013-12-10 07:30:26 -08:00
Michael Vogel eca9431909 Bugfix: Problem with page switching with the old pager solved 2013-12-10 15:45:26 +01:00
Tobias Diekershoff 55e8e03e38 Merge pull request #851 from annando/master
Keeping an offset for page switching
2013-12-10 02:22:18 -08:00
Michael Vogel 7e5c8ab91c Keeping an offset for page switching: This helps so that you don't see old messages 2013-12-10 00:13:19 +01:00
Tobias Diekershoff c56e0ab0cc Merge pull request #850 from annando/master
New style for shared links. Preparation for changes in some addons
2013-12-08 23:15:07 -08:00
Michael Vogel d20d2f74ae Bugfix: Page switching had a problem with the search. And automatic reloading hadn't worked with some search terms 2013-12-08 20:10:28 +01:00
Michael Vogel bae844e367 New style for shared links. Preparation for changes in some addons 2013-12-08 16:49:07 +01:00
Tobias Diekershoff 19984f786b Merge pull request #849 from annando/master
SQL improvements. New parameter for a maximum amount of comments per thread
2013-12-08 06:53:57 -08:00
Michael Vogel 3b4a20f987 SQL improvements. New parameter for a maximum amount of comments per thread 2013-12-08 14:49:24 +01:00
Tobias Diekershoff aa7b05e8dc Merge pull request #848 from annando/master
New "minimal" mode for displaying the network content. Preparation for e.g. a multicolumn layout.
2013-12-06 03:31:19 -08:00
Michael Vogel 285584e8d6 Minimal: Disable loading of content at the end of the page, since it makes problems at the moment. 2013-12-05 20:41:30 +01:00
Michael Vogel b750379a47 Merge remote-tracking branch 'upstream/master' 2013-12-05 00:13:31 +01:00
Michael Vogel 3e5b9e97e7 New "minimal" mode for displaying the network content. Preparation for e.g. a multicolumn layout. 2013-12-04 23:46:51 +01:00
Tobias Diekershoff 916b2e7438 Merge pull request #845 from annando/master
Many small bugfixes and features ...
2013-12-03 10:39:23 -08:00
Michael Vogel b0dd16696a Solving some more SQL warnings ("limit" must never be used in update statements) 2013-12-02 20:30:24 +01:00
Michael Vogel 1d19e056e7 Sorting plugins after priority and name (better for the configuration page) 2013-12-02 20:28:30 +01:00
Michael Vogel e875a104ce dangerous values in usernames for shared messages from diaspora are now encoded. 2013-12-02 20:26:57 +01:00
Michael Vogel 3331e71e8e disable the output of the "posted" value in shares when item cache is enabled. 2013-12-02 20:25:43 +01:00
Michael Vogel 4f38969148 Optional parameter for parseurl to only fetch data from meta information 2013-12-02 20:24:41 +01:00
fabrixxm 5f0cb264af Merge pull request #843 from annando/master
multiple admin mails
2013-12-02 00:35:13 -08:00
Michael Vogel 70e017745a Just some code beautification. 2013-12-02 00:41:59 +01:00
Michael Vogel e0cf2c5167 Merge remote-tracking branch 'upstream/master'
Conflicts:
	mod/admin.php
	mod/settings.php
2013-12-02 00:33:46 +01:00
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. 2013-12-02 00:11:31 +01:00
Tobias Diekershoff acd29f22a0 Merge pull request #842 from annando/master
mail settings: inflate/deflate settings
2013-12-01 02:26:36 -08:00
Michael Vogel 9c2b1d39ea mail settings: inflate/deflate settings 2013-11-30 21:32:44 +01:00
Tobias Diekershoff 00180a746a Merge pull request #837 from msjoberg/internal-push
Internal PuSH server for Friendica.
2013-11-26 21:21:56 -08:00
Mats Sjöberg a19289a8bf Merge branch 'internal-push' of github.com:msjoberg/friendica into internal-push 2013-11-21 21:44:50 +02:00
Mats Sjöberg 862a5e1474 Added push_subscriber table to database.sql. 2013-11-21 21:44:18 +02:00
Mats Sjöberg 1234282b8b Use the push value in the push_subscribers table as a push tries counter as well. 2013-11-21 21:44:18 +02:00
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. 2013-11-21 21:44:18 +02:00
Tobias Diekershoff f19615c21c Merge pull request #836 from msjoberg/master
Fixed subscription problem with new GNU Social.
2013-11-21 11:03:47 -08:00
Mats Sjöberg 19de78e511 Fixed subscription problem with new GNU Social. 2013-11-21 19:41:06 +01:00
Mats Sjöberg f8c48165c6 Added push_subscriber table to database.sql. 2013-11-19 22:44:16 +02:00
Tobias Diekershoff cc53ef4d77 Merge pull request #834 from tobiasd/issue775
rename the password field
2013-11-19 02:35:35 -08:00
Tobias Diekershoff bd2f1f8cb0 Merge pull request #833 from tobiasd/adduserhint
add the hint also as a placeholder in the add contact form (issue #786)
2013-11-19 02:34:54 -08:00
Tobias Diekershoff 32633d1534 PT-BR: update to the strings 2013-11-19 09:40:16 +01:00
Tobias Diekershoff dfc09f4ba1 DE: update to the strings 2013-11-19 09:39:54 +01:00
Tobias Diekershoff 9144dd3780 rename some fields to fix issue #775 2013-11-17 16:45:24 +01:00
Mats Sjöberg 903ea46ea3 Use the push value in the push_subscribers table as a push tries counter as well. 2013-11-17 17:13:38 +02:00
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. 2013-11-17 17:13:38 +02:00
Tobias Diekershoff d4c56b227d add the hint also as a placeholder in the add contact form (issue #786) 2013-11-17 16:09:44 +01:00
Tobias Diekershoff b3b47f5a41 Merge pull request #832 from tobiasd/newstrings_20131117
update to the master string files
2013-11-17 06:50:25 -08:00
Tobias Diekershoff 67dccb2fc7 update to the master string files 2013-11-17 15:46:46 +01:00
Tobias Diekershoff db9e738424 Merge pull request #831 from tobiasd/creategroup_wording
wording for the SUBMIT button while handling with contact groups
2013-11-17 06:36:39 -08:00
Tobias Diekershoff 2414b0bac0 Merge pull request #830 from tobiasd/savesettings_wording
better worting of the SUBMIT button in the settings tab and the admin pa...
2013-11-17 06:34:54 -08:00
Tobias Diekershoff 5fd58b29e0 wording for the SUBMIT button while handling with contact groups 2013-11-17 15:33:07 +01:00
Tobias Diekershoff 4101127c01 better worting of the SUBMIT button in the settings tab and the admin panel 2013-11-17 15:22:11 +01:00
Tobias Diekershoff 757cef0f11 Merge pull request #826 from fabrixxm/more_relocate
More "relocate":
2013-11-15 23:27:26 -08:00
Fabrixxm 0414e0a316 More "relocate":
button in user's setting to resend relocate message to contacts
option in admin's site setting to relocate a server
2013-11-13 06:07:49 -05:00
Olaf Conradi dd7392d2c5 Merge pull request #825 from oohlaf/fixes
Backport Nginx sample config from Red to Friendica
2013-11-12 15:30:56 -08:00