Commit graph

11946 commits

Author SHA1 Message Date
Tobias Diekershoff
bc579ff799 added title element to emoji images in main repository 2016-03-17 17:41:06 +01:00
Michael Vogel
16b92af71f Retraction do work as well 2016-03-17 12:24:23 +01:00
Michael Vogel
88fea17cab Everything tested, one open to-do 2016-03-17 00:37:44 +01:00
Michael Vogel
e058feed28 Better reshare detection 2016-03-16 21:27:07 +01:00
Michael Vogel
468734a26e Added checklist 2016-03-16 19:30:46 +01:00
Michael Vogel
f6c950823f Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-16 19:30:26 +01:00
Michael Vogel
84a475e589 Missing include 2016-03-16 16:49:54 +01:00
Tobias Diekershoff
8eb05fd1bd Merge pull request #2415 from annando/1603-dfrn-hash
DFRN: Mentions were imported as hash tags
2016-03-16 16:08:32 +01:00
Michael Vogel
071ffd43bf DFRN: Mentions were imported as hash tags 2016-03-16 11:44:45 +01:00
Michael Vogel
be001d171b Values are sanitized, messages are not relayed when there is no signature 2016-03-15 20:14:08 +01:00
Michael Vogel
8027854886 Removed moved function 2016-03-15 07:18:11 +01:00
Michael Vogel
3f2a23d48c Unused files are removed 2016-03-15 07:05:10 +01:00
Michael Vogel
eed55664fc Reshares now store the original XML as well. 2016-03-15 00:26:28 +01:00
Michael Vogel
4b5e7007a7 Bugfix: XML copy had problems with "&" 2016-03-14 23:54:01 +01:00
Michael Vogel
dc2e7a66b3 The Diaspora class is now productive 2016-03-14 23:11:43 +01:00
Michael Vogel
6f43d3a4c4 Profile update is now working with the new function as well 2016-03-14 22:10:26 +01:00
Michael Vogel
56cb6cc897 Removed just more old diaspora function calls. 2016-03-14 20:53:44 +01:00
Michael Vogel
3734555715 Conversations are working now too 2016-03-14 20:04:17 +01:00
Michael Vogel
9ae2b2292f Some more function calls changed to the new class 2016-03-14 08:11:14 +01:00
Michael Vogel
75f5cfe63e Retraction and reshares work 2016-03-13 21:11:48 +01:00
Michael Vogel
2841aa0281 New implementation is now live. 2016-03-13 19:47:02 +01:00
Michael Vogel
07818a6553 Decode function is now there as well. 2016-03-13 16:14:51 +01:00
Michael Vogel
7841837ec3 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-13 13:49:06 +01:00
Tobias Diekershoff
e884b0e579 Merge pull request #2414 from annando/1603-display-query
The display contained bad sql queries
2016-03-13 13:18:53 +01:00
Michael Vogel
99d5f8afc6 The display contained bad sql queries 2016-03-13 13:04:12 +01:00
Michael Vogel
f8f19038bf XML generation is now improved 2016-03-13 09:57:44 +01:00
Michael Vogel
f978bc9cc8 Some code cleaning, changes to the xml generation 2016-03-13 07:10:24 +01:00
Michael Vogel
4020b51f8f Merge pull request #2413 from tobiasd/20160312-socnetsettings
missing include file for the SocNet settings
2016-03-12 19:49:03 +01:00
Michael Vogel
0f65eee695 Everything could work - needs some beautification and documentation 2016-03-12 19:19:20 +01:00
Tobias Diekershoff
2a864d889e missing include file for the SocNet settings 2016-03-12 16:25:17 +01:00
Michael Vogel
57fb0a9129 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-12 11:06:43 +01:00
Michael Vogel
cabb84a42a Merge pull request #2411 from tobiasd/20160312-dos
Hotkey documentation
2016-03-12 10:23:45 +01:00
Tobias Diekershoff
bc574328bd Merge pull request #2412 from annando/1603-double-encode-ping
The name in the notifications has to be double encoded
2016-03-12 09:43:41 +01:00
Michael Vogel
14a2aa552a The name in the notifications has to be double encoded 2016-03-12 09:21:13 +01:00
Tobias Diekershoff
b5851931d1 Hotkey documentation 2016-03-12 08:57:07 +01:00
Michael Vogel
5cbd8ea132 Merge pull request #2410 from tobiasd/20160312-messagespo
regenerated messages.po file for picking up the workers
2016-03-12 08:42:55 +01:00
Michael Vogel
a0aeea4a89 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-12 07:38:25 +01:00
Tobias Diekershoff
9d52a89c51 regenerated messages.po file for picking up the workers 2016-03-12 07:36:44 +01:00
Tobias Diekershoff
ee2020caff Merge pull request #2409 from annando/1503-worker-setting
The worker settings are now available in the admin settings
2016-03-12 07:30:55 +01:00
Tobias Diekershoff
08b69892e8 Merge pull request #2408 from annando/1603-goaway
Another fix for "goaway". Hopefully now finale.
2016-03-12 07:29:32 +01:00
Tobias Diekershoff
02d14eafda Merge pull request #2407 from annando/1603-optimize-table
The table optimisation level calculation is now also using the index size
2016-03-12 07:28:44 +01:00
Michael Vogel
bc21fca345 Remove the setting description from the documentation since it isn't a hidden one anymore. 2016-03-11 23:44:46 +01:00
Michael Vogel
b12dbe8831 The worker settings are now available in the admin settings 2016-03-11 23:28:11 +01:00
Michael Vogel
3189f0e23c Another fix for "goaway". Hopefully now finale. 2016-03-11 20:43:31 +01:00
Michael Vogel
2718c8150f The table optimisation level calculation is now using the index size as well 2016-03-11 20:32:22 +01:00
Michael Vogel
cd0fbc5e9a Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-10 08:22:52 +01:00
fabrixxm
a28d44a9ba Merge pull request #2405 from annando/1603-ostatus4-bugfix
Bugfix: A parameter was missing for the OStatus author check
2016-03-10 06:08:30 +01:00
Michael Vogel
df312402e4 Bugfix: A parameter was missing for the OStatus author check 2016-03-09 22:51:17 +01:00
fabrixxm
60a01242ea Merge pull request #2404 from annando/1603-no-lock
Don't create lock files if the process is called from the poller
2016-03-09 22:08:41 +01:00
Michael Vogel
c0bd7a866d Some small addition to the OStatus part. Better check if we follow the actor. 2016-03-09 21:53:30 +01:00