FlxAlbroscheit
|
14dff6b0e0
|
Preview last five conversations in message-sidebar
|
2015-11-07 18:53:32 +01:00 |
|
|
|
83c45d8d4b
|
Merge pull request #2029 from tugelbend/develop
changed syntax to work with PHP 5.3 #2027
|
2015-11-07 16:34:13 +01:00 |
|
hauke
|
f3eebda4fa
|
changed syntax to work with PHP 5.3 #2027
|
2015-11-07 16:24:59 +01:00 |
|
Michael Vogel
|
3ccff0c77f
|
Merge pull request #2023 from tobiasd/20151107-registertext
Following n4rky to resolve #1898
|
2015-11-07 16:02:26 +01:00 |
|
|
|
9a1c57f1bc
|
Following n4rky to resolve #1898
|
2015-11-07 13:19:55 +01:00 |
|
|
|
bb5f7c4db7
|
Merge pull request #2020 from fabrixxm/install_checks
Install checks
|
2015-11-07 11:12:37 +01:00 |
|
fabrixxm
|
6befca288f
|
Check for mcrypt_create_iv() for RINO2, update link to cron documentation
|
2015-11-07 11:03:08 +01:00 |
|
|
|
4e7bf0028c
|
Merge pull request #2019 from rabuzarus/0611_directory
simple photo_menu for directory
|
2015-11-07 06:54:16 +01:00 |
|
fabrixxm
|
16123f5ad5
|
Check for ImageMagick and for GIF support
|
2015-11-07 00:22:26 +01:00 |
|
rabuzarus
|
df36ea0d03
|
simple photo_menu for directory
|
2015-11-07 00:08:35 +01:00 |
|
fabrixxm
|
5f6ea6357d
|
Add 'Reload active themes' to admin
It will call 'uninstall()' and 'install()' on every active themes
|
2015-11-06 23:53:10 +01:00 |
|
Michael Vogel
|
0f41f35041
|
The contact template now displays the address if available
|
2015-11-06 00:47:54 +01:00 |
|
rabuzarus
|
a0ae6eb905
|
template-rework:little cleanup
|
2015-11-03 14:33:17 +01:00 |
|
rabuzarus
|
e785759a8b
|
template-rework:make use of get_contact_details_by_url()
|
2015-11-03 14:31:15 +01:00 |
|
rabuzarus
|
f196389580
|
Merge develop into allfriends
|
2015-11-02 14:31:20 +01:00 |
|
Michael Vogel
|
709aac0652
|
Only offer the choice to activate Diaspora and OStatus if the system is ready for it
|
2015-11-01 13:55:49 +01:00 |
|
Michael Vogel
|
2f47d63a29
|
Merge pull request #2000 from tobiasd/20151027-credits
a credits page
|
2015-10-31 22:34:30 +01:00 |
|
|
|
cfc9d2b88f
|
Merge pull request #1998 from annando/1510-network-profile2
New function for fetching contact data
|
2015-10-31 19:02:01 +01:00 |
|
|
|
7d0ea70cc1
|
Merge pull request #2001 from annando/1510-empty-poco
Bugfix: /poco was always empty
|
2015-10-31 12:48:30 +01:00 |
|
Michael Vogel
|
7cf4468353
|
Bugfix: /poco was always empty
|
2015-10-31 10:32:01 +01:00 |
|
Michael Vogel
|
09ff2f0dd5
|
Renamed the function
|
2015-10-31 00:01:33 +01:00 |
|
|
|
c00847a79d
|
use section_title.tpl for page title
|
2015-10-30 18:05:45 +01:00 |
|
rabuzarus
|
fc37f49f23
|
network.php: add a descriptive comment
|
2015-10-30 12:47:48 +01:00 |
|
rabuzarus
|
56c9f23e99
|
prvgroup mentioning in status_editor
|
2015-10-30 01:59:17 +01:00 |
|
Michael Vogel
|
f3ce812a9e
|
New function for fetching contact data
|
2015-10-30 01:30:42 +01:00 |
|
|
|
a48156aab6
|
display names listed in credits.txt from /credits
|
2015-10-29 08:48:41 +01:00 |
|
fabrixxm
|
fb4adc83dc
|
Merge pull request #1995 from rabuzarus/2810_fbrowser
fbrowser: exclude Contact Photos
|
2015-10-29 08:41:21 +01:00 |
|
|
|
6f601bf47d
|
Merge pull request #1996 from annando/1510-profile-network-page
Show the profile in the network view when viewing single contacts
|
2015-10-29 08:39:56 +01:00 |
|
Michael Vogel
|
2e316b5cf2
|
Show the profile in the network view when viewing single contacts
|
2015-10-29 08:10:39 +01:00 |
|
rabuzarus
|
e88d9153a1
|
fbrowser: exclude Contact Photos
|
2015-10-28 23:22:42 +01:00 |
|
|
|
8eda86d8bf
|
lower number of postings displayed per page for not logged in users
|
2015-10-28 19:01:45 +01:00 |
|
Michael Vogel
|
aee4522ad4
|
The contact page now shows the connection status.
|
2015-10-27 23:10:52 +01:00 |
|
rabuzarus
|
299c8b83ac
|
template-rework: let common friends and allfriends use viewcontact_template.tpl
|
2015-10-27 15:27:26 +01:00 |
|
|
|
367699f785
|
Merge pull request #1987 from annando/1510-manage-enhancements
Some small optical and structural changes to the manage template
|
2015-10-27 09:01:35 +01:00 |
|
|
|
4079084492
|
Merge pull request #1975 from rabuzarus/template_rework
Template rework for contact related pages
|
2015-10-27 08:59:03 +01:00 |
|
Michael Vogel
|
99ee45e627
|
The username is now a link
|
2015-10-26 23:11:42 +01:00 |
|
rabuzarus
|
7b1a957474
|
template-rework: try to fix double entries at match.php
|
2015-10-26 16:15:08 +01:00 |
|
rabuzarus
|
9d720f69aa
|
template-rework: don't show the findpeople_widget on contact edit page
|
2015-10-26 13:36:01 +01:00 |
|
rabuzarus
|
fdda4be452
|
manage-selector: use an easier sql querry
|
2015-10-26 00:19:55 +01:00 |
|
rabuzarus
|
87c559d605
|
manage-selector: sql - check for same baseurl
|
2015-10-25 18:04:20 +01:00 |
|
rabuzarus
|
4c263aa4ac
|
Merge develop into manage
Conflicts:
view/global.css
|
2015-10-25 16:57:04 +01:00 |
|
|
|
03ff349a94
|
Merge pull request #1982 from annando/1510-reduced-profile
Profile data are now reduced to only the most important fields
|
2015-10-25 16:54:24 +01:00 |
|
|
|
12d9c46ec5
|
Merge pull request #1979 from annando/1510-gnusocial
Statusnet is now GNU Social
|
2015-10-25 16:52:38 +01:00 |
|
rabuzarus
|
bac61cf596
|
manage-selector: some cleanup and css work
|
2015-10-25 16:49:45 +01:00 |
|
Michael Vogel
|
78a8db55c6
|
Merge pull request #1981 from rabuzarus/poke
some work on poke template
|
2015-10-25 14:59:39 +01:00 |
|
rabuzarus
|
e0e6762ed8
|
some inital work to have profile pics on manage page
|
2015-10-25 14:00:08 +01:00 |
|
Michael Vogel
|
65403973c1
|
Merge pull request #1977 from rabuzarus/crepair
move html from crepair.php to template
|
2015-10-25 09:44:12 +01:00 |
|
Michael Vogel
|
4631c13d08
|
Profile data are now reduced to only the most important fields
|
2015-10-25 09:15:36 +01:00 |
|
Michael Vogel
|
a11833e248
|
Statusnet is now GNU Social
|
2015-10-24 20:44:18 +02:00 |
|
rabuzarus
|
8f92b6eea4
|
some work on poke template
|
2015-10-24 19:51:58 +02:00 |
|
rabuzarus
|
ea2b3b2f76
|
move html from crepair.php to template
|
2015-10-24 15:57:46 +02:00 |
|
rabuzarus
|
87ecd8f658
|
tabs have now an ID
|
2015-10-24 15:04:27 +02:00 |
|
rabuzarus
|
eaf5d05030
|
template rework: display more infos for match and dirfind
|
2015-10-23 16:48:32 +02:00 |
|
rabuzarus
|
0c3979720f
|
template rework: rearrange sidebar widgets for contact related pages
|
2015-10-23 00:12:00 +02:00 |
|
rabuzarus
|
2aad62190f
|
template rework: use viewcontact_template.tpl also for directory
|
2015-10-22 22:48:49 +02:00 |
|
rabuzarus
|
f9c0c1d696
|
template rework: use viewcontact_template.tpl for contact dealing pages
|
2015-10-18 17:12:48 +02:00 |
|
rabuzarus
|
452a3011f7
|
Merge suggest into template_rework
|
2015-10-17 22:22:52 +02:00 |
|
rabuzarus
|
dbf1f9efcd
|
Merge dirfind into template_rework
|
2015-10-17 22:22:35 +02:00 |
|
rabuzarus
|
e55f9f8f07
|
Merge dir into template_rework
|
2015-10-17 22:22:20 +02:00 |
|
rabuzarus
|
4b8ca578d1
|
dirfind: move pagination into template
|
2015-10-17 22:09:19 +02:00 |
|
rabuzarus
|
b9d9bf8ecd
|
directory: move pagination into template
|
2015-10-17 21:45:55 +02:00 |
|
rabuzarus
|
9176e739a4
|
sugest.php: themeable as whole page
|
2015-10-17 21:25:21 +02:00 |
|
rabuzarus
|
72896b0f6b
|
unify directory page
|
2015-10-17 19:45:57 +02:00 |
|
Michael Vogel
|
2070c96dd1
|
Changing the acl does not work when editing posts - so it is disabled for events.
|
2015-10-17 08:46:45 +02:00 |
|
Michael Vogel
|
316276cb6d
|
Editing an item with an event is now opeing the event edit form.
|
2015-10-17 08:27:33 +02:00 |
|
rabuzarus
|
67f699403a
|
match.php: restructure acdording to the change of match.tpl
|
2015-10-17 00:39:50 +02:00 |
|
rabuzarus
|
20bb16859f
|
dirfind.php: move html to templates
|
2015-10-17 00:19:01 +02:00 |
|
rabuzarus
|
6ebb21a935
|
directory.php: move html to templates
|
2015-10-16 21:44:10 +02:00 |
|
fabrixxm
|
5299f25920
|
default value for firstDay in events page
|
2015-10-12 20:23:09 +02:00 |
|
rabuzarus
|
649578ae33
|
Merge develop-new into event-attendance-new
Conflicts:
include/conversation.php
|
2015-10-11 19:39:55 +02:00 |
|
Michael Vogel
|
48309a25ec
|
Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu
Conflicts:
include/conversation.php
|
2015-10-11 05:11:46 +02:00 |
|
|
|
27fa20ab22
|
Merge pull request #1947 from annando/1510-diaspora-follower
Reworked contact relations between Diaspora and Friendica
|
2015-10-10 18:50:20 +02:00 |
|
Michael Vogel
|
bb0dff2c75
|
Improved contact menu
|
2015-10-10 16:23:20 +02:00 |
|
Michael Vogel
|
efbdb57f92
|
Reworked contact relations between Friendica and Diaspora
|
2015-10-10 11:06:18 +02:00 |
|
Michael Vogel
|
ab0fbc3a65
|
Bugfix: Unidirectional Diaspora connect request have to be followers - not sharers
|
2015-10-10 04:56:40 +02:00 |
|
rabuzarus
|
0eae67ea48
|
update attendance state on profile wall
|
2015-10-09 14:20:01 +02:00 |
|
rabuzarus
|
d85d215bb8
|
attendance update in network stream
|
2015-10-09 13:46:08 +02:00 |
|
Michael Vogel
|
16da708e07
|
Contact names with ">" and "<" are a problem ...
|
2015-10-09 07:39:38 +02:00 |
|
rabuzarus
|
6a9ec14878
|
small bugfix in like.php
|
2015-10-08 20:26:11 +02:00 |
|
Michael Vogel
|
61c3ce7a21
|
Bugfix: The contact names had to be escaped
|
2015-10-08 00:25:55 +02:00 |
|
Michael Vogel
|
1f0b759e2f
|
Added resize possibility to proxy function
|
2015-10-07 08:25:10 +02:00 |
|
Michael Vogel
|
14e17b944f
|
Reworked fetching of contact data on "display" page
|
2015-10-06 18:31:08 +02:00 |
|
Michael Vogel
|
eefedc019b
|
Merge remote-tracking branch 'upstream/develop' into 1510-diaspora-privacy
|
2015-10-06 07:41:09 +02:00 |
|
Michael Vogel
|
901b95e935
|
Hide some profile data if not connected.
|
2015-10-06 06:56:31 +02:00 |
|
Michael Vogel
|
7ed61b2edc
|
Removed "proxy_parse_html" since it is now done in the bbcode function.
|
2015-10-05 22:25:14 +02:00 |
|
Michael Vogel
|
d3ac3f8490
|
Added the contact menu to the search as well.
|
2015-10-05 08:08:59 +02:00 |
|
Michael Vogel
|
8a2d1fe301
|
Show RedMatrix and use the proxy for the profile pictures
|
2015-10-04 22:24:58 +02:00 |
|
Michael Vogel
|
05ae3d528e
|
A contact that couldn't be resolved is know known as "UNKNOWN"
|
2015-10-04 19:48:29 +02:00 |
|
Michael Vogel
|
72ecb9e67b
|
Bugfix: Repairing a contact was more like killing the contact ...
|
2015-10-04 19:39:55 +02:00 |
|
Michael Vogel
|
8c514307cf
|
For safety reasons include the include
|
2015-10-04 17:20:47 +02:00 |
|
Michael Vogel
|
4003b9cc5d
|
Let the notification look more like the follow dialog
|
2015-10-04 17:18:58 +02:00 |
|
Michael Vogel
|
83ea4f7253
|
transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues.
|
2015-10-04 15:55:24 +02:00 |
|
Michael Vogel
|
ba41336099
|
Preparation for a not found contact.
|
2015-10-04 14:49:12 +02:00 |
|
Michael Vogel
|
d0ae5ce326
|
Show more information when following a new contact
|
2015-10-04 14:41:39 +02:00 |
|
|
|
be70dde61f
|
Merge pull request #1928 from annando/issue-1913
Issue 1913: Report invalid feed
|
2015-10-04 08:54:59 +02:00 |
|
|
|
05b2836d66
|
Merge pull request #1926 from annando/1510-permit-crawler
New option to permit crawlers
|
2015-10-04 08:53:32 +02:00 |
|
rabuzarus
|
f93a2242e0
|
missed one to delete
|
2015-10-04 01:00:24 +02:00 |
|
Michael Vogel
|
c0e277cec8
|
Issue 1913: Report invalid feed
|
2015-10-04 00:28:15 +02:00 |
|
Michael Vogel
|
2840bf2293
|
New option to permit crawlers
|
2015-10-03 23:16:40 +02:00 |
|
rabuzarus
|
c775d6885b
|
port of reds geotag feature
|
2015-10-03 20:24:35 +02:00 |
|
|
|
d6beb7db1f
|
add a header to seperate the beginning of week settings
|
2015-10-01 06:19:57 +02:00 |
|
Michael Vogel
|
389b7de451
|
Setting for the first day of the week
|
2015-09-30 19:18:13 +02:00 |
|
Michael Vogel
|
68a6f0298e
|
The events moved from the profile to the navigation bar - for supported themes
|
2015-09-30 18:50:44 +02:00 |
|
rabuzarus
|
7cb4ea52fd
|
port of the event attendance feature of red matrix with example implementation for vier theme.
|
2015-09-30 16:58:02 +02:00 |
|
rabuzarus
|
2ff67ef5ed
|
fixes like/dislike for photos
|
2015-09-30 14:39:00 +02:00 |
|
rabuzarus
|
f5c7006f30
|
rest of the consensus porting work and integration into friendica
Credits to Mike Macgirvin for the code
|
2015-09-30 14:38:13 +02:00 |
|
rabuzarus
|
0077494396
|
make event confirmation work
|
2015-09-30 14:35:17 +02:00 |
|
rabuzarus
|
37fccee503
|
first work for consensus
|
2015-09-30 14:34:10 +02:00 |
|
fabrixxm
|
2e8caf7f27
|
Merge pull request #1915 from rabuzarus/hide_profilepics
don't show profile photos in albums to others than owner or remote
|
2015-09-30 08:57:31 +02:00 |
|
rabuzarus
|
3d7602a5a3
|
don't show profile photos in albums to others than the owner or remote user
|
2015-09-29 19:44:26 +02:00 |
|
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 |
|
