keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
20862 commits 4 branches 0 tags 179 MiB
Commit graph

20862 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel
29b73877a9 Fix the settings in frio (#5650) 2018-08-22 00:14:16 -04:00
rabuzarus
1eb147cb48 fix redirection - don't dfrn auth when contact is still pending (#5648) 2018-08-21 23:58:09 -04:00
Michael Vogel
e20ea092d2 You can now filter the community page by account types (#5649) 
* You can now filter the community page by account types

* Better use "null"
 2018-08-21 17:39:49 +02:00
Tobias Diekershoff
578549df13
Merge pull request #5646 from annando/notes 
The notes are now fetching their content from a central function
 2018-08-21 17:36:15 +02:00
Michael Vogel
54aee2aaa7 Removed notices that revealed themselfes over night ... (#5645) 
* Removed notices that revealed themselfes over night ...

* And more notices removed that occured over night

* One more ..

* Some more notices of the day ...
 2018-08-21 17:35:09 +02:00
Michael
1fb5925073 The notes are now fetching their content from a central function 2018-08-21 07:35:22 +00:00
Tobias Diekershoff
5a171c0afd
Merge pull request #5644 from annando/notices 
And again ... notices
 2018-08-21 06:06:52 +02:00
Michael
334c628511 And again ... notices 2018-08-20 21:20:21 +00:00
Michael Vogel
d9b44153da The content generation for the display page is now using a centralized function (#5642) 
* The content generation for the display page is now using a centralized function

* Small correction to avoid notices
 2018-08-20 16:32:55 -04:00
Philipp
d7395299fb Automatic Installation fix (#5565) 
* Automatic Install Config Fix

* new unittest for AutomaticInstallation

* unittest for autoinstall
- removed password check

* removed bak-file

* automatic install
- always save environment variables
- just skip db environment if not `--savedb` is set

* fixed help (options)

* fixed help (options)

* Deleting Auto-Install tests until fix for proper DB restoring
 2018-08-20 16:15:39 -04:00
Michael Vogel
409e939fc4 Fix for double $$ (#5641) 
* Fix for double $$

* And a second $$
 2018-08-20 07:54:26 +02:00
Tobias Diekershoff
15fb198109 typo in config/settings.ini.php (#5640) 2018-08-20 00:30:30 -04:00
rabuzarus
dd2d680258 Frio: new photos upload template (#5637) 
* frio - add missing page template to various photo pages (fix missing background)

* frio - rework photo upload album selection

* frio - rework photo upload button

* frio - fix photo upload button and acl
 2018-08-20 00:29:50 -04:00
Michael Vogel
16a081871c Improved profile page, improved "limit" handling (#5639) 
* Improved profile page, improved "limit" handling

* Update will now work again

* Update will work now
 2018-08-20 06:26:05 +02:00
rabuzarus
47c2565917
Merge pull request #5634 from astifter/photo_view_page_icons 
[frio] Add icons on photo view page.
 2018-08-19 23:04:28 +02:00
Andreas Neustifter
66d8a67884 Add icons on photo view page. 
This page still had textual links, change them to icons. Also remove missleading header.
 2018-08-19 21:53:32 +02:00
Michael Vogel
c1da44b7dc We now use a central function to fetch the importer (#5636) 2018-08-19 13:37:56 +00:00
Michael Vogel
7f3fb34c24 Some easy to replace "q" calls have been replaced by "DBA" calls (#5632) 
* Some easy to replace "q" calls have been replaced by "DBA" calls

* Simplified the GUID creation

* And one in the API ...

* And OStatus has got some DBA calls more

* Just some more replaced database calls

* The event query is now simplified

* Events are now shown again

* subthread is now using the DBA calls as well

* Some more replaced database calls

* And some more replaced database calls and prevented notices

* Better use gravity

* Some more replaced database stuff

* Some more replaced database calls in DFRN.php

* The gcontact class now has got the new DBA functions as well

* The Contact class is now changed to new database functions as well

* Small correction

* We can now delete without cascade

* One more functionality is safe for future changes
 2018-08-19 12:46:10 +00:00
Michael Vogel
dfe4413463 Avoid blocks with invalid entries in superblock (#5635) 2018-08-19 12:14:12 +02:00
Andreas Neustifter
fc3aa9e58b [frio] Vertically align toolbar items. (#5633) 2018-08-19 02:19:36 +00:00
Michael Vogel
ab5cedfa50 placeholder for a funny commit description for removing some more notices (#5631) 2018-08-19 01:52:21 +00:00
Michael Vogel
060e887a31 And still there are notices that have to be removed ... (#5629) 
* And still there are notices that have to be removed ...

* Notice removed in ACL part

* Fix missing fields for notifications

* Fixes issue 5630
 2018-08-18 08:20:50 +02:00
Philipp
4eaeea7889 Config Console Tests (#5621) 
* Config Console Tests
- `MultiUseConsole` is now a testable console
- `ConsoleTest` is a abstract TestClass for console tests
- `ConfigConsoleTest` tests the config console commands

* disable preserve global state because of smarty

* fixed requires & basepath für Console Test
 2018-08-17 19:41:46 +00:00
Michael Vogel
1711f4dc56
Merge pull request #5628 from tobiasd/20180817-cs 
CS translation update THX Aditoo
 2018-08-17 13:44:06 +02:00
Tobias Diekershoff
7b3cfcb469 CS translation update THX Aditoo 2018-08-17 10:28:57 +02:00
Tobias Diekershoff
d5c2c41b02
Merge pull request #5626 from annando/notices-oh-yeah 
Removed notices, will it ever end?
 2018-08-17 09:33:02 +02:00
Michael Vogel
b6cb83ed4c
Merge pull request #5617 from MrPetovan/task/use-contact-network 
Fix bug with ACL and contact network page
 2018-08-17 05:31:06 +02:00
Michael
0342f9e084 Removed notices, will it ever end? 2018-08-17 03:19:42 +00:00
Michael Vogel
2b67e8e80d
Merge pull request #5624 from fabrixxm/fix/api-seen 
api: fix `friendica/notification/seen` api call
 2018-08-16 12:41:57 +02:00
fabrixxm
66b4730a70 api: fix friendica/notification/seen api call 
Fix return item related to notification when notification is set as seen
 2018-08-16 11:46:53 +02:00
Tobias Diekershoff
6892e56b3e
Merge pull request #5622 from annando/forum-storage 
Fix for storing posts of private forums
 2018-08-16 09:28:57 +02:00
Michael
bb0cf93374 Fix for storing posts of private forums 2018-08-15 20:13:10 +00:00
Tobias Diekershoff
3488b937ea
Merge pull request #5620 from annando/fix-remove 
Fix a fatal error when removing contacts
 2018-08-15 14:31:13 +02:00
Hypolite Petovan
84a3cd747f Revert "Change contact post link to contact network page" 
This reverts commit 4c32661022.
 2018-08-15 12:12:49 +02:00
Michael
6d852ff6fd Fix a fatal error when removing contacts 2018-08-15 09:27:25 +00:00
Michael Vogel
ffd2014257 Fixes the missing refresh after ignoring or unignoring a thread (#5614) 
* Fixes the missing refresh after ignoring or unignoring a thread

* Use numeric values to make the JSON output happy
 2018-08-15 09:27:11 +00:00
Tobias Diekershoff
a8b74e6bc7
Merge pull request #5619 from annando/dba-item 
Use the Item class instead of DBA calls when possible
 2018-08-15 07:23:02 +02:00
Michael
e8334c4655 Use the Item class instead of DBA calls when possible 2018-08-15 04:41:49 +00:00
rabuzarus
e1d2ee3400 frio - add missing page template to various photo pages (fix missing background) (#5613) 2018-08-14 23:58:51 +00:00
Hypolite Petovan
4c32661022 Change contact post link to contact network page 2018-08-15 00:43:45 +02:00
Hypolite Petovan
ea17370211 Fix bug with ACL and contact network page 
- Require user array parameter in ACL::getFullSelectorHTML
- Change all wrong uses where user array was replaced by default
permissions array
 2018-08-15 00:43:27 +02:00
Michael Vogel
1283b99c6f Removed notices in the frio theme (#5610) 
* Removed notices in the frio theme

* And fixed notices in the notifications

* And some more in frio

* Null is the default value

* And some small notice in the probing removed

* Added note

* Clarified note

* And a removed notice in OStatus
 2018-08-14 19:37:44 +00:00
Michael Vogel
576aea124c
Merge pull request #5612 from tobiasd/20180814-it 
IT translations THX Fabio
 2018-08-14 12:39:18 +02:00
Tobias Diekershoff
0b57d919dc IT translations THX Fabio 2018-08-14 10:01:09 +02:00
Michael Vogel
246b5644fb
Merge pull request #5611 from MrPetovan/task/defer-ping-acl 
Call asynchronous JS after complete page load
 2018-08-14 06:08:32 +02:00
Michael Vogel
116bcae6ab Fix: Wrong array element / added logging for DFRN connects (#5609) 2018-08-14 03:15:39 +02:00
Hypolite Petovan
b6e57989dc Call asynchronous JS after complete page load 2018-08-14 03:01:36 +02:00
Tobias Diekershoff
1ca8d573e6
Merge pull request #5607 from annando/remove-contact 
Remove contacts in the background
 2018-08-13 06:42:08 +02:00
Tobias Diekershoff
20eb72a1d3
Merge pull request #5606 from annando/issue-5605 
Issue-5605: Fixes notice
 2018-08-13 06:38:36 +02:00
Michael
29aa90ec09 Remove contacts in the background 2018-08-12 17:15:47 +00:00