Commit graph

19286 commits

Author SHA1 Message Date
ca3325bcbb updated translations 2018-04-09 10:17:25 +02:00
66bcbe210a
Merge pull request #4788 from annando/more-relay
Relay: Avoid empty tags / Always use the "relay account"
2018-04-09 08:31:43 +02:00
105f3ca747 Relay: Avoid empty tags / Always use the "relay account" 2018-04-09 05:53:23 +00:00
Hypolite Petovan
7563adcc7d Use positive form for relationship check in mod/network 2018-04-08 20:47:16 -04:00
Hypolite Petovan
a2607ea00a
Merge pull request #4785 from annando/magiclink
The magic link is added at more places
2018-04-08 20:38:33 -04:00
5c2b54009e The magic link is added at more places 2018-04-08 19:17:50 +00:00
Alexandre Alapetite
e860cdf6a8 Swap if / elseif
https://github.com/friendica/friendica/pull/4782#discussion_r179947984
2018-04-08 16:02:25 +02:00
Hypolite Petovan
b28fd98acd Replaced < comparison with IN for contact.rel in mod/network 2018-04-08 09:59:43 -04:00
Alexandre Alapetite
82f1f2f00e Remove SQL column legacy_password 2018-04-08 14:53:12 +02:00
Alexandre Alapetite
cb26cd6d5d Remove legacy_password test 2018-04-08 14:42:18 +02:00
Hypolite Petovan
fa7bed8929
Merge pull request #4783 from annando/queue-relay
Don't queue relay posts
2018-04-08 08:35:36 -04:00
Alexandre Alapetite
129f6806f6 Fix update password rehash
Fixes https://github.com/friendica/friendica/issues/4743
The logic for updating password was wrong:
b0a764b14c (diff-1466bb1a0a37fe9f7cf52eda8f3b431aR150)
2018-04-08 12:40:35 +02:00
Michael Vogel
b2520bc48e
Merge pull request #4780 from tobiasd/20180408-pl
update for PL translation THX waldis
2018-04-08 12:36:56 +02:00
a75858f02c Don't queue relay posts 2018-04-08 09:46:47 +00:00
65b738ecfa update for PL translation THX waldis 2018-04-08 11:02:31 +02:00
Michael Vogel
7f0bd63b7d
Merge pull request #4773 from MrPetovan/task/4629-move-dev-executables
Move dev executables to bin/dev/
2018-04-08 07:44:24 +02:00
Hypolite Petovan
48f8492056
Merge pull request #4779 from Rudloff/feature/list_api
Feature/list api
2018-04-07 21:03:50 -04:00
Pierre Rudloff
d0591dd882 The first argument for api_format_items() must be an array 2018-04-08 01:06:40 +02:00
Pierre Rudloff
9c351bad68 Fix wrong use of empty() 2018-04-08 00:55:05 +02:00
Hypolite Petovan
61050c8e30
Merge pull request #4777 from Rudloff/feature/list_api
Implement parts of the list API
2018-04-07 17:47:21 -04:00
Pierre Rudloff
bef3799942 Use empty() instead of !x() 2018-04-07 23:21:51 +02:00
Pierre Rudloff
333eb5f9dd Add missing variable 2018-04-07 23:20:30 +02:00
Pierre Rudloff
b775cba8c2 Remove confusing comment 2018-04-07 22:39:38 +02:00
Pierre Rudloff
036803d8c7 Typo 2018-04-07 22:37:57 +02:00
Pierre Rudloff
5d8d62015c Make list_id parameter mandatory in api/lists/statuses 2018-04-07 22:36:54 +02:00
Pierre Rudloff
6401eb988b Use dba to access database in api_lists_statuses() 2018-04-07 22:35:19 +02:00
Pierre Rudloff
fea7ec2482 We don't need type casting for dba::select() arguments 2018-04-07 22:18:39 +02:00
Pierre Rudloff
c5aaa61d11 Rename api_list_create() to api_lists_create() for consistency 2018-04-07 22:15:35 +02:00
Pierre Rudloff
c4edad212b Use dba to access the database in list API functions 2018-04-07 19:55:41 +02:00
Pierre Rudloff
929440417c We don't really need the unsen bit in api_lists_statuses() 2018-04-07 19:52:47 +02:00
Pierre Rudloff
b3235c2d02 Implement parts of the list API:
lists/statuses
lists/destroy
lists/update
lists/create
lists/ownerships
2018-04-07 19:16:47 +02:00
Hypolite Petovan
12b5963f22 Update Vagrant script path 2018-04-07 09:01:40 -04:00
Hypolite Petovan
2d9f32c3df Move dev executables from util/ to bin/dev/ 2018-04-07 09:00:52 -04:00
Hypolite Petovan
c8b0520144 Use CONTACT_IS_SHARING constant instead of rel value 2018-04-07 08:09:13 -04:00
Hypolite Petovan
23f5779401
Merge pull request #4771 from Rudloff/feature/avatar
Add profile_image_url_profile_size and profile_image_url_large to API
2018-04-07 07:51:00 -04:00
Hypolite Petovan
a2e9c7a565
Merge pull request #4770 from annando/dfrn-delivery
Fix: Empty answers in DFRN-Delivery can be okay
2018-04-07 07:47:02 -04:00
Pierre Rudloff
78a979ee58 Add profile_image_url_profile_size and profile_image_url_large properties to user object returned by API (fixes #4695)
This allows some clients to display a bigger avatar on profiles.
2018-04-07 13:31:17 +02:00
d0dfe2aa64 Fix: Empty answers in DFRN can be okay 2018-04-07 10:02:43 +00:00
Hypolite Petovan
232d1009e5
Merge pull request #4767 from tobiasd/20180407-de
Update of the DE translations
2018-04-07 02:44:33 -04:00
Hypolite Petovan
b798ad126a Hide posts from recently ignored or unfollowed contact in mod/network 2018-04-07 02:42:42 -04:00
575ddc83e2 DE translations 2018-04-07 08:36:48 +02:00
Michael Vogel
5af9fa0be1
Merge pull request #4764 from MrPetovan/bug/4755-use-sender-header-invite
Use Sender: header for invite emails
2018-04-07 08:31:14 +02:00
Hypolite Petovan
9220025b12 Exchange Sender: and From: headers in mod/invite 2018-04-07 02:26:33 -04:00
Michael Vogel
8cabfdde76
Merge pull request #4766 from MrPetovan/task/4721-group-button-color
[frio] Add color to group membership action buttons
2018-04-07 08:25:16 +02:00
Michael Vogel
29d18a7ed7
Merge pull request #4765 from MrPetovan/bug/4730-fix-profile-list
Fix contact profile visibility list
2018-04-07 08:23:32 +02:00
Michael Vogel
7c9bd69e22
Merge pull request #4763 from MrPetovan/bug/4760-fix-event-typo
Fix event id typo in Model\Event
2018-04-07 08:22:45 +02:00
Hypolite Petovan
60f3a6aac0 [frio] Add color to group membership action buttons 2018-04-06 23:55:29 -04:00
Hypolite Petovan
37505f8f28 Fix variable name typo in ContactSelector::profileAssign 2018-04-06 21:54:53 -04:00
Hypolite Petovan
7413dc62f0 Remove trailing whitespaces in Content\ContactSelector 2018-04-06 21:54:22 -04:00
Hypolite Petovan
0f02d1a449 Use App->getSenderEmailAddress in mod/invite
- Use "Sender: " header
- Rename confusing variables
2018-04-06 21:48:37 -04:00