Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-01 22:09:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
29527 commits 3 branches 64 tags 242 MiB
Commit graph

29527 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
8ec7f1de56 Issue 3571: Reworked "get_contact" function 2017-07-11 18:32:35 +00:00
Michael
41ec057813 Avoid "Invalid argument" warning in probing. 2017-07-11 17:34:38 +00:00
Tobias Diekershoff
81dedb3f92 Merge pull request #3577 from annando/2in1 
Issue 3571 and Diaspora mail bugfix
 2017-07-11 08:31:39 +02:00
Michael Vogel
ee015a249e Merge pull request #3576 from tobiasd/20170710-messages 
regenerated master messages.po file
 2017-07-11 05:58:43 +02:00
Michael
363322ba78 Issue 3571 and Diaspora mail bugfix 2017-07-10 22:35:32 +00:00
Tobias Diekershoff
e88a999a72 regenerated master messages.po file 2017-07-10 18:59:59 +02:00
Michael Vogel
896bf4046c Merge pull request #3569 from tobiasd/20170702-delete 
delete item from admin panel
 2017-07-10 18:44:19 +02:00
Michael Vogel
ef3398f09a Merge pull request #3573 from irhen/issue-3529-fix-mega-age 
fix big age
 2017-07-10 18:43:05 +02:00
Tobias Diekershoff
dc41ac0f61 use drop_item and some magic 2017-07-10 14:55:40 +02:00
irhen
c6137ca0df is empty check 2017-07-10 14:17:06 +03:00
Tobias Diekershoff
6bbc1ac602 Merge pull request #3575 from annando/dfrn-update-copy 
DFRN: Update the public item copy as well
 2017-07-09 10:17:22 +02:00
Tobias Diekershoff
5921fd03e5 Merge pull request #3574 from annando/further-expire-split 
Split the delete process into a separate expire process
 2017-07-09 10:15:34 +02:00
Michael
9f92fddb00 DFRN: Update the public item copy as well 2017-07-09 04:29:35 +00:00
Michael Vogel
6b1b02472a Merge pull request #3570 from beardyunixer/boot 
Fix/workaround weird load order issue.
 2017-07-09 05:56:03 +02:00
Michael Vogel
0092cdef44 Merge pull request #3572 from deantownsley/contactfix_basic 
Only delete uid=0 entries when cleaning up extra public entries
 2017-07-09 05:55:19 +02:00
Michael
af181941db Split the delete process into a separate expire process 2017-07-09 03:37:20 +00:00
irhen
534f79a5a5 fix big age 2017-07-08 23:30:30 +03:00
Michael Vogel
8863f0e234 Merge pull request #3554 from Alkarex/semaphore_warning 
Hide semaphore warning
 2017-07-08 18:32:07 +02:00
Thomas Willingham
11c5f471af Fix/workaround weird load order issue. 2017-07-08 16:25:13 +01:00
Dean Townsley
11d271f3c5 Only delete uid=0 entries when cleaning up extra public entries 
This delete can inadvertently remove contacts from normal users under
some conditions.  Since it appears to be intended to only operate on
"public" (uid=0) contacts, this change constrains the delete query to
only uid=0 records.
 2017-07-08 09:55:40 -05:00
Alexandre Alapetite
080da4777d Use unset after unlock 
https://github.com/friendica/friendica/pull/3554#issuecomment-313741392
 2017-07-08 11:03:41 +02:00
Tobias Diekershoff
d88584af69 Merge pull request #3567 from rjm6823/develop 
Contacts page directory link
 2017-07-08 08:36:54 +02:00
Tobias Diekershoff
9304bb6422 Typos 2017-07-07 20:54:26 +02:00
Tobias Diekershoff
56a57aaca4 Merge pull request #3564 from annando/1707-expire 
Split expire.php in several processes / small worker changes
 2017-07-07 19:47:22 +02:00
Michael Vogel
512e58a7db Merge pull request #3568 from tobiasd/20170707-esde 
DE and ES translations
 2017-07-07 18:56:26 +02:00
Alexandre Alapetite
84972623f7 Order of semaphore processing 2017-07-07 18:26:43 +02:00
Alexandre Alapetite
3bb77d2686 Merge branch 'develop' into semaphore_warning 2017-07-07 17:49:52 +02:00
Tobias Diekershoff
aabde5422b allow the admin to delete an item by GUID from the admin panel 2017-07-07 10:38:07 +02:00
Tobias Diekershoff
d535864d98 added template for delete item 2017-07-07 10:37:36 +02:00
Tobias Diekershoff
1e0f4c2f70 DE and ES translations 2017-07-07 08:43:10 +02:00
RJ Madsen
fec2f8fd82 Replacing quotes around new directory link 2017-07-06 17:56:18 -04:00
RJ Madsen
d7de2e0750 Fixed minor spaces to tabs conversion 2017-07-06 17:33:30 -04:00
RJ Madsen
c4b40babb0 Switched to proper global directory instead of local directory 2017-07-06 17:31:36 -04:00
RJ Madsen
7593152bcb re-named variable to match scheme 2017-07-06 16:37:55 -04:00
RJ Madsen
b7b8c5477b Converted from space to tab indentation 2017-07-06 15:27:03 -04:00
RJ Madsen
255f38710c Added global directory link to the find people side panel 2017-07-06 14:19:58 -04:00
Michael
30b0a035f9 Split expire.php in several processes / small worker changes 2017-07-06 05:48:02 +00:00
Tobias Diekershoff
fd36e4e8b0 Merge pull request #3559 from annando/some-more-poller 
The endless story "poller" just continues ;-)
 2017-07-04 08:38:38 +02:00
Michael
c8b1b51809 Improved logging 2017-07-04 05:31:42 +00:00
Michael
0ab7915810 Only kill the first stale process 2017-07-04 05:01:06 +00:00
rabuzarus
8ed6b037cf Merge pull request #3561 from annando/issue-3560 
Guests should be able to use the search as well
 2017-07-04 01:09:01 +02:00
Michael
e26991ba26 Guests should be able to use the search as well 2017-07-03 20:48:44 +00:00
Michael Vogel
bd43ee1277 Merge pull request #3556 from tobiasd/20170628-doc 
small additions to the docs
 2017-07-02 21:45:12 +02:00
Michael
bae4569a0b Avoid the killing of the wrong process 2017-07-02 19:43:36 +00:00
Tobias Diekershoff
87bcc1db97 Update INSTALL.txt 2017-07-02 21:39:15 +02:00
Michael Vogel
2b161108fe Merge pull request #3439 from tobiasd/20170506-token 
[Needs OpenID testing] Add token to register
 2017-07-02 21:31:53 +02:00
Tobias Diekershoff
29e9705d26 Update Install.md 2017-07-02 07:52:07 +02:00
Tobias Diekershoff
089d58527e Update INSTALL.txt 2017-07-02 07:51:31 +02:00
Michael
0cd9db9cb7 Degrade priority step by step 2017-07-01 18:55:12 +00:00
Michael
7726353601 Prevent soon killings 2017-06-30 23:08:08 +00:00