Michael
|
995f2d719d
|
Merge remote-tracking branch 'upstream/develop' into issue-4069
|
2017-12-17 12:10:32 +00:00 |
|
Michael
|
3c835ccb22
|
Alternate fix for issue 4069
|
2017-12-17 11:11:28 +00:00 |
|
Michael Vogel
|
de56a3a824
|
Merge pull request #4079 from MrPetovan/task/4069-add-pagination-to-statuses-api
Add pagination to API statuses/friends and statuses/followers
|
2017-12-17 11:31:01 +01:00 |
|
Michael Vogel
|
3d49062a6d
|
Merge pull request #4080 from MrPetovan/task/4078-add-max_id-to-user_timeline
Add max_id support for statuses/user_timeline API
|
2017-12-16 18:44:28 +01:00 |
|
Michael Vogel
|
64e61832cc
|
Merge pull request #4081 from MrPetovan/bug/4075-remove-group_member-uid
Remove lingering reference to group_member.uid
|
2017-12-16 18:41:32 +01:00 |
|
Hypolite Petovan
|
0dbf7a2611
|
Remove lingering reference to group_member.uid
|
2017-12-16 11:50:58 -05:00 |
|
Hypolite Petovan
|
78c053c6b9
|
Add max_id support for statuses/user_timeline API
- Add documentation
- Improve formatting
|
2017-12-16 11:34:44 -05:00 |
|
Hypolite Petovan
|
ecde6e456d
|
Add pagination to API statuses/friends and statuses/followers
- Add doc blocks for both API calls
- Remove unused parameters
|
2017-12-16 10:16:25 -05:00 |
|
Michael Vogel
|
dc7bff0235
|
Merge pull request #4073 from MrPetovan/bug/4070-fix-user-create
Fix User::create return variable
|
2017-12-16 04:11:54 +01:00 |
|
Michael Vogel
|
f415ee64e7
|
Merge pull request #4074 from MrPetovan/task/update-composer
Update Composer
|
2017-12-16 04:08:37 +01:00 |
|
Hypolite Petovan
|
90f4aa36b6
|
Update Composer
- Update Composer to version 1.5.5
- Update Mobile_Detect to version 2.8.28
- Update classmaps
|
2017-12-15 22:02:22 -05:00 |
|
Hypolite Petovan
|
d500d06a06
|
Fix User::create return variable
|
2017-12-15 20:47:10 -05:00 |
|
Hypolite Petovan
|
a3ea106662
|
Merge pull request #4068 from rabuzarus/20171215_-_frio_fix_contact_list
frio: fix some contact list issues
|
2017-12-15 15:04:48 -05:00 |
|
rabuzarus
|
0787f093d6
|
frio: remove shome whitespace
|
2017-12-15 18:16:07 +01:00 |
|
rabuzarus
|
85f558d8fb
|
frio: fix some contact list issues
|
2017-12-15 18:09:04 +01:00 |
|
Michael Vogel
|
39dcec66d8
|
Merge pull request #4066 from MrPetovan/bug/4046-remove-group_member-uid
Remove group_member.uid
|
2017-12-15 17:47:57 +01:00 |
|
Hypolite Petovan
|
6dbd68e0cb
|
Remove redundant index
- Increase UPDATE_VERSION and DB_UPDATE_VERSION
|
2017-12-15 11:36:06 -05:00 |
|
Hypolite Petovan
|
868a84c5cc
|
Use INNER for group_member join
|
2017-12-15 08:44:00 -05:00 |
|
Hypolite Petovan
|
c8c7ff2a2e
|
Add new UNIQUE index to group_member
- Add new index on gid
|
2017-12-15 08:43:37 -05:00 |
|
Hypolite Petovan
|
7eb2aa2ac5
|
Merge pull request #4067 from annando/removed-unused
Deprecated file removed
|
2017-12-15 08:00:32 -05:00 |
|
Michael
|
1e0c46e8a3
|
Deprecated file removed
|
2017-12-15 11:25:05 +00:00 |
|
Hypolite Petovan
|
179b311978
|
Remove group_member.uid
- Use contact.uid alternatively
- Use JOIN with group table
|
2017-12-14 22:47:58 -05:00 |
|
Hypolite Petovan
|
afbfbde112
|
Merge pull request #4065 from annando/dbstructure-class
There is now a Dbstructure class
|
2017-12-14 17:48:38 -05:00 |
|
Michael
|
559f8b446b
|
Why I had coded it that way? Now it is better
|
2017-12-14 22:22:44 +00:00 |
|
Michael
|
2d7cd2daf4
|
"update" is enough
|
2017-12-14 22:18:53 +00:00 |
|
Michael
|
cf56de1e77
|
Merge remote-tracking branch 'upstream/develop' into dbstructure-class
|
2017-12-14 21:42:26 +00:00 |
|
Michael
|
2179a7faa8
|
Now it works
|
2017-12-14 21:32:53 +00:00 |
|
Michael
|
0d2087fe6e
|
The DBStructure class now exists
|
2017-12-14 21:14:02 +00:00 |
|
Michael
|
15d42de647
|
Class moved, changes applied
|
2017-12-14 21:13:02 +00:00 |
|
Hypolite Petovan
|
4269c108c1
|
Merge pull request #4064 from annando/fix-group
Bugfix to PR 4046: Calls to a renamed function had been changed
|
2017-12-14 14:25:30 -05:00 |
|
Michael
|
89ad41aca5
|
Bugfix: Calls to a renamed function had been changed
|
2017-12-14 18:06:48 +00:00 |
|
Hypolite Petovan
|
ab80e6d92a
|
Merge pull request #4063 from annando/daemon-works
Spawn now spawns
|
2017-12-14 12:15:05 -05:00 |
|
Hypolite Petovan
|
22c695cad2
|
Merge pull request #4062 from annando/daemon-works
The daemon now works fine
|
2017-12-14 11:49:17 -05:00 |
|
Michael
|
5417099f72
|
Spawn now spawns
|
2017-12-14 16:41:56 +00:00 |
|
Michael
|
611c38b3e3
|
The daemon now works fine
|
2017-12-14 16:38:51 +00:00 |
|
Hypolite Petovan
|
369fcb7bae
|
Merge pull request #4060 from annando/system-unavailable
"system_unavailable.php" is unavailable now
|
2017-12-13 17:01:47 -05:00 |
|
Michael
|
0457bd995f
|
"system_unavailable.php" is unavailable now
|
2017-12-13 21:55:19 +00:00 |
|
Hypolite Petovan
|
74767ad321
|
Merge pull request #4059 from annando/maps
The map class is now born as well
|
2017-12-13 16:44:55 -05:00 |
|
Michael
|
5a0260a10f
|
The Map class is now done
|
2017-12-13 21:38:14 +00:00 |
|
Michael
|
ea10a7c002
|
Map is moved to the new place
|
2017-12-13 21:37:34 +00:00 |
|
Hypolite Petovan
|
35c10ac335
|
Merge pull request #4058 from annando/mail-stuff
msgclean.php and quoteconvert.php is now integrated into Email.php
|
2017-12-13 16:00:10 -05:00 |
|
Michael
|
9d574f6666
|
Forgotten include
|
2017-12-13 20:58:15 +00:00 |
|
Michael
|
58df57df6e
|
msgclean.php and quoteconvert.php is now integrated into Email.php
|
2017-12-13 20:36:50 +00:00 |
|
Michael Vogel
|
f58167b000
|
Merge pull request #4054 from MrPetovan/bug/4041-fix-register
Fix registration
|
2017-12-13 20:01:03 +01:00 |
|
Hypolite Petovan
|
6362296666
|
Add INNER JOIN to admin pending user list please @annando
|
2017-12-13 10:32:59 -05:00 |
|
Michael Vogel
|
77e249effb
|
Merge pull request #4057 from tobiasd/20171213-fr
update for FR translation - thx Thecross!
|
2017-12-13 13:29:03 +01:00 |
|
Tobias Diekershoff
|
535a656882
|
Merge pull request #4056 from annando/missing-crypto
Bugfix for "Call to undefined function Friendica\Network\rsatopem()"
|
2017-12-13 12:04:10 +01:00 |
|
Tobias Diekershoff
|
1c9d137c28
|
update for FR translation - thx Thecross!
|
2017-12-13 12:01:11 +01:00 |
|
Michael
|
44679a73b7
|
Bugfix for "Call to undefined function Friendica\Network\rsatopem()"
|
2017-12-13 10:34:51 +00:00 |
|
Tobias Diekershoff
|
f99fb2245e
|
Merge pull request #4055 from annando/moved-feed
include/feed.php is now moved to /src as well
|
2017-12-13 10:38:48 +01:00 |
|