Michael Vogel
|
f918109351
|
We forgot to include the title ...
|
2015-09-06 08:18:55 +02:00 |
|
Michael Vogel
|
c555b1b5cb
|
Only look for the GUID when checking for duplicates.
|
2015-09-06 07:34:51 +02:00 |
|
Michael Vogel
|
988f32dfc8
|
Rearranged the dispatcher
|
2015-09-05 13:26:14 +02:00 |
|
Michael Vogel
|
6aac9dfc9c
|
Merge branch '1509-diaspora-import' of github.com:annando/friendica into 1509-diaspora-import
|
2015-09-05 12:13:38 +02:00 |
|
Michael Vogel
|
4b858650ce
|
Check if the author should be ignored when fetching missing posts
|
2015-09-05 12:11:14 +02:00 |
|
|
|
7dbd8ed473
|
Merge pull request #1878 from annando/1509-nodeinfo
The links for nodeinfo in "well-known" need to be an array of objects.
|
2015-09-05 07:39:49 +02:00 |
|
Michael Vogel
|
30e7ce2e2a
|
The links for nodeinfo in "well-known" need to be an array of objects.
|
2015-09-05 04:33:18 +02:00 |
|
Michael Vogel
|
635e92249a
|
Bugfix: The first contact was never repaired
|
2015-09-03 22:24:57 +02:00 |
|
Michael Vogel
|
fd239ebf7b
|
Try to repair OStatus subscriptions
|
2015-09-03 22:18:25 +02:00 |
|
|
|
dc4e42c98e
|
Merge pull request #1876 from tobiasd/20150901-trans
DE, ES, IT: update to the translations
|
2015-09-01 15:13:41 +02:00 |
|
|
|
4db21f85c4
|
DE, ES, IT: update to the translations
|
2015-09-01 15:12:09 +02:00 |
|
|
|
ffc9f94149
|
Merge pull request #1875 from tobiasd/20150901-messagespo
#1873 added new translateable strings so regenerating core messages.po
|
2015-09-01 07:12:09 +02:00 |
|
|
|
d867f97dea
|
#1873added new translateable strings so regenerating core messages.po
|
2015-09-01 07:10:29 +02:00 |
|
|
|
658c99dcf3
|
Merge pull request #1874 from annando/1509-pubsub
Bugfix: pubsub tend to unsubscribe subscriptions in the past
|
2015-09-01 07:07:22 +02:00 |
|
|
|
bc92b922b4
|
Merge pull request #1873 from annando/1508-admin-settings
Some admin settings hadn't been made translatable.
|
2015-09-01 07:06:34 +02:00 |
|
Michael Vogel
|
389738b1c1
|
Bugfix: pubsub tend to unsubscribe subscriptions in the past
|
2015-09-01 00:12:15 +02:00 |
|
Michael Vogel
|
4d4ad0f2e7
|
Merge pull request #1872 from tobiasd/20150831-lang
update to the translation ES, FR, IT
|
2015-08-31 20:10:40 +02:00 |
|
Michael Vogel
|
3614df650f
|
Some admin settings hadn't been made translatable.
|
2015-08-31 19:32:01 +02:00 |
|
|
|
32c063b9a5
|
IT update to the translations
|
2015-08-31 19:02:12 +02:00 |
|
|
|
3665ab3de0
|
FR update to the translations
|
2015-08-31 19:01:56 +02:00 |
|
|
|
fe5a5c72f5
|
ES update to the translations
|
2015-08-31 19:01:42 +02:00 |
|
|
|
af48217465
|
Merge pull request #1870 from annando/1508-soapbox
Soapbox-Improvements
|
2015-08-31 06:53:54 +02:00 |
|
|
|
daf27055b9
|
Merge pull request #1867 from annando/1508-vier-popup-menu
Vier: The popup menus now popup automatically
|
2015-08-31 06:53:20 +02:00 |
|
Michael Vogel
|
56ae056f1d
|
The "manage" option list is now larger.
|
2015-08-30 22:45:48 +02:00 |
|
Michael Vogel
|
d1e3ea7b46
|
Soapbox-Improvements
|
2015-08-30 19:07:30 +02:00 |
|
Michael Vogel
|
cc3419f101
|
Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu
Conflicts:
mod/dfrn_notify.php
|
2015-08-30 10:44:29 +02:00 |
|
|
|
3d614a0fcd
|
Merge pull request #1869 from tobiasd/20150830-CS
CS update to the strings
|
2015-08-30 07:26:44 +02:00 |
|
|
|
9aa1e22047
|
CS update to the strings
|
2015-08-30 07:24:39 +02:00 |
|
|
|
2465d56b1a
|
Merge pull request #1868 from annando/1508-rino
RINO: More logging and a bugfix
|
2015-08-29 20:53:08 +02:00 |
|
Michael Vogel
|
31fffcf281
|
Accidentally removed a file
|
2015-08-29 17:09:25 +02:00 |
|
Michael Vogel
|
3246352ba8
|
More detailled log entries
|
2015-08-29 16:55:25 +02:00 |
|
Michael Vogel
|
38c8431527
|
Rino Bugfix: A variable was used that never was fetched
|
2015-08-29 11:38:40 +02:00 |
|
Michael Vogel
|
82e682ef45
|
The click behaviour of the top menu bar is now changed completely
|
2015-08-29 10:14:41 +02:00 |
|
Michael Vogel
|
e25457ab68
|
Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu
|
2015-08-28 14:16:52 +02:00 |
|
fabrixxm
|
ba6741932a
|
Merge pull request #1865 from annando/issue-1864
See issue 1864. Bugfix for the Oembed handling.
|
2015-08-28 11:45:40 +02:00 |
|
Michael Vogel
|
1dad181acb
|
See issue 1864. Bugfix for the Oembed handling.
|
2015-08-28 11:39:52 +02:00 |
|
Michael Vogel
|
319df2ed66
|
The menu bar isn't clickable anymore
|
2015-08-28 11:36:43 +02:00 |
|
|
|
50dce314b2
|
Merge pull request #1863 from tobiasd/20150826-lang
DE update to the strings
|
2015-08-27 09:51:39 +02:00 |
|
|
|
6d9d34ab54
|
Merge pull request #1862 from tobiasd/20150827-littlelessdebug
commented out a debugging call that produced a bit too much noise in t…
|
2015-08-27 09:21:56 +02:00 |
|
|
|
257a600e2a
|
commented out a debuggin call that produced a bit too much noise in the logs
|
2015-08-27 09:17:28 +02:00 |
|
Michael Vogel
|
14af9cd2e8
|
Remove the unneeded menu buttons-
|
2015-08-27 00:50:04 +02:00 |
|
Michael Vogel
|
92fbf1bcbd
|
Vier: Use CSS for popup menu
|
2015-08-27 00:02:06 +02:00 |
|
|
|
5b78353fff
|
Merge pull request #1861 from annando/1508-deactivated-ostatus-contacts
There seems to be a problem with the function to add all friends of a GNU Social account.
|
2015-08-26 22:51:55 +02:00 |
|
Michael Vogel
|
86f2eb005f
|
There seems to be a problem with the function to add all friends of a GNU Social account. So it is deactivated by now.
|
2015-08-26 22:46:59 +02:00 |
|
|
|
1436054ba0
|
Merge pull request #1860 from fabrixxm/smallfix
fix warning in /dfrn_request
|
2015-08-26 19:33:14 +02:00 |
|
fabrixxm
|
b988aa7cb4
|
fix warning in /dfrn_request
|
2015-08-26 19:17:41 +02:00 |
|
|
|
7da830c9f6
|
DE update to the strings
|
2015-08-26 16:40:31 +02:00 |
|
fabrixxm
|
2e09ce6847
|
Merge pull request #1859 from annando/1508-updated-sql
The database.sql now contains the latest changes.
|
2015-08-26 14:33:34 +02:00 |
|
Michael Vogel
|
f8ba1b6fae
|
The database.sql now contains the latest changes.
|
2015-08-26 14:31:56 +02:00 |
|
|
|
9f8d406b41
|
Merge pull request #1857 from tobiasd/20150826-messagespo
updated master messages.po file
|
2015-08-26 07:56:30 +02:00 |
|
