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

33017 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pascal Deklerck
a11103a3a7 Code organisation and documentation of JS hook code 2018-06-13 09:31:08 +02:00
Michael Vogel
60be4ef706
Merge pull request #5204 from tobiasd/20180613-enus 
EN US translation update THX miqrogroove
 2018-06-13 07:54:55 +02:00
Tobias Diekershoff
138355838f EN US translation update THX miqrogroove 2018-06-13 07:43:49 +02:00
Tobias Diekershoff
c8aebaa3eb
Merge pull request #5198 from MrPetovan/bug/5099-content-filter-hide-attachments 
Wrap content filter around entire post including attachments
 2018-06-13 07:24:06 +02:00
Michael Vogel
e574c87d48
Merge pull request #5199 from MrPetovan/bug/4971-fix-php72-notice-portablecontact 
Fix PHP 7.2 sizeof notice messages in Protocol\PortableContact
 2018-06-13 07:16:58 +02:00
Hypolite Petovan
0bcf7b7c39 Fix PHP 7.2 sizeof notice messages in Protocol\PortableContact 2018-06-12 22:01:50 -04:00
Hypolite Petovan
d46cac7905 Wrap content filter around entire post including attachments 2018-06-12 21:54:36 -04:00
Hypolite Petovan
c548109279
Merge pull request #5196 from tobiasd/20180612-cs 
update CS translation THX Aditoo
 2018-06-12 10:32:21 -04:00
Tobias Diekershoff
3895c87e75 update CS translation THX Aditoo 2018-06-12 15:58:35 +02:00
Michael
a4607f8d1c More abstraction for the item access 2018-06-12 09:05:36 +00:00
Tobias Diekershoff
d602da024f
Merge pull request #5192 from annando/quit-on-error 
Reconnect or quit on lost database connection
 2018-06-12 10:51:54 +02:00
Hypolite Petovan
d71281e45b
Merge pull request #5193 from annando/dbstructure 
Fix: Avoid endlessly dbstructure changes
 2018-06-11 09:53:03 -04:00
Michael
b9811f1bef Fix: Avoid endlessly dbstructure changes 2018-06-11 13:22:08 +00:00
Michael
738644a006 Quit if database connection was lost during "e" 2018-06-11 03:56:19 +00:00
Michael
8584e09e12 Store the database credentials for reconnect 2018-06-11 03:45:45 +00:00
Michael
b02cdc8a7f Merge remote-tracking branch 'upstream/develop' into quit-on-error 2018-06-11 03:15:59 +00:00
Hypolite Petovan
6eb70e4415
Merge pull request #5189 from annando/daemon-db 
Force a database reconnection in the daemon to prevent lost connections
 2018-06-10 19:17:38 -04:00
Michael
aa3f8ec09d Force a database reconnection in the daemon to prevent lost connections 2018-06-10 22:04:09 +00:00
Hypolite Petovan
1355798584
Merge pull request #5184 from annando/fetch-item 
Central function to retrieve item or thread data
 2018-06-10 15:48:08 -04:00
Michael
060997feda (Partly) reworked notes 2018-06-10 19:29:34 +00:00
Michael
5bfd424fd2 Clean up tag claud (remove "item_condition()" call) 2018-06-10 15:19:52 +00:00
Michael
c1d9c29eea Search is now changed as well. 2018-06-10 14:36:22 +00:00
Michael
4d4cce4867 The new function is now used here as well. 2018-06-10 10:14:53 +00:00
Michael
8375d4ac4c Notes again 2018-06-10 08:58:03 +00:00
Michael
b26c5e7f73 And now the notes 2018-06-10 08:30:27 +00:00
Michael
a89a1f31b5 Profile is now using the new function as well 2018-06-10 08:08:53 +00:00
Michael
5d9083c369 Bugfix in notifications / network and display are using the new functions now 2018-06-10 07:26:37 +00:00
Michael Vogel
e2ce12cca6
Merge pull request #5185 from tobiasd/20180610-cs 
update CS translation THX Aditoo
 2018-06-10 08:22:06 +02:00
Tobias Diekershoff
32129d07e5 update CS translation THX Aditoo 2018-06-10 07:51:35 +02:00
Michael
eca43895e1 Fixing tests 2018-06-09 21:46:35 +00:00
Michael
defd3d15b6 Possibly fixed test 2018-06-09 20:39:40 +00:00
Michael
b6c344a80a $r was still in use 2018-06-09 20:08:15 +00:00
Michael
50dfc7d36e Small query corrections 2018-06-09 19:27:44 +00:00
Michael
446a45003d Added documentation, some indention fixes 2018-06-09 19:12:13 +00:00
Michael
baf316e898 The central item fetch does work now and the API now uses these functions 2018-06-09 16:56:37 +00:00
Hypolite Petovan
54107965e8
Merge pull request #5182 from tobiasd/20180609-lng 
Translation updates DE, FI, IT, NL. PL
 2018-06-09 07:36:04 -04:00
Tobias Diekershoff
bb20204fea IT translations THX Fabio 2018-06-09 10:38:22 +02:00
Tobias Diekershoff
bcf1f9fd19 update FI translations THX Kris 2018-06-09 10:22:45 +02:00
Tobias Diekershoff
c37d141654 update NL translations THX Pascal 2018-06-09 10:21:53 +02:00
Tobias Diekershoff
de822f01e6 update DE translations 2018-06-09 10:19:49 +02:00
Tobias Diekershoff
7986d36a6d update PL translations THX waldis 2018-06-09 10:13:15 +02:00
Pascal Deklerck
ef01dfefd4 Remove console logging 2018-06-07 22:25:39 +02:00
Pascal Deklerck
d488512ca0 5118 Create Javascript hook mechanism 2018-06-07 22:23:30 +02:00
Michael
4874e589f1 New class function to fetch items 2018-06-07 06:03:12 +00:00
Tobias Diekershoff
b53e74d989
Merge pull request #5173 from annando/more-daemon 
Ensure that cron workers are called even at busy times
 2018-06-06 08:49:26 +02:00
Michael
e005312b87 Should be just a debug log entry 2018-06-06 05:32:06 +00:00
Michael
83243800b5 Ensure that cron workers are called even at busy times 2018-06-06 05:26:22 +00:00
Tobias Diekershoff
e1216e3a60
Merge pull request #5172 from annando/develop 
Bugfix: In the daemon mode we forgot to call the cron jobs
 2018-06-06 06:49:30 +02:00
Michael
1304dae0d3 Bugfix: In the daemon mode we forgot to call the cron jobs 2018-06-06 03:48:04 +00:00
Tobias Diekershoff
4cd730ea16
Merge pull request #5171 from annando/removed-deprecated-upload 
Removed some quick and dirty hack to upload pictures
 2018-06-05 09:26:05 +02:00