gerhard6380
|
a2ccdf1fec
|
coding conventions applied
|
2017-05-01 22:05:33 +02:00 |
|
|
gerhard6380
|
8d95e4ffc8
|
remove "not implemented by now" comment for update_profile_image
|
2017-05-01 16:48:45 +02:00 |
|
|
gerhard6380
|
2275fecec0
|
line breaks by mistake reversed
|
2017-05-01 16:47:17 +02:00 |
|
|
gerhard6380
|
e267d07c91
|
change line endings from VS
|
2017-05-01 16:45:22 +02:00 |
|
|
gerhard6380
|
5b35901716
|
new api calls for photo management within clients
|
2017-05-01 16:38:39 +02:00 |
|
Hypolite Petovan
|
b6945a46b6
|
Merge pull request #3414 from beardyunixer/dlogger
Dlogger
|
2017-04-30 08:10:07 -04:00 |
|
Thomas Willingham
|
7177cc3858
|
Accidentally included a self-loathing verb.
|
2017-04-30 11:16:04 +01:00 |
|
|
Thomas Willingham
|
6eff506cdd
|
Add the dlogger
|
2017-04-30 11:14:38 +01:00 |
|
|
Hypolite Petovan
|
9ff4fed7d2
|
Merge pull request #3408 from annando/1704-conversation-2
Conversation data is stored for own posts as well/improved function dba:update
|
2017-04-29 16:37:53 -04:00 |
|
|
Hypolite Petovan
|
f3a64ebfcb
|
Merge pull request #3411 from annando/1704-ping-order
Unread notifications are now always on top
|
2017-04-29 16:36:03 -04:00 |
|
 Michael
|
1088e51d69
|
Remove commented code.
|
2017-04-29 20:21:54 +00:00 |
|
|
Hypolite Petovan
|
9ee79270ae
|
Merge pull request #3410 from annando/1704-poller-memory
There is now a memory limit for the poller
|
2017-04-29 16:01:05 -04:00 |
|
|
Michael
|
9d9909cf10
|
Some more places were we check now
|
2017-04-29 17:45:09 +00:00 |
|
|
Michael
|
715e15cbe1
|
There is now a memory limit for the poller
|
2017-04-29 17:36:46 +00:00 |
|
|
Michael
|
96afaaa0d5
|
Unread notifications are now always on top
|
2017-04-29 14:22:49 +00:00 |
|
|
Michael
|
55c39a80fa
|
Description added
|
2017-04-29 12:19:49 +00:00 |
|
|
Michael
|
10ea759282
|
Don't update the conversation only because the source changed
|
2017-04-29 08:30:43 +00:00 |
|
|
Michael
|
fa14096ea8
|
Added documentation
|
2017-04-29 08:11:54 +00:00 |
|
|
Michael
|
0e4cd900d5
|
Improved dba:update function.
|
2017-04-29 07:50:09 +00:00 |
|
rabuzarus
|
46371242e5
|
Merge pull request #3407 from Hypolite/issue/#3406
frio: Fix typo in various button callbacks
|
2017-04-29 09:08:33 +02:00 |
|
|
Michael
|
edbbdf9761
|
Store conversation data for self created posts as well
|
2017-04-29 05:44:13 +00:00 |
|
|
Hypolite Petovan
|
2c9c867393
|
frio: Fix typo in various button callbacks
|
2017-04-28 21:50:09 -04:00 |
|
|
Michael
|
c0b5339691
|
There is now a function to store conversations
|
2017-04-28 16:35:53 +00:00 |
|
 Tobias Diekershoff
|
2172a162f9
|
Merge pull request #3405 from annando/1704-remove-discard
Remove the "discard" button for contact requests from Diaspora.
|
2017-04-28 12:42:10 +02:00 |
|
|
Michael
|
ba5780c4a1
|
Remove the "discard" button for contact requests from Diaspora.
|
2017-04-28 08:36:10 +00:00 |
|
Michael Vogel
|
62b6bbeef0
|
Merge pull request #3403 from tobiasd/20170428-typo
a typo
|
2017-04-28 10:10:46 +02:00 |
|
|
Tobias Diekershoff
|
50da541860
|
Merge pull request #3402 from annando/1704-conversation
OStatus improvements (Mastodon) and new SQL functions
|
2017-04-28 10:00:12 +02:00 |
|
|
Tobias Diekershoff
|
06f5ce89b0
|
a typo
|
2017-04-28 09:48:07 +02:00 |
|
|
Michael
|
9900d28c4b
|
We should return a return value when we say that we have a return value.
|
2017-04-28 06:21:12 +00:00 |
|
|
Michael
|
7240b2198b
|
Missed protocol ...
|
2017-04-28 06:03:04 +00:00 |
|
|
Michael
|
782783aa52
|
New function "dba::update" and changed unique index for the conversations
|
2017-04-28 05:50:27 +00:00 |
|
|
Michael
|
3b5e1bbfc3
|
dba:p and dba:e can now be called with a parameter array as well.
|
2017-04-28 04:47:28 +00:00 |
|
|
Michael
|
615197e044
|
We should escape the table name as well.
|
2017-04-28 04:05:50 +00:00 |
|
|
Hypolite Petovan
|
4493f37af3
|
Merge pull request #3390 from annando/1704-cleaned_install
Added a PDO check in the install routine and cleaned it up
|
2017-04-27 21:17:13 -04:00 |
|
|
Michael
|
15355850f7
|
Set the database version
|
2017-04-27 20:47:52 +00:00 |
|
|
Michael
|
35dc56c9c2
|
Salmons with Mastodon seem to work now
|
2017-04-27 20:38:46 +00:00 |
|
|
Michael Vogel
|
671170f0e0
|
Merge pull request #3398 from tobiasd/20170427-blockdocde
DE Server Blocklist docs
|
2017-04-27 11:06:31 +02:00 |
|
|
Tobias Diekershoff
|
069f8bf5a9
|
a cookie for the Rechtschreib-Nerd
|
2017-04-27 11:00:30 +02:00 |
|
|
Michael Vogel
|
09aa02796e
|
Merge pull request #3400 from tobiasd/20170427-credits
regen credits
|
2017-04-27 10:47:08 +02:00 |
|
|
Michael Vogel
|
b5f95db9f7
|
Merge pull request #3399 from tobiasd/20170427-messages
regenerated master messages.po file
|
2017-04-27 10:46:54 +02:00 |
|
fabrixxm
|
44e1cbabee
|
Merge pull request #3397 from tobiasd/20170427-robots
removed commented out line
|
2017-04-27 09:27:55 +02:00 |
|
|
Tobias Diekershoff
|
8e88a84881
|
regen credits
|
2017-04-27 07:42:21 +02:00 |
|
|
Tobias Diekershoff
|
c76dcc6bab
|
regenerated master messages.po file
|
2017-04-27 07:35:43 +02:00 |
|
|
Tobias Diekershoff
|
7adb968653
|
removed commented out line
|
2017-04-27 07:31:57 +02:00 |
|
|
Tobias Diekershoff
|
67aae6fca9
|
DE Server Blocklist docs
|
2017-04-27 07:29:49 +02:00 |
|
|
Tobias Diekershoff
|
ae580e5829
|
Merge pull request #3393 from Shnoulle/develop_feature3334
Simple robots.txt for server 404 log
|
2017-04-27 07:23:01 +02:00 |
|
|
Tobias Diekershoff
|
4aac140749
|
Merge pull request #3392 from Hypolite/issue/#3387
Enforce the domain blocklist
|
2017-04-27 07:22:45 +02:00 |
|
|
Hypolite Petovan
|
5d3021fd5a
|
Add documentation about the new admin page
|
2017-04-26 22:22:01 -04:00 |
|
|
Hypolite Petovan
|
9c53108a3e
|
Use Config::get instead of get_config
|
2017-04-26 22:08:47 -04:00 |
|
|
Michael
|
45d73b106b
|
Conversation data is now stored in another table
|
2017-04-26 21:16:25 +00:00 |
|