fabrixxm
|
1cf3e778e8
|
Merge pull request #1622 from rabuzarus/albums_widget
move html to photo_albums.tpl
|
2015-05-31 10:07:43 +02:00 |
|
rabuzarus
|
74267310d6
|
html to section_title.tpl
|
2015-05-30 02:21:30 +02:00 |
|
rabuzarus
|
553a152345
|
Merge photo-template into develop
|
2015-05-29 16:24:58 +02:00 |
|
rabuzarus
|
5cbb5b140c
|
css work
|
2015-05-29 16:08:17 +02:00 |
|
|
|
9a22b4818e
|
Merge pull request #1618 from rabuzarus/vcard
remove html and make use of vcard-widget.tpl
|
2015-05-29 08:52:27 +02:00 |
|
rabuzarus
|
415a606a59
|
better solution to exclude Contact Photos and include count of Photos
|
2015-05-28 15:54:53 +02:00 |
|
fabrixxm
|
b3992e1c65
|
Merge pull request #1599 from fabrixxm/issue-1574
Issue #1574
|
2015-05-27 11:07:30 +02:00 |
|
rabuzarus
|
15499ff1aa
|
first step to get html code from photos.php removed
|
2015-05-27 03:35:29 +02:00 |
|
rabuzarus
|
f309f3a681
|
remove html and use vcard-widget.tpl
|
2015-05-26 14:32:40 +02:00 |
|
rabuzarus
|
b3054ee9d0
|
template for searchbox
|
2015-05-24 20:01:08 +02:00 |
|
fabrixxm
|
b29b01fad4
|
Merge branch 'develop' into issue-1574
|
2015-05-24 10:26:21 +02:00 |
|
fabrixxm
|
4554526515
|
Merge pull request #1570 from rabuzarus/archive-widget
port of red matrix archive widget
|
2015-05-24 10:18:10 +02:00 |
|
fabrixxm
|
3a71978b0d
|
Merge pull request #1598 from rabuzarus/datepicker
new datetimepicker for event creation
|
2015-05-24 10:16:29 +02:00 |
|
fabrixxm
|
7c2608e07d
|
quattro: style video delete button
|
2015-05-23 22:51:34 +02:00 |
|
fabrixxm
|
83697cf3e5
|
Delete attachments on item deletion
Delete video from videos page
|
2015-05-23 22:35:02 +02:00 |
|
fabrixxm
|
3cb4f91807
|
Merge pull request #1596 from rabuzarus/event-preview
event preview for frost theme
|
2015-05-23 20:15:10 +02:00 |
|
rabuzarus
|
6731ffbfc8
|
event preview for frost theme
|
2015-05-23 19:23:32 +02:00 |
|
rabuzarus
|
2ad8fdc40b
|
port of red matrix datepicker implementation
|
2015-05-22 18:53:18 +02:00 |
|
rabuzarus
|
101804d505
|
minor polishing
|
2015-05-19 01:07:40 +02:00 |
|
rabuzarus
|
30348a1bc0
|
port of red matrix archive-widget
|
2015-05-19 01:03:08 +02:00 |
|
|
|
9575fd4a73
|
Merge pull request #1560 from rabuzarus/add_event
Double click on day in calendar creats new event starting that day
|
2015-05-15 08:20:15 +02:00 |
|
rabuzarus
|
fc4a76c033
|
Double click on day in calendar creats new event starting that day
|
2015-05-15 00:07:41 +02:00 |
|
fabrixxm
|
cbbb5da321
|
Merge pull request #1558 from rabuzarus/event-preview
Event preview
|
2015-05-14 16:32:24 +02:00 |
|
rabuzarus
|
de197405d0
|
port of red's event editing preview
|
2015-05-14 13:20:58 +02:00 |
|
|
|
2dd8db7de8
|
Merge pull request #1554 from FlxAlbroscheit/develop-1
Issue #1504: Creating groups directly from the sidebar in contacts-page
|
2015-05-13 19:59:58 +02:00 |
|
FlxAlbroscheit
|
4667d0e7e8
|
Add a group with one click
|
2015-05-12 14:09:51 +02:00 |
|
Michael Vogel
|
237b5a6e40
|
New page setting for the maximum frontend load value.
|
2015-05-02 22:05:04 +02:00 |
|
Michael Vogel
|
1058d055d1
|
Merge remote-tracking branch 'upstream/develop' into 1504-contact-update
Conflicts:
mod/contacts.php
|
2015-04-12 09:59:28 +02:00 |
|
Michael Vogel
|
2c3e2908b2
|
There is now a new possibility to update contact data.
|
2015-04-11 23:51:47 +02:00 |
|
Michael Vogel
|
f6ea872986
|
The behaviour when following a new contact is now unified.
|
2015-04-09 00:10:21 +02:00 |
|
FlxAlbroscheit
|
f054dbfc8d
|
Feature for desktop-notifications
|
2015-03-31 02:11:46 +02:00 |
|
FlxAlbroscheit
|
82359bb6cc
|
Give access to contact's profile-URL
|
2015-03-10 22:47:38 +01:00 |
|
Michael Vogel
|
f3cc065e66
|
Show the profile visibility only for Friendica contacts.
|
2015-02-21 20:03:02 +01:00 |
|
Michael Vogel
|
8179f2f65e
|
Only show the relation on native networks.
|
2015-02-20 23:56:41 +01:00 |
|
Michael Vogel
|
a8a37a35db
|
Only show the options that fit to the current network.
|
2015-02-20 23:12:04 +01:00 |
|
Michael Vogel
|
4a1105ede6
|
scrape/noscrape now contains the date the profile was last updated or the last message was sent.
|
2015-02-18 23:40:46 +01:00 |
|
Fabrixxm
|
b7a50a24c7
|
Merge branch 'release-3.3.3' into develop
|
2015-02-18 08:38:06 +01:00 |
|
Michael Vogel
|
4b7ff42a89
|
Bugfix: See issue 1338
|
2015-02-17 19:48:02 +01:00 |
|
Michael Vogel
|
a26d04574d
|
Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape
|
2015-02-17 19:18:17 +01:00 |
|
Michael Vogel
|
52de6c11b1
|
There is now a link to the profile behind the avatar picture on the display page
|
2015-02-17 17:33:28 +01:00 |
|
Fabrixxm
|
9d3fb417c2
|
Escape values to input fields (and some 'title' and 'alt')
|
2015-02-16 09:30:12 +01:00 |
|
Johannes Schwab
|
12d7ca9b84
|
improved infinite scrollling
|
2015-02-13 00:40:59 +01:00 |
|
Michael Vogel
|
21c63e8b65
|
Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape
|
2015-02-09 10:16:48 +01:00 |
|
Michael Vogel
|
842ac46857
|
Scrape now contains the number of contacts as well.
|
2015-02-08 23:35:29 +01:00 |
|
Michael Vogel
|
7e9ae24511
|
Moved several settings from .htconfig.php to the admin settings page.
|
2015-02-08 20:35:40 +01:00 |
|
Michael Vogel
|
8871591a98
|
Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default
Conflicts:
mod/admin.php
|
2015-02-08 13:26:28 +01:00 |
|
|
|
b4dc344f9c
|
Merge pull request #1374 from annando/1502-noscrape-always-active
Noscrape is now enabled all the time
|
2015-02-08 12:48:13 +01:00 |
|
Michael Vogel
|
1781fbff13
|
Bad HTML in the admin side menu for webfinger and probe
|
2015-02-08 12:12:19 +01:00 |
|
Michael Vogel
|
f931eba7f2
|
Noscrape is now enabled all the time.
|
2015-02-08 12:07:35 +01:00 |
|
Michael Vogel
|
1d48ab0191
|
"altpager" is now the standard value and can be disabled. Depending upon the user reactions we can disable it in an upcoming version.
|
2015-02-08 11:54:42 +01:00 |
|
Michael Vogel
|
9c0dc86eea
|
Merge pull request #1342 from tobiasd/20150202_admin
added diagnostics tools to the admin side panel
|
2015-02-02 21:14:41 +01:00 |
|
|
|
8a17c3d348
|
added diagnostics tools to the admin side panel
|
2015-02-02 18:26:38 +01:00 |
|
Silke Meyer
|
c90e47556a
|
added setting for server's sender email address
|
2015-01-31 15:54:12 +01:00 |
|
|
|
3df7370fa8
|
add links to the plugin config pages for active plugins
|
2015-01-27 14:34:11 +01:00 |
|
Michael Vogel
|
ed037124b3
|
Merge pull request #1299 from fabrixxm/optional-text-only-email
Optional text only email
|
2015-01-20 23:26:44 +01:00 |
|
fabrixxm
|
b2527039b7
|
add text-only email option
add a checkbok to notification settings. if checked, html body is not added to email.
|
2015-01-20 19:19:58 +01:00 |
|
|
|
c5200f9327
|
profile edit homepage field type URL
|
2015-01-19 08:15:20 +01:00 |
|
|
|
d58bac1138
|
template for password now support required and autofocus
|
2015-01-16 19:36:09 +01:00 |
|
|
|
8b20af6ef5
|
template for input fields now supports required, autofocus and types email, url
|
2015-01-16 19:31:23 +01:00 |
|
Michael Vogel
|
b36d799044
|
Fetching "location" and "about" from diaspora. Displaying them on the "display" page.
|
2015-01-07 01:46:13 +01:00 |
|
hauke
|
a72d60f481
|
Added h-card and functionality for IndieAuth/Web-sign-in
|
2014-12-28 15:48:24 +01:00 |
|
Rabuzarus
|
432cf6f2ce
|
insert new line at the end
|
2014-12-25 16:31:52 +01:00 |
|
Rabuzarus
|
73f9d06e3e
|
move some html code from photos.php to photo_album.tpl
|
2014-12-25 16:20:55 +01:00 |
|
Michael Vogel
|
70ba1667e1
|
It is now possible to define the hostname from the admin page. This should definetely end the problem that the hostname couldn't be detected unter certain conditions.
|
2014-11-08 00:07:21 +01:00 |
|
Carsten Pfeiffer
|
00c16b387a
|
Make TinyMCE editors resizable
|
2014-11-01 22:18:42 +01:00 |
|
Michael Vogel
|
691aa17025
|
fetch further information: it is now possible to define a blacklist for keywords for "fetch further information"
|
2014-10-30 00:24:23 +01:00 |
|
Michael Vogel
|
2b5372aebe
|
Forcing all non-SSL requests to SSL requests is now an option.
|
2014-10-26 22:15:12 +01:00 |
|
Michael Vogel
|
c77a63fb27
|
remote self: There is now an option if the keyswords should be used as tags or not.
|
2014-10-24 01:37:33 +02:00 |
|
|
|
56cd536652
|
use noscrape by default, add opt-out option to disable it
|
2014-10-13 19:19:54 +02:00 |
|
Fabrixxm
|
e2dc4f922c
|
Friendica 'Ginger' 3.3
|
2014-10-06 08:56:55 +02:00 |
|
Fabrixxm
|
133b5bca59
|
fix oembed video template
|
2014-09-17 11:02:58 +02:00 |
|
Michael Vogel
|
f9bec79a2c
|
In the profiles the remote connect field was missing
|
2014-09-11 23:38:24 +02:00 |
|
Beanow
|
948c52f13e
|
Added styling to show settings headers can be clicked.
|
2014-09-07 16:24:40 +02:00 |
|
fabrixxm
|
a7302daf96
|
Merge pull request #1123 from fabrixxm/mail_notification_cleanup
Mail notification cleanup
|
2014-09-07 15:05:06 +02:00 |
|
hauke
|
baabb5ba8b
|
removed fancybox as it is not used anywhere
|
2014-09-07 14:54:10 +02:00 |
|
fabrixxm
|
21b1e09fad
|
Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup
|
2014-09-07 14:28:03 +02:00 |
|
fabrixxm
|
9368c7e510
|
html mail template add img tag only if source_photo is defined
|
2014-09-07 11:20:56 +02:00 |
|
hauke
|
a162ea7251
|
bug fix #1115
|
2014-09-07 10:26:38 +02:00 |
|
hauke
|
2947be66b6
|
bug fix, wrong js lib included
|
2014-09-06 19:14:58 +02:00 |
|
hauke
|
25d7087d9e
|
Merge branch 'feature/2014-09-hackathon-ui-improvements' into develop
|
2014-09-06 16:55:07 +02:00 |
|
hauke
|
87fa2ee2af
|
updated jquery to version 1.11, updated themes frost and diabook where necessary
|
2014-09-06 16:21:03 +02:00 |
|
hauke
|
ec68e33c6b
|
make items on settings pages fold/unfold on click
|
2014-09-06 13:53:23 +02:00 |
|
hauke
|
9a8d106414
|
fixed contact action button bar, typo correction
|
2014-09-06 11:49:31 +02:00 |
|
hauke
|
191595766d
|
removed old comment that is no longer true
|
2014-09-06 00:14:25 +02:00 |
|
Michael Vogel
|
e21bcb82d2
|
Enhance the database structure checks when they failed.
|
2014-09-04 09:26:56 +02:00 |
|
Michael Vogel
|
73904bfa03
|
Added an alternate link to the profile in the atom feeds (feature request #925)
|
2014-09-03 09:52:31 +02:00 |
|
Michael Vogel
|
e35c55dd3b
|
Remote-self: It is now possible to chose between two different modes of mirroring.
|
2014-09-01 14:00:21 +02:00 |
|
Michael Vogel
|
ea0f75a315
|
Bugfix: It was impossible to add groups.
|
2014-08-30 02:08:33 +02:00 |
|
Michael Vogel
|
4d3e3eb4d1
|
Bugfix: connecting with other users now works again.
|
2014-08-28 01:15:40 +02:00 |
|
Michael Vogel
|
316f0a75cd
|
Showing the network name on the display page.
|
2014-08-25 16:17:49 +02:00 |
|
Michael Vogel
|
dd511ac70a
|
The "display" page now shows the current author profile with a "connect" link (if there is no current connection)
|
2014-08-25 14:09:56 +02:00 |
|
Michael Vogel
|
d23d26f44d
|
Reduced options when adding a friendica contact and an address was provided via URL parameter.
|
2014-08-21 00:56:21 +02:00 |
|
Michael Vogel
|
de75d8ca7f
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
mod/admin.php
|
2014-08-13 00:18:05 +02:00 |
|
Michael Vogel
|
d4b2d3bf8a
|
Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in the page settings.
|
2014-08-13 00:13:13 +02:00 |
|
|
|
016b6428a0
|
Merge pull request #1067 from Beanow/feature/noscrape
Added noscrape feature.
|
2014-08-10 13:24:21 +02:00 |
|
Beanow
|
9026810496
|
Added noscrape feature.
|
2014-08-10 12:45:34 +02:00 |
|
Michael Vogel
|
1a865bf400
|
New description for the option to reload the page only when on top.
|
2014-08-01 20:11:56 +02:00 |
|
Michael Vogel
|
c980e6d20d
|
Possibility to disable the automatic reload of the network page
|
2014-07-09 21:32:32 +02:00 |
|
Michael Vogel
|
297d8a6cc6
|
The icon for the website is now changeable in the config
|
2014-06-17 20:11:35 +02:00 |
|
Michael Vogel
|
13fea42d8c
|
Merge remote-tracking branch 'upstream/master'
|
2014-05-29 23:04:57 +02:00 |
|
Michael Vogel
|
00b8355ad5
|
The number of comments per post are now editable.
|
2014-05-29 22:26:03 +02:00 |
|
Michael Vogel
|
b0df06dd72
|
Vier: When clicking on the reply button, the focus now automatically changes to the textarea.
|
2014-05-29 20:27:06 +02:00 |
|
fabrixxm
|
77a54c66be
|
Merge pull request #998 from annando/master
"Vier": New font version, fallback for oembed, more tracking variables removed
|
2014-05-29 14:04:04 +02:00 |
|
Michael Vogel
|
0eafed3353
|
Vier: New "font awesome" version, changed "reply" button, comment area is now hidden until the first reply came. (Saves space)
|
2014-05-29 11:51:13 +02:00 |
|
|
|
1388b7ac27
|
Merge pull request #984 from annando/master
Better look for embedded videos, removing tracking parameters, new shortening function
|
2014-05-19 08:05:16 +02:00 |
|
Michael Vogel
|
665139660a
|
Make embedded videos look better. (better margin data)
|
2014-05-18 20:30:27 +02:00 |
|
|
|
31312ab1d2
|
Merge pull request #956 from annando/master
New database system that uses PDO if present/Test script for doing database upgrades.
|
2014-05-09 21:55:01 +02:00 |
|
Sven Anders
|
0dac5bf804
|
Make uimport URL work for Sites with subfolder
BUGFIX: If you have a site like http://exmaple.com/friendica you will get a wrong url
|
2014-05-06 14:15:15 +02:00 |
|
Michael Vogel
|
c27bd7d0b4
|
The pagetypes are rearrange to make the differences better understandable.
|
2014-05-03 12:10:38 +02:00 |
|
Michael Vogel
|
4ca857e110
|
Empty template to avoid errors when installing themes.
|
2014-04-29 13:33:39 +02:00 |
|
Fabrixxm
|
aba27ad404
|
fix photo comments: use $drop array as in wall_thread and search_item
|
2014-04-28 09:29:48 -04:00 |
|
|
|
c1d14bcc98
|
Merge pull request #944 from annando/master
Some more frontend stuff/Native Diaspora reshare
|
2014-04-26 09:13:17 +02:00 |
|
Michael Vogel
|
2846dfeb05
|
Ther eis now a user setting to disabled notices. The Diaspora reshare now checks for empty values.
|
2014-04-26 02:22:30 +02:00 |
|
Michael Vogel
|
79da821c75
|
Added template for Diaspora reshare
|
2014-04-26 01:33:33 +02:00 |
|
Michael Vogel
|
1227d071d1
|
The preview button is now a button. This is more consistent
|
2014-04-24 13:27:08 +02:00 |
|
Michael Vogel
|
ec1f07d5b7
|
Only show the preview button when it is activated/Menü arrangement changed for settings menu.
|
2014-04-24 12:39:27 +02:00 |
|
Michael Vogel
|
59c9a9adae
|
OAuth-settings: The "cancel" button generated an error message (and is superfluous), so it is removed
|
2014-04-24 12:18:51 +02:00 |
|
Michael Vogel
|
2e7549c945
|
Show preview of the correct theme, not the mobile theme.
|
2014-04-24 12:14:45 +02:00 |
|
fabrixxm
|
807fc60d3e
|
Merge pull request #941 from annando/master
Moved and renamed menu entries to improve the usability, global css, icons for social networks
|
2014-04-24 10:48:07 +02:00 |
|
Michael Vogel
|
b005423ebf
|
New layout for connector settings. New global CSS for things that seems to be identical in most themes.
|
2014-04-24 10:17:19 +02:00 |
|
fabrixxm
|
22c45b9bf1
|
Merge pull request #938 from annando/master
API: Don't show own posts in mentions, some "vier" changes and provider name for diaspora
|
2014-04-22 16:15:42 +02:00 |
|
Michael Vogel
|
9185321c8b
|
Diaspora-XML-Templates: Added provider name and some rearrangements to fit the exact order of the elements in diaspora (only for the beauty)
|
2014-04-22 01:01:21 +02:00 |
|
|
|
3bbe7a75ec
|
Merge pull request #911 from annando/master
target="_blank" and api improvements
|
2014-02-16 14:15:44 +01:00 |
|
Michael Vogel
|
01971428aa
|
target="_blank" instead of target="external-link"
|
2014-02-11 23:42:06 +01:00 |
|
|
|
2cc72a1bc7
|
removed copy and paste leftover
|
2014-01-13 14:49:49 +01:00 |
|
|
|
1e87780f5d
|
removed copy and paste leftover
|
2014-01-13 14:45:37 +01:00 |
|
|
|
b84502c4e6
|
move <div> to the register.tpl
|
2014-01-13 14:40:26 +01:00 |
|
Michael Vogel
|
8eedebfee3
|
Cleaning up some changes from the merge
|
2014-01-05 16:28:42 +01:00 |
|
Michael Vogel
|
aed28a24f1
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
mod/crepair.php
|
2014-01-05 16:22:42 +01:00 |
|
Michael Vogel
|
28df35052a
|
Send notifications for each new post of a contact, option for creating a summary for a feed post
|
2014-01-05 16:10:02 +01:00 |
|
fabrixxm
|
b0e8dbc4da
|
Merge pull request #864 from fabrixxm/acl_automention
Acl automention
|
2014-01-03 06:09:12 -08:00 |
|
fabrixxm
|
ad5a47aecf
|
add fetaure switch for acl-automention
|
2014-01-03 14:40:43 +01:00 |
|
|
|
25d83f780d
|
only show the remote_self option if admin allows it
|
2013-12-22 19:30:09 +01:00 |
|
|
|
f515def280
|
added remote_self as option to the contact repair dislog
|
2013-12-22 17:05:49 +01:00 |
|
|
|
22a6c72b31
|
added option to the admin panel to allow users to set the remote_self flag
|
2013-12-22 16:14:34 +01:00 |
|
Fabrixxm
|
9a94c35120
|
acl selector add and remove mentions when a forum is selected.
|
2013-12-18 10:18:26 -05:00 |
|
Fabrixxm
|
06e8f31695
|
change action container div class to id. fix bug in quattro theme
|
2013-12-18 06:38:57 -05:00 |
|
Fabrixxm
|
9febcedf93
|
user contacts: fix #797 , add searching in url and nickname, add batch actions
|
2013-12-17 05:19:06 -05:00 |
|
|
|
acd29f22a0
|
Merge pull request #842 from annando/master
mail settings: inflate/deflate settings
|
2013-12-01 02:26:36 -08:00 |
|
Michael Vogel
|
9c2b1d39ea
|
mail settings: inflate/deflate settings
|
2013-11-30 21:32:44 +01:00 |
|
|
|
d4c56b227d
|
add the hint also as a placeholder in the add contact form (issue #786)
|
2013-11-17 16:09:44 +01:00 |
|
Fabrixxm
|
0414e0a316
|
More "relocate":
button in user's setting to resend relocate message to contacts
option in admin's site setting to relocate a server
|
2013-11-13 06:07:49 -05:00 |
|
|
|
8faeee9965
|
added config->info and system-suppress_language options to the admin panel
|
2013-10-20 16:17:39 +02:00 |
|
Michael Vogel
|
e70b110984
|
Switching from "new share" to "old share"
|
2013-10-15 00:49:49 +02:00 |
|
Michael Vogel
|
693b6d0fd4
|
Infinite scroll: At the end of the network page new content is loaded automatically
|
2013-10-15 00:43:11 +02:00 |
|
Silke Meyer
|
9152198927
|
Added link to import a profile im register tpl
|
2013-09-04 20:51:04 +02:00 |
|
Zered
|
82972be85e
|
Adding a "User waiting for permanent deletion" table in admin page
|
2013-08-05 06:08:33 +02:00 |
|
|
|
0972189372
|
allow admins to add a new user from the admin panel (eventually fixing oldbug #383)
|
2013-07-21 08:46:57 +02:00 |
|
Fabrixxm
|
c82e5fde0a
|
pagination: fix template
|
2013-06-17 04:28:34 -04:00 |
|
Fabrixxm
|
faa510befc
|
move html from paginate functions to template
|
2013-06-13 08:12:15 -04:00 |
|
Zach Prezkuta
|
127b7a589e
|
eliminate Cropper conflicts with jQuery
|
2013-06-01 10:42:51 -06:00 |
|
Zach Prezkuta
|
db0a891a97
|
fix preloading
|
2013-05-11 12:40:09 -06:00 |
|
Zach Prezkuta
|
35358baac9
|
update to v4.0.0; point to local host of SWF
|
2013-05-11 10:55:09 -06:00 |
|
Zach Prezkuta
|
fec4581f34
|
basic video playback support using VideoJS
|
2013-05-03 18:17:56 -06:00 |
|
friendica
|
115c8a53bf
|
issue546 via Tobias
|
2013-04-23 18:58:52 -07:00 |
|
Fabrixxm
|
379c761c3f
|
missing "templates" folders
|
2013-04-23 07:47:57 -04:00 |
|
