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 |
|
|
Michael Vogel
|
32c66246c4
|
Some fixes for the fetching of postings by using /p/
|
2016-03-09 19:30:04 +01:00 |
|
|
Michael Vogel
|
c30b369a1a
|
Added documentation
|
2016-03-08 22:42:37 +01:00 |
|
|
Michael Vogel
|
65d6d45f8c
|
Changed parameter order
|
2016-03-08 22:28:49 +01:00 |
|
|
Michael Vogel
|
beb2346cfc
|
The function to check for maxload and the lockfile is centralized
|
2016-03-08 20:28:09 +01:00 |
|
|
Michael Vogel
|
ec9c9f0be7
|
Don't create lock files if the process is called from the poller via the worker
|
2016-03-08 00:20:06 +01:00 |
|
|
Michael Vogel
|
16eb8fd9bf
|
Small things ...
|
2016-03-07 15:20:48 +01:00 |
|
|
Michael Vogel
|
373beb0343
|
Relayed Likes and relayed comments should work, code needs beautification
|
2016-03-07 08:17:21 +01:00 |
|
|
Michael Vogel
|
db15f76177
|
Relaying is nearly done
|
2016-03-07 01:34:06 +01:00 |
|
|
Michael Vogel
|
182bee265e
|
Sending like and comment should work now.
|
2016-03-06 22:49:50 +01:00 |
|
|
Michael Vogel
|
918efbafac
|
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
|
2016-03-06 21:20:00 +01:00 |
|
|
Tobias Diekershoff
|
fa652ad1bc
|
Merge pull request #2401 from annando/1603-ostatus-completion
New way of fetching the conversation id for thread completion
|
2016-03-06 21:13:05 +01:00 |
|
|
Michael Vogel
|
4ef44c67b8
|
Added documentation
|
2016-03-06 21:06:52 +01:00 |
|
|
Michael Vogel
|
27905cc21a
|
Merge remote-tracking branch 'upstream/develop' into 1603-ostatus-completion
|
2016-03-06 20:37:51 +01:00 |
|
|
Michael Vogel
|
ef2bc47cc6
|
New way of fetching the conversation id for thread completion
|
2016-03-06 20:36:28 +01:00 |
|
|
fabrixxm
|
d30d13959b
|
Merge pull request #2328 from rabuzarus/0602_contact_profile
polishing of the contact-edit page
|
2016-03-06 19:56:59 +01:00 |
|
|
Tobias Diekershoff
|
bdfd81e723
|
Merge pull request #2400 from annando/1603-ostatus-thread
Only import OStatus threads that are started by our contacts
|
2016-03-06 19:40:01 +01:00 |
|
|
Michael Vogel
|
9579725d4d
|
This should work better ...
|
2016-03-06 19:27:34 +01:00 |
|
|
Michael Vogel
|
279a0453f9
|
Or back ...
|
2016-03-06 15:13:19 +01:00 |
|
|
Michael Vogel
|
7f48df63a3
|
Relocated the check.
|
2016-03-06 15:11:04 +01:00 |
|
|
Michael Vogel
|
4bd1061a09
|
Only import OStatus threads if we follow the thread starter
|
2016-03-06 14:53:30 +01:00 |
|
|
Tobias Diekershoff
|
1127150c79
|
Merge pull request #2399 from annando/1603-default-group
Central function for default group, special setting for OStatus
|
2016-03-06 14:42:27 +01:00 |
|