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 |
|
tobiasd
|
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 |
|
|
tobiasd
|
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 |
|
|
tobiasd
|
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 |
|
|
tobiasd
|
cc53ef4d77
|
Merge pull request #834 from tobiasd/issue775
rename the password field
|
2013-11-19 02:35:35 -08:00 |
|
|
tobiasd
|
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 |
|
|
tobiasd
|
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 |
|
|
tobiasd
|
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 |
|
|
tobiasd
|
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 |
|
|
tobiasd
|
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 |
|
Olaf Conradi
|
0c31ca6c29
|
Backport Nginx sample config from Red to Friendica
|
2013-11-13 00:29:12 +01:00 |
|
|
fabrixxm
|
3964d86020
|
Merge pull request #817 from annando/master
SQL: Query for showing group posts is improved, order by comment date now is working again
|
2013-11-11 01:51:58 -08:00 |
|
|
fabrixxm
|
15bb34caf0
|
Merge pull request #820 from maase2/patch-13
Update style.css
|
2013-11-11 01:49:37 -08:00 |
|
|
fabrixxm
|
67ce718272
|
Merge pull request #818 from maase2/patch-12
Update Install.md
|
2013-11-11 01:44:39 -08:00 |
|
|
fabrixxm
|
8fde6ae202
|
Merge pull request #824 from maase2/patch-16
Update admin.php
|
2013-11-11 01:43:30 -08:00 |
|
maase2
|
940f55a2ec
|
Update admin.php
Improve the SQL query to keep the result quantity small
|
2013-11-10 13:23:06 +01:00 |
|
|
Tobias Diekershoff
|
825ecad89d
|
CS: update to the strings
|
2013-11-08 19:43:03 +01:00 |
|
|
maase2
|
e010eb480e
|
Update style.css
Add warning-message class
|
2013-11-08 14:34:12 +01:00 |
|
|
maase2
|
43dd0ec007
|
Update Install.md
Add package instructions
|
2013-11-08 12:38:19 +01:00 |
|
|
Michael Vogel
|
7ba1416e64
|
SQL: Query for showing group posts is improved, order by comment date now work again
|
2013-11-08 08:11:39 +01:00 |
|
|
Tobias Diekershoff
|
c53b483293
|
DE: update to the strings
|
2013-11-07 10:53:47 +01:00 |
|
|
tobiasd
|
8feeba7af5
|
rev update
|
2013-11-07 10:06:10 +01:00 |
|
|
tobiasd
|
7d1a6cc1d6
|
Merge pull request #803 from annando/master
SQL performance and reduction of database warnings
|
2013-11-07 01:03:31 -08:00 |
|
|
tobiasd
|
b80e3426fa
|
Merge pull request #816 from tobiasd/20131107-strings2
update to util strings.php
|
2013-11-07 00:44:57 -08:00 |
|
|
Tobias Diekershoff
|
a8d87d5242
|
update to util strings.php
|
2013-11-07 09:43:19 +01:00 |
|
|
tobiasd
|
c68bcffd33
|
Merge pull request #815 from tobiasd/20131107-strings
update to the util/message.po file to new strings can be translated
|
2013-11-07 00:36:25 -08:00 |
|
|
Tobias Diekershoff
|
bf48885bed
|
update to the util/message.po file to new strings can be translated
|
2013-11-07 09:33:33 +01:00 |
|
|
tobiasd
|
a8ec441d10
|
Merge pull request #810 from maase2/patch-7
Update Contact.php
|
2013-11-06 00:47:05 -08:00 |
|
|
maase2
|
787db1f7d6
|
Update Contact.php
Add the delete option for a contact.
|
2013-11-05 22:06:23 +01:00 |
|
|
tobiasd
|
d1a0206cdd
|
Merge pull request #806 from maase2/patch-6
Update style.css
|
2013-11-03 23:37:05 -08:00 |
|