friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
16,461 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

16461 Commits

Author SHA1 Message Date
Hypolite Petovan cd1724eb9e
Merge pull request #3875 from zeroadam/Issue-#3873 
Replace deprecated (P)Config functions with new syntax
 2017-11-07 11:07:54 -05:00
Adam Magness 59d6ae63b1 Spelling correction 
delete is not spelled delele!
 2017-11-07 11:05:16 -05:00
Adam Magness b995e858e6 Review changes 
Replacements for ::delete() as well as changes to include use statements.
 2017-11-07 09:12:01 -05:00
Adam Magness 1a83b80dbd Review Updates 
Reverted changes made to .sql file and Errant use statement in Probe class.
 2017-11-07 06:43:34 -05:00
Adam Magness 957c7a246c Merge remote-tracking branch 'origin/Issue-#3873' into Issue-#3873 2017-11-07 06:24:58 -05:00
Adam Magness 0dfa57948f Issue-#3873 
Replace deprecated functions with new syntax.
 2017-11-07 06:24:39 -05:00
Michael Vogel 9eb1f4b9c3
Merge pull request #3877 from tobiasd/20171107-messages 
regenerated master messages.po file
 2017-11-07 09:20:24 +01:00
Tobias Diekershoff 9c5000e0b0 regenerated master messages.po file 2017-11-07 07:04:43 +01:00
Michael Vogel 669dafcf22
Merge pull request #3876 from tobiasd/2017107-followup3874 
add version info to notification text
 2017-11-07 06:44:05 +01:00
Tobias Diekershoff a49c1be7c9 add version info to notification text 2017-11-07 06:32:10 +01:00
Adam Magness acb4630eed Issue-#3873 
Replace deprecated functions with new syntax.
 2017-11-06 21:22:52 -05:00
Hypolite Petovan c847a2f9cc
Merge pull request #3874 from tobiasd/20171009-checkversion 
check upstream version
 2017-11-06 13:59:49 -05:00
Tobias Diekershoff 3b15b19e62 switches, no ifs 2017-11-06 18:57:40 +01:00
Tobias Diekershoff 64066592a4 some debug logging 2017-11-06 18:27:29 +01:00
Tobias Diekershoff f097d4d479 std foo 2 2017-11-06 18:21:16 +01:00
Tobias Diekershoff 7881fd7dc9 std foo 2017-11-06 18:20:39 +01:00
Tobias Diekershoff 143e7fc6b7 dont use the entire url as option 2017-11-06 18:05:42 +01:00
Tobias Diekershoff 1f9b52f2bf code corrections 2017-11-06 17:45:33 +01:00
Hypolite Petovan 02cd652c13
Merge pull request #3872 from annando/worker-class 
New worker class that does all the work
 2017-11-06 10:51:25 -05:00
Michael 1607527447 And some more 2017-11-06 15:40:27 +00:00
Michael 28701a8df3 Some small correction 2017-11-06 15:38:15 +00:00
Michael 4ebb76e5a6 Changed explanation 2017-11-06 15:32:34 +00:00
Michael 930309d2ec Merge remote-tracking branch 'upstream/develop' into worker-class 2017-11-05 17:23:53 +00:00
Michael Vogel 2f0005713f
Merge pull request #3871 from MrPetovan/task/move-languagedetect-to-vendor 
Move languagedetect to vendor
 2017-11-05 18:17:22 +01:00
Michael 84c3c0753e Now we use only dba functions 2017-11-05 17:13:37 +00:00
Michael 70c08dee1d Some more improvements 2017-11-05 15:28:55 +00:00
Hypolite Petovan 3987052794 Remove LanguageDetect from library folder 2017-11-05 09:01:17 -05:00
Hypolite Petovan cff1de034f Remove reference to languagedetect in library folder 2017-11-05 09:00:34 -05:00
Hypolite Petovan 7d876aab98 Add pear/Text_LanguageDetect to Composer/vendor 
- Updated mobiledetectlib to 2.8.26
- Updated PEAR to 1.10.5
- Updated Archive_Tar to 1.4.3
- Updated XML_Util to 1.4.3
 2017-11-05 08:34:02 -05:00
Hypolite Petovan 93fd189198
Merge pull request #3866 from annando/detailled_notif 
There is now a user switch to change between notification styles
 2017-11-05 08:14:10 -05:00
Michael 9039e60a06 proc_run is not needed anymore 2017-11-05 12:32:35 +00:00
Michael 478e363967 proc_run was replaced 2017-11-05 12:15:53 +00:00
Michael da212a28a2 New worker class that does all the work 2017-11-05 10:33:46 +00:00
Tobias Diekershoff a1fcff67f2 added some EN docs 2017-11-05 08:46:41 +01:00
Tobias Diekershoff 0d0751fce3 comparison works now 2017-11-05 07:45:49 +01:00
Tobias Diekershoff 3c60e6f183 missing value 2017-11-05 07:10:46 +01:00
Michael Vogel 57f114d7e1
Merge pull request #3868 from rabuzarus/20171104_-_use_best_link_url_for_events 
events: use best_link_url() and zrl() for creating the author_link (author link as magic-link)
 2017-11-04 22:33:13 +01:00
Michael 9c78938ca9 Improved "if" construct 2017-11-04 21:27:32 +00:00
rabuzarus 3b4f72da93 events: better comment description 2017-11-04 16:41:06 +01:00
rabuzarus 86d3adaa50 events: use best_link_url() and zrl() for the author_link (author link as magic-link) 2017-11-04 16:38:21 +01:00
Hypolite Petovan 1cb694947f
Merge pull request #3865 from annando/noscrape-last-active 
noscrape: "last-activity" tells roughly the last activity date
 2017-11-04 10:04:41 -04:00
Hypolite Petovan 92a1c7814b
Merge pull request #3864 from annando/ejabber-auth 
Logging for ejabberd authentication is now done via syslog
 2017-11-04 10:02:53 -04:00
Michael 4831587250 Some explanation added 2017-11-04 14:00:29 +00:00
Michael 2894214347 Misspelled "detailed" 2017-11-04 12:08:12 +00:00
Michael 7de3eae8d0 There is now a user switch to change between condensed and detailled notifications 2017-11-04 12:01:08 +00:00
Tobias Diekershoff 6ee747dee8 missed something 2017-11-04 09:48:20 +01:00
Michael 4347e479d3 noscrape now contains "last-activity" which tells roughly the last activity 2017-11-04 08:38:22 +00:00
Michael d2dc61c246 Logging for ejabberd authentication is now done via syslog 2017-11-04 08:36:42 +00:00
Tobias Diekershoff 53f83dc0a1 typo 2017-11-04 09:31:57 +01:00
Tobias Diekershoff b6f1a0be5a and it is not used in the template anymore as well 2017-11-04 08:34:47 +01:00