|
|
dcb8d51a4c
|
Merge pull request #2423 from annando/1603-api-conversation
API: Support for the conversation api call from GNU Social
|
2016-03-23 14:53:27 +01:00 |
|
Michael Vogel
|
799ff77797
|
API: Support for the conversation api call from GNU Social
|
2016-03-23 10:24:01 +01:00 |
|
|
|
430be22bb9
|
Merge pull request #2422 from annando/1603-oembed-object
Bugfix: Avoid warning with non object OEmbed data
|
2016-03-23 06:51:14 +01:00 |
|
Michael Vogel
|
791ce24cd5
|
Bugfix: Avoid warning with non object OEmbed data
|
2016-03-22 23:24:07 +01:00 |
|
|
|
0bcd6886f0
|
Merge pull request #2419 from annando/1603-fbrowser
Take the second largest picture as preview - not the smallest one
|
2016-03-21 06:41:48 +01:00 |
|
|
|
53546e92d3
|
Merge pull request #2420 from annando/1603-guid
Add the guid to items that we create locally
|
2016-03-21 06:40:55 +01:00 |
|
|
|
ce48fb7e85
|
Merge pull request #2421 from annando/1603-dfrn-tagging
DFRN: Remote tagging works now
|
2016-03-21 06:39:59 +01:00 |
|
Michael Vogel
|
77ed71e2e0
|
DFRN: Remote tagging works now
|
2016-03-20 15:53:37 +01:00 |
|
Michael Vogel
|
8f00836ffb
|
Add the guid to items that we create locally
|
2016-03-20 15:01:50 +01:00 |
|
Michael Vogel
|
186eaf1264
|
Take the second largest picture as preview - not the smallest one
|
2016-03-20 10:30:06 +01:00 |
|
fabrixxm
|
bfde20f5fe
|
Merge pull request #2417 from annando/1603-sess_data
There is no table "sess_data" - this database call is useless
|
2016-03-18 18:46:28 +01:00 |
|
Michael Vogel
|
a2507804f2
|
There is no table "sess_data" - this database call is useless
|
2016-03-18 16:42:10 +01:00 |
|
fabrixxm
|
7ef4d8a404
|
Merge pull request #2416 from tobiasd/20160317-issue2330
added title element to emoji images in main repository
|
2016-03-18 08:29:30 +01:00 |
|
|
|
bc579ff799
|
added title element to emoji images in main repository
|
2016-03-17 17:41:06 +01:00 |
|
|
|
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 |
|
|
|
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
|
4020b51f8f
|
Merge pull request #2413 from tobiasd/20160312-socnetsettings
missing include file for the SocNet settings
|
2016-03-12 19:49:03 +01:00 |
|
|
|
2a864d889e
|
missing include file for the SocNet settings
|
2016-03-12 16:25:17 +01:00 |
|
Michael Vogel
|
cabb84a42a
|
Merge pull request #2411 from tobiasd/20160312-dos
Hotkey documentation
|
2016-03-12 10:23:45 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
9d52a89c51
|
regenerated messages.po file for picking up the workers
|
2016-03-12 07:36:44 +01:00 |
|
|
|
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 |
|
|
|
08b69892e8
|
Merge pull request #2408 from annando/1603-goaway
Another fix for "goaway". Hopefully now finale.
|
2016-03-12 07:29:32 +01:00 |
|
|
|
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 |
|
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
|
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 |
|
|
|
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 |
|
|
|
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 |
|
