friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-06-10 15:55:12 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity
19158 commits 3 branches 63 tags 246 MiB
Commit graph

19158 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Friendica 666375fed1 Move new member tips to tab bar. 
The new member tips link looks very misplaced and forlorn at the current position.
Move it to the tab-bar (in a somewhat crude fashion, but its for 14 days/user only.)
 2018-04-22 20:44:22 +00:00
Friendica 54cfbe039b Only shown pagination when not empty. 
Currenty the pagination bar is always shown, even when no prev/next buttons are active.
This only shows the bar when actual navigation is possible.
 2018-04-22 20:44:22 +00:00
Friendica 226d90ad5a Image in /contacts/xx is shifted. 
The contact image for a single contact in /contacts/xx is next to the contact name
instead of below, fix that.
 2018-04-22 20:44:22 +00:00
Hypolite Petovan 4cfb12e9d9 Add one-line content filter when there's only one reason 2018-04-22 14:28:34 -04:00
rabuzarus 5a82ee04bc frio - some work on the admin users template to be more consistant with other setting pages 2018-04-22 20:23:24 +02:00
Hypolite Petovan 1585b5db45
Merge pull request #4904 from M-arcus/patch-4 
[DOCS] Automatic install: Add documentation
 2018-04-22 13:30:28 -04:00
Marcus Müller 74db460274
[DOCS] Install: Add intendation for list (en) 2018-04-22 19:28:27 +02:00
Marcus Müller f62531fef8
[DOCS] Install: Add intendation for list (de) 2018-04-22 19:27:56 +02:00
Marcus Müller b7410f6866
[DOCS] Installation: Fix minor text error 2018-04-22 19:11:37 +02:00
Marcus Müller f6a76f4f8f
[DOCS] Installation: Update german instructions 2018-04-22 19:10:27 +02:00
Marcus Müller ad95099948
[DOCS] Automatic install: Add documentation 2018-04-22 17:55:43 +02:00
Hypolite Petovan d977ff78df Uncomment some code in ItemContent::getPlaintextPost 
- I have no idea what I'm doing
 2018-04-22 11:43:27 -04:00
Michael Vogel 6e9ed3f01b
Merge pull request #4894 from MrPetovan/task/4513-show-events-reminders-attendence 
Only show event reminders of events attendyes or attendmaybe
 2018-04-22 17:38:32 +02:00
rabuzarus 7f93d5c74b
Merge pull request #4903 from MrPetovan/bug/infinite-loop-in-dba-delete 
Add documentation for new $options parameter in dba::delete
 2018-04-22 17:35:52 +02:00
Hypolite Petovan 952b057631
Merge pull request #4900 from annando/dfrn-rework 
Preparation for transmitting public posts via DFRN
 2018-04-22 11:35:41 -04:00
Hypolite Petovan 273dde508b Add default value doc for options.cascade in dba::delete 2018-04-22 11:34:41 -04:00
Hypolite Petovan 0a026515bd Add documentation for $options parameter in dba::delete 2018-04-22 11:33:20 -04:00
Hypolite Petovan 82ed6fff9f Use public_contact() instead of wrong query in Profile::getEventsReminderHTML 2018-04-22 11:29:55 -04:00
Hypolite Petovan 6b9706c558
Merge pull request #4901 from tobiasd/20180422-travis 
check more PHP version
 2018-04-22 11:17:06 -04:00
Tobias Diekershoff 34a24711a3 check more PHP version 2018-04-22 14:56:59 +02:00
Michael 98c677f09f Currently disabled 2018-04-22 11:33:32 +00:00
Michael 8f2db61538 Receiving of public posts is now working 2018-04-22 10:58:03 +00:00
Michael b77ae3a8a7 Public posts are now transferred successfully to the DFRN part 2018-04-22 10:42:01 +00:00
Tobias Diekershoff ea4e9b2cce
Merge pull request #4896 from MrPetovan/bug/infinite-loop-in-dba-delete 
Prevent side effect with cascade => false in dba::delete
 2018-04-22 12:23:11 +02:00
Tobias Diekershoff bfe1dd08c2
Merge pull request #4897 from MrPetovan/bug/4879-remove-backslash-in-birthday-events 
Regenerate messages.po after changing a translation string
 2018-04-22 12:18:48 +02:00
Michael c59b28a8c4 create public endpoint 2018-04-22 10:04:30 +00:00
Hypolite Petovan c4aa925793 Update messages.po after changing a translation string 2018-04-22 05:17:42 -04:00
Hypolite Petovan ba3f721524 Prevent side effect with cascade => false in dba::delete 2018-04-22 04:46:46 -04:00
Hypolite Petovan e0b33b36a2 Decrease scope of query in Profile::getEventsReminderHTML 
- Use specific SELECT fields
- Use INNER JOIN
 2018-04-22 04:41:53 -04:00
Michael c118c03a70 Merge remote-tracking branch 'upstream/develop' into dfrn-rework 2018-04-22 07:45:28 +00:00
Michael Vogel f70f0ac266
Merge pull request #4895 from tobiasd/20180422-fi 
update FI translations THX Kris
 2018-04-22 09:35:42 +02:00
Tobias Diekershoff c44df2ae94 update FI translations THX Kris 2018-04-22 08:28:53 +02:00
Michael Vogel 25662eb6f4
Merge pull request #4892 from MrPetovan/bug/infinite-loop-in-dba-delete 
Prevent infinite loop when a dbstructure_definition hook is orphan
 2018-04-22 07:55:39 +02:00
Michael Vogel 39edd086e0
Merge pull request #4893 from MrPetovan/bug/4879-remove-backslash-in-birthday-events 
Fix quoting style in DFRN::birthdayEvent()
 2018-04-22 07:54:07 +02:00
Hypolite Petovan 08afec3170 Only show event reminders of events attendyes or attendmaybe 2018-04-21 22:53:13 -04:00
Hypolite Petovan 851c5d841f Fix quoting style in DFRN::birthdayEvent() 2018-04-21 21:03:12 -04:00
Hypolite Petovan 6d88984ee5 Move Model\Item::getPlaintextPost to Model\ItemContent::getPlaintextPost 2018-04-21 20:50:13 -04:00
Hypolite Petovan 18078ce7a4 Prevent infinite loop when a dbstructure_definition hook is orphan 
- Add cascade option to dba::delete
- use cascade = false for orphan hook deletion
 2018-04-21 20:34:07 -04:00
Hypolite Petovan ee672b946e Add Text\BBCode::toPlaintext to mod/babel 2018-04-21 18:48:10 -04:00
Hypolite Petovan daf94a8f63
Merge pull request #4891 from annando/private-forum-redux 
Better working with private forums
 2018-04-21 18:19:27 -04:00
Michael 16beab4652 Better working with private forums 2018-04-21 21:59:02 +00:00
Tobias Diekershoff 5dda815521
Merge pull request #4887 from rabuzarus/20180421_-_frio_add_missing_settings_css 
frio - add missing page styles for user setting pages
 2018-04-21 16:29:27 +02:00
Tobias Diekershoff 0700452c49
Merge pull request #4888 from friendica/revert-4883-install_config 
Revert "Moved .htconfig.php file & extracted Install business logic"
 2018-04-21 16:28:51 +02:00
Tobias Diekershoff f63be91bd5
Revert "Moved .htconfig.php file & extracted Install business logic" 2018-04-21 16:28:22 +02:00
rabuzarus 7e41f62809 frio - add missing page styles for user setting pages 2018-04-21 16:22:11 +02:00
Hypolite Petovan afced187bc
Merge pull request #4885 from rabuzarus/20180421_-_fix_frio_in_directory 
frio - fix default template if friendica is installed into a subdirectory
 2018-04-21 10:10:32 -04:00
rabuzarus 8f6e018958 frio - remove $baseurl variable from default template because we don't need it anymore 2018-04-21 16:04:11 +02:00
Hypolite Petovan 401934f21f
Merge pull request #4883 from nupplaphil/install_config 
Moved .htconfig.php file & extracted Install business logic
 2018-04-21 09:59:57 -04:00
Hypolite Petovan d08ddaa116
Merge pull request #4884 from rabuzarus/20180421_-_fix_image_upload_for_msg 
frio - fix image upload for prv messages
 2018-04-21 09:58:54 -04:00
rabuzarus a65e93faea frio - fix default template if friendica is installed into a subdirectory 2018-04-21 15:43:11 +02:00