Michael Vogel
|
6e981ed798
|
Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events
|
2015-09-29 10:35:50 +02:00 |
|
Fabrixxm
|
880dda4257
|
Merge branch 'master' back into develop
|
2015-09-29 10:00:13 +02:00 |
|
Michael Vogel
|
c33957a6e9
|
Internationalisation of events/Move events to the navigation bar
|
2015-09-27 14:00:15 +02:00 |
|
fabrixxm
|
af5da5bece
|
Merge pull request #1903 from annando/1509-bbcode-notifications
The "about" field in the introductions should be send through bbcode
|
2015-09-25 18:24:48 +02:00 |
|
Michael Vogel
|
c7b80b532a
|
Bugfix: The "about" field in the introductions should be send through bbcode
|
2015-09-25 17:47:37 +02:00 |
|
Sandro Santilli
|
2a2dd6a1b9
|
Remove duplicated calls to language detection
Also avoids overriding existing "lang" specification in an item
|
2015-09-23 10:47:34 +02:00 |
|
|
|
53719d4ecc
|
Merge pull request #1897 from annando/3.4.2
Bugfix: Following mail accounts is now possible again
|
2015-09-23 06:20:49 +02:00 |
|
Michael Vogel
|
7c8c8b821a
|
Bugfix: Following mail accounts is now possible again
|
2015-09-22 22:31:22 +02:00 |
|
Fabrixxm
|
554948c22a
|
Adds checks for mcrypt module for RINO2
- check for module on install
- check for module when RINO2 is enabled in admin
- check for module when RINO2 is used in communications
|
2015-09-22 09:50:24 +02:00 |
|
Michael Vogel
|
5ac38b7f99
|
There is now only one central parameter for the global directory.
|
2015-09-15 22:29:02 +02:00 |
|
Michael Vogel
|
d20dbedddd
|
Merge remote-tracking branch 'upstream/develop' into 1509-diaspora-import
|
2015-09-06 09:15:23 +02:00 |
|
|
|
c67fbc89c4
|
Merge pull request #1879 from annando/1509-fixing-ostatus
Improvements to OStatus subscriptions
|
2015-09-06 09:03:28 +02:00 |
|
|
|
8504cf4f05
|
Merge pull request #1880 from annando/1509-performance
Some settings to control the system load
|
2015-09-06 09:02:27 +02:00 |
|
Michael Vogel
|
f918109351
|
We forgot to include the title ...
|
2015-09-06 08:18:55 +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
|
c6d9b2da23
|
New setting for requery days
|
2015-09-05 10:54:39 +02:00 |
|
Michael Vogel
|
cecbc58729
|
Mass-subscribing to OStatus contacts is enabled again
|
2015-09-05 10:32:10 +02:00 |
|
Michael Vogel
|
3cccb5ecb1
|
The repair option is added to the settings
|
2015-09-05 04:54:48 +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
|
d9f23dbb20
|
New switch that restricts the search only for registered users
|
2015-09-05 04:29:37 +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 |
|
|
|
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 |
|
Michael Vogel
|
389738b1c1
|
Bugfix: pubsub tend to unsubscribe subscriptions in the past
|
2015-09-01 00:12:15 +02:00 |
|
Michael Vogel
|
3614df650f
|
Some admin settings hadn't been made translatable.
|
2015-08-31 19:32:01 +02:00 |
|
Michael Vogel
|
d1e3ea7b46
|
Soapbox-Improvements
|
2015-08-30 19:07:30 +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 |
|
|
|
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 |
|
fabrixxm
|
b988aa7cb4
|
fix warning in /dfrn_request
|
2015-08-26 19:17:41 +02:00 |
|
Michael Vogel
|
6942b16ef5
|
See issue 1855. OOhembed is removed.
|
2015-08-25 19:50:23 +02:00 |
|
Michael Vogel
|
5c084b754a
|
Don't show the alternate url syntax in searches
|
2015-08-25 05:31:21 +02:00 |
|
Michael Vogel
|
b52bc71c6c
|
Now you can define the duration of the cache entries.
|
2015-08-24 17:24:14 +02:00 |
|
|
|
26c5c7991a
|
Merge pull request #1849 from fabrixxm/issue-1841
filebrowser: link image to original picture, show error messages
|
2015-08-24 14:26:09 +02:00 |
|
fabrixxm
|
cbabac298d
|
filebrowser: link image to original picture, show error messages
|
2015-08-24 13:54:41 +02:00 |
|
Michael Vogel
|
3bca2db11b
|
Don't show search options in side bar.
|
2015-08-24 12:12:14 +02:00 |
|
Michael Vogel
|
3ff196f00d
|
Now you can set search options so that searching for contacts or forums isn't occult science anymore.
|
2015-08-24 11:55:29 +02:00 |
|
Michael Vogel
|
cf5fce855e
|
Bugfix: Don't show "appnet" in "inbound" when only "buffer" is enabled.
|
2015-08-24 08:18:17 +02:00 |
|
Michael Vogel
|
3e08024839
|
Moved the rss/atom part to the protocols.
|
2015-08-24 08:15:34 +02:00 |
|
Michael Vogel
|
157c64cac2
|
The rss/atom feed is added to the inofficial "services" section.
|
2015-08-24 08:02:46 +02:00 |
|
Michael Vogel
|
2a676ee312
|
The nodeinfo is changed to the new specifications
|
2015-08-24 07:47:42 +02:00 |
|
Michael Vogel
|
b0ddde22c0
|
By entering a GNU Social account name, the friends of this contact will be added to the friendica account
|
2015-08-23 22:21:15 +02:00 |
|
|
|
37ab7ee052
|
Merge pull request #1842 from annando/1508-directory-configurable
Make the hardcoded path to dir.friendica.com configurable
|
2015-08-23 15:10:34 +02:00 |
|
Michael Vogel
|
123ad84689
|
Make the hardcoded path to dir.friendica.com configurable
|
2015-08-23 11:05:10 +02:00 |
|
fabrixxm
|
81d1dfc006
|
add 'reload active plugins' button in admin/plugins
|
2015-08-20 15:01:15 +02:00 |
|
|
|
033f89c6fa
|
Merge pull request #1831 from annando/1508-twidere-crash
New versions of Twidere crashed during posting.
|
2015-08-18 07:17:30 +02:00 |
|
Michael Vogel
|
57ebb00a1f
|
New versions of Twidere crashed during posting.
|
2015-08-17 22:38:05 +02:00 |
|
|
|
86f6532c61
|
adding the subdir
|
2015-08-17 08:20:19 +02:00 |
|
|
|
03e81b06d5
|
we dont need the or anymore
|
2015-08-17 07:24:48 +02:00 |
|
