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
24607 commits 3 branches 64 tags 242 MiB
Commit graph

24607 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel
8a9862c9ce Entry import could work but need clean up 2016-02-01 00:09:03 +01:00
Christian González
545e4f645e really uncomment the lines. 2016-01-31 16:20:06 +01:00
Tobias Diekershoff
447ed7af53 IT update to the strings 2016-01-31 12:02:05 +01:00
Christian González
e80d5a7f23 additional blank line 2016-01-30 23:22:40 +01:00
Christian González
2ca9d011fe add simple option for HTTPS in .htaccess 
people have it easier to just uncomment 2 lines if they want such an important feature
 2016-01-30 23:21:03 +01:00
rabuzarus
162f754e2d Merge develop into 1901_autocomplete 2016-01-30 16:57:54 +01:00
rabuzarus
9fba5041a0 rework autocomplete: update query-textcomplete 2016-01-30 16:42:46 +01:00
Michael Vogel
d04e1bdf69 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import 2016-01-30 16:38:06 +01:00
Michael Vogel
3ea5706d16 Resolved namespace trouble 2016-01-30 16:37:18 +01:00
Michael Vogel
eb17fe7324 Some missing parts added 2016-01-30 14:13:58 +01:00
Tobias Diekershoff
748d0e576c Merge pull request #2304 from rabuzarus/3001_event_map_fix 
event_form: use [map] tag to embedd a map
 2016-01-30 06:59:30 +01:00
rabuzarus
088b075bba event_form: use [map] tag to embedd a map 2016-01-30 05:12:27 +01:00
Michael Vogel
4cac6a744f Merge pull request #2303 from rabuzarus/2901-vier-mobile 
vier: some fixes for mobile view
 2016-01-30 03:21:28 +01:00
Michael Vogel
4e513d3885 DFRN: Deletions should work now as well 2016-01-30 03:17:46 +01:00
Michael Vogel
69457a4a5b DFRN import seems to work. Improvements are possible :-) 2016-01-30 02:57:40 +01:00
rabuzarus
8e0f04026c vier: some fixes for mobile view 2016-01-30 01:53:21 +01:00
Michael Vogel
cd1f3cde00 DFRN Deletions should now work too 2016-01-30 01:20:43 +01:00
Michael Vogel
decaac6c31 DFRN-Import is now nearly complete, changed namespace constants 2016-01-29 23:14:01 +01:00
Tobias Diekershoff
cb34e86aec Merge pull request #2302 from annando/1601-profile-data 
Profile data from the gcontact table should only be taken if there is content
 2016-01-29 18:02:45 +01:00
Michael Vogel
1cdcb9fc2e DFRN: Entry import could work now, first steps for mails 2016-01-29 17:42:38 +01:00
Michael Vogel
596416defe Profile data from the gcontact should only be taken if there is content 2016-01-29 12:14:04 +01:00
Michael Vogel
8412eb7066 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import 2016-01-29 10:59:06 +01:00
fabrixxm
863d49ccd0 Merge pull request #2300 from annando/1601-gcontact-guessing 
gcontact-id now depends on the owner, not the author of a post
 2016-01-29 05:27:58 +01:00
fabrixxm
fdb864157d Merge pull request #2299 from annando/1601-contact-photos 
Improved avatar storage in contacts
 2016-01-29 05:26:26 +01:00
fabrixxm
a8e2d143e2 Merge pull request #2301 from annando/1601-notifications 
There is now a central function for item notifications
 2016-01-29 05:24:03 +01:00
Michael Vogel
4d33441c2e DB Version was forgotten ... 2016-01-29 03:51:12 +01:00
Michael Vogel
56687f5bc8 Check the body for notifications as well 2016-01-29 03:46:43 +01:00
Michael Vogel
e4c4b8e13e It's better to ask the connectors for their profile data 2016-01-29 03:02:15 +01:00
Michael Vogel
8767ea5f52 Improved check against profile 2016-01-29 01:18:18 +01:00
Michael Vogel
b3e86f4e6b There is now a central function for item notifications 2016-01-28 22:58:05 +01:00
Michael Vogel
a93d35bfda gcontact-id now depends on the owner, not the author of a post 2016-01-28 18:06:17 +01:00
Michael Vogel
410ebb4cbf Added documentation 2016-01-28 12:35:07 +01:00
Michael Vogel
845a769dc2 Only check size if needed - should speed up the uploading. 2016-01-28 12:28:04 +01:00
Michael Vogel
eba9f15daa Removed some more work 2016-01-28 11:18:57 +01:00
Michael Vogel
04725d1283 Reverted some work ... 2016-01-28 11:14:13 +01:00
Michael Vogel
78e79de7c9 New central function to store avatar data in contacts 2016-01-28 11:09:08 +01:00
Michael Vogel
6f662b8c74 New avatar picture fields to better cope with changing avatars 2016-01-28 01:26:19 +01:00
Michael Vogel
613f6b9b32 Just some more code :-) 2016-01-27 20:06:23 +01:00
Michael Vogel
1d4de96960 Next steps to add all fields 2016-01-27 15:57:11 +01:00
Michael Vogel
aeecd83ade Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import 2016-01-27 13:16:28 +01:00
Tobias Diekershoff
d6c1889a20 Merge pull request #2298 from annando/1601-contact-posts 
Show contact posts by searching for "contact-id" - not "gcontact-id"
 2016-01-27 12:39:43 +01:00
Michael Vogel
afed5f3afc Test code for the DFRN import 2016-01-27 11:30:12 +01:00
Michael Vogel
d3bf80a1f3 Show contact posts by searching for "contact-id" - not "gcontact-id" 2016-01-27 11:16:56 +01:00
fabrixxm
bcc9588732 Merge pull request #2297 from annando/1601-ostatus 
OStatus: Do not notify on "likes" - update only OStatus contacts
 2016-01-27 11:06:51 +01:00
Michael Vogel
828cec27dd Do not notify on "likes" - update only OStatus contacts 2016-01-27 10:44:15 +01:00
fabrixxm
f18679053b Merge pull request #2286 from annando/1601-dfrn 
Complete rewrite of DFRN generation
 2016-01-27 09:42:03 +01:00
Michael Vogel
45a5f63d35 The object-type is now transmitted as well 2016-01-27 02:38:52 +01:00
Michael Vogel
c0eb7b10a3 Some new fields for the protocol 2016-01-26 12:18:57 +01:00
Michael Vogel
4208acf4b6 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn 2016-01-25 23:51:11 +01:00
fabrixxm
7ea3923429 Merge pull request #2296 from annando/1601-api-repeat 
API: Only allow repeating of public items
 2016-01-25 22:46:02 +01:00