1
0
Fork 0
Commit graph

3842 commits

Author SHA1 Message Date
18e8d0de59 Merge pull request #1932 from annando/1510-vier-2
Small optical changes in "vier"
2015-10-04 17:01:25 +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
d0ae5ce326 Show more information when following a new contact 2015-10-04 14:41:39 +02:00
Michael Vogel
1d71dde7ef Beautyfied code. Link to "follow" on community profiles 2015-10-04 14:40:02 +02:00
Michael Vogel
3b18c6cb0c Small optical changes in "vier" 2015-10-04 12:24:00 +02:00
01d38a353c DE update to the translation 2015-10-04 09:23:58 +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
Michael Vogel
42ad8c2b25 New template for http status messages 2015-10-03 23:19:09 +02:00
Michael Vogel
3ae0deadb6 The right side now contains much stuff from diabook - but completely reworked. 2015-10-03 12:55:55 +02:00
Michael Vogel
47c855388e Vier: Menu at the right side (inspired and copyied from diabook) 2015-10-01 08:19:35 +02:00
d6beb7db1f add a header to seperate the beginning of week settings 2015-10-01 06:19:57 +02:00
Michael Vogel
5fe357ee75 Rearrange the navigation bar on smaller windows 2015-09-30 21:59:55 +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
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
Michael Vogel
6e981ed798 Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events 2015-09-29 10:35:50 +02:00
Michael Vogel
c33957a6e9 Internationalisation of events/Move events to the navigation bar 2015-09-27 14:00:15 +02:00
28df4b2cd0 PL update to the strings 2015-09-24 22:09:39 +02:00
Michael Vogel
25fc2c9799 Some changes to stay compatible to Diaspora 2015-09-19 14:00:33 +02:00
976a2be1f7 Merge pull request #1892 from annando/1509-vier-attachements
Now attachments of the type "application" are displayed as well.
2015-09-18 21:11:57 +02:00
Michael Vogel
6be65f4eae Now attachments of the type "application" are displayed as well. 2015-09-18 21:09:31 +02:00
dbc9d87156 DE update to the strings 2015-09-17 14:24:07 +02:00
Michael Vogel
5ac38b7f99 There is now only one central parameter for the global directory. 2015-09-15 22:29:02 +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
c6d9b2da23 New setting for requery days 2015-09-05 10:54:39 +02:00
4db21f85c4 DE, ES, IT: update to the translations 2015-09-01 15:12:09 +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
Michael Vogel
56ae056f1d The "manage" option list is now larger. 2015-08-30 22:45:48 +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
9aa1e22047 CS update to the strings 2015-08-30 07:24:39 +02:00
Michael Vogel
31fffcf281 Accidentally removed a file 2015-08-29 17:09:25 +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
Michael Vogel
319df2ed66 The menu bar isn't clickable anymore 2015-08-28 11:36:43 +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
7da830c9f6 DE update to the strings 2015-08-26 16:40:31 +02:00
Michael Vogel
6942b16ef5 See issue 1855. OOhembed is removed. 2015-08-25 19:50:23 +02:00
Michael Vogel
b1dddd2936 Only offer forum search in local mode. 2015-08-25 05:54:50 +02:00
Michael Vogel
d1647222d3 Vier: The "register" page now looks better. 2015-08-24 19:03:03 +02:00
cc145f0e25 Merge pull request #1850 from tobiasd/20150824-de
DE updated translation
2015-08-24 14:27:13 +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
489e90281a DE updated translation 2015-08-24 14:21:22 +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
fc18123082 Merge pull request #1837 from fabrixxm/feature-1796
add support for oneline,in-text code tag
2015-08-23 17:27:45 +02:00
fabrixxm
2d75e1f422 add support for oneline,in-text code tag 2015-08-20 15:08:55 +02:00
fabrixxm
81d1dfc006 add 'reload active plugins' button in admin/plugins 2015-08-20 15:01:15 +02:00
Michael Vogel
e6b85c822d frost-mobile has now a link to the original post. See issue 1793 2015-08-18 20:30:01 +02:00
Michael Vogel
6ae34f4802 Merge pull request #1828 from tobiasd/20150816-fix1621
add the profile url to the settings pages as alternative to the webfi…
2015-08-17 21:51:03 +02:00
b67adebd9c DE update to the strings 2015-08-17 12:02:03 +02:00
621dec1606 reconstruct the description for more flexible translations 2015-08-17 07:20:50 +02:00
eea258f74c add the profile url to the settings pages as alternative to the webfinger. See issue 1621 2015-08-16 22:39:08 +02:00
Michael Vogel
c2a1cf958d The addon "statistics_json" becomes the system setting "nodeinfo" 2015-08-16 21:45:51 +02:00
4ca515ab33 Merge pull request #1823 from annando/issue-1348
The login form in the aside section should look now better
2015-08-15 07:19:05 +02:00
Michael Vogel
72c8fff909 Improved register link and open-id input. 2015-08-15 07:08:32 +02:00
Michael Vogel
efec7e973e This hopefully will solve issue 1348 2015-08-14 23:32:10 +02:00
bb4e339d8f DE update to the strings 2015-08-14 13:03:55 +02:00
Michael Vogel
887372a0d7 Bugfix: Conversations with Diaspora now work reliable 2015-08-13 22:49:57 +02:00
5013e5daf1 use to link to queue inspector 2015-08-12 19:58:53 +02:00
f439ac47c4 admin panel: inspect queue 2015-08-12 15:44:59 +02:00
6b93325f70 make Inspect Queue link visible in admin adide menu 2015-08-12 15:44:03 +02:00
9d0786531d Merge pull request #1810 from annando/issue-1739
Contact requests now contain more information.
2015-08-12 08:17:27 +02:00
Michael Vogel
a0f69dc92c Contact requests now contain more information. 2015-08-12 08:07:21 +02:00
Michael Vogel
e1088210a6 CSS improved 2015-08-11 22:47:37 +02:00
6cfe7b698e Merge pull request #1803 from annando/1508-accessibility
Improved accessibility
2015-08-10 08:48:48 +02:00
Michael Vogel
ea14f7e716 Duepontozero now has accesskeys as well. 2015-08-09 12:19:15 +02:00
Michael Vogel
d500ea4324 Some more accesskeys for Quattro 2015-08-09 09:55:51 +02:00
Michael Vogel
d65d74d460 Added the changes in quattro as well 2015-08-09 09:28:10 +02:00
Michael Vogel
811e4b6ba1 Documentation for accesskeys added 2015-08-09 09:16:45 +02:00
Michael Vogel
ccaeb00973 Better link descriptions. 2015-08-08 22:30:43 +02:00
Michael Vogel
b4d09777b9 Added many accesskeys ... 2015-08-08 17:33:43 +02:00
Michael Vogel
a8a21da6f5 Some steps for a better screen reader compatibility 2015-08-06 08:13:15 +02:00
26ec1fbf34 FR: update to the translations 2015-08-05 07:11:39 +02:00
43b2e69421 DE: update of the translation 2015-08-04 08:06:49 +02:00
cd8be48ca7 Merge pull request #1791 from annando/1507-new-poco
Improved Local Directory
2015-08-02 10:31:34 +02:00
rabuzarus
bef827f1cc small fixes for filebrowser 2015-08-01 21:20:13 +02:00
Fabrixxm
b7aa259c67 hide buglink 2015-07-30 14:19:50 +02:00
Fabrixxm
f5657e283c fix folder links in filebrowser dialog 2015-07-29 11:55:26 +02:00
Fabrixxm
52f9465578 filebrowser fixs, use it in comment textareas
move filebrowser js to single file
document filebrowser usage
replace "onclick" for comment style buttons with data-* and move logic to main.js
use filebrowser to insert images in comments
2015-07-29 11:30:04 +02:00
Fabrixxm
70b7de39a7 Upload/Browse popup for files and images
Jot buttons to upload images and files show a popup, where the
user can select a previously uploaded item o upload a new one
2015-07-28 17:20:40 +02:00
Michael Vogel
9717fa82fe New field "created" in gcontacts. New option for timeframe when polling global contacts 2015-07-21 00:05:44 +02:00
Michael Vogel
f3c83fb514 Automatically updating the searched contacts while searching it. 2015-07-19 18:02:24 +02:00
Michael Vogel
0bede65a6b Use local search 2015-07-19 13:23:01 +02:00
8bfbb935c7 add missing icons to quattros event view 2015-07-19 10:56:40 +02:00
Michael Vogel
2a5fb7b175 Option to discover contacts from remote users (fallback option) 2015-07-19 09:41:36 +02:00
Michael Vogel
a0734ceede Merge remote-tracking branch 'upstream/develop' into 1507-new-poco 2015-07-18 22:37:39 +02:00
Michael Vogel
cf3214c904 Query other servers periodically for their known contacts 2015-07-18 22:26:06 +02:00
9bb805f3dc show profile url in contact-edit overview listing 2015-07-18 10:57:31 +02:00
Michael Vogel
f1e7369283 Poco: Option to activate and deactivate detection of last activity. 2015-07-18 00:48:42 +02:00
bbd2e4abc1 make the 'noshare' checkbox checked by default for photo upload 2015-07-17 17:05:55 +02:00
ba790def22 NL update to the strings 2015-07-14 16:31:45 +02:00
9e138a42f2 Merge pull request #1758 from annando/1507-salmon
OStatus Salmon improvements (Follow, Unfollow works)
2015-07-14 16:24:54 +02:00
Michael Vogel
9ebaa45670 Removed unused template 2015-07-13 23:56:45 +02:00
a54dd8a9db DE: update to the strings 2015-07-13 08:14:00 +02:00
1efda90498 Merge pull request #1755 from annando/1507-template-update
Vier: Some template updates
2015-07-12 21:08:11 +02:00
Michael Vogel
5f86d3d325 removed the picture width, since it is already in the style sheet. 2015-07-12 20:31:49 +02:00
Michael Vogel
6a646d68c5 Updated templates for "vier" (See issue 1733) 2015-07-12 20:27:54 +02:00
Michael Vogel
e22ce8403e Merge pull request #1752 from tobiasd/20150712-issue1747
issue 1747
2015-07-12 18:12:19 +02:00
rabuzarus
2c39387e44 fix for saving searches 2015-07-12 17:43:50 +02:00
d920cf25b0 dont use an empty li, but make a new list for visual separation 2015-07-12 16:16:54 +02:00
Michael Vogel
bc6e5a4f2d Merge remote-tracking branch 'upstream/develop' into 1507-diaspora-contact-links 2015-07-06 17:35:48 +02:00
Fabrixxm
95945ecae6 Merge branch 'master' into develop 2015-07-06 16:56:49 +02:00
Michael Vogel
c356da2cad Diaspora: Improved parsing of linefeeds 2015-07-05 02:33:28 +02:00
3349bba665 Merge pull request #1722 from annando/1506-password-on-install
Ability to enter a password when the first user is created
2015-07-01 07:53:25 +02:00
Michael Vogel
055ee962c9 Ability to enter a password when the first user is created 2015-06-30 23:37:31 +02:00
rabuzarus
cf2a90dfa2 system settings is now a variable in settings_display.tpl 2015-06-30 14:51:14 +02:00
b8f99f459b DE update to the strings 2015-06-30 09:45:05 +02:00
d4fa6ccfe8 IT update to the strings 2015-06-30 09:44:53 +02:00
fabrixxm
5a23bd400c Merge pull request #1715 from rabuzarus/theme_uid
use local theme settings for visitors
2015-06-30 08:41:07 +02:00
rabuzarus
36abf624d8 make supported themes compatible with get_theme_uid 2015-06-29 23:03:44 +02:00
fabrixxm
28f0e9a2de Merge pull request #1696 from rabuzarus/acl-var
move jotnets to populate_acl
2015-06-29 13:53:37 +02:00
Michael Vogel
b9c42c37d1 Vier: Colors for notifications changed 2015-06-29 08:00:52 +02:00
Michael Vogel
b795bf2935 Merge pull request #1683 from fabrixxm/issue-1655
Deprecate RINO1 function, implements RINO2, remove unused crypro functions
2015-06-27 17:39:00 +02:00
rabuzarus
8cca849c2e Merge acl-var into develop
Conflicts:
	mod/settings.php
2015-06-27 15:23:19 +02:00
rabuzarus
d8c0c62331 work on supported themes to use new acl 2015-06-26 15:44:32 +02:00
Michael Vogel
6eebfb2e13 Merge pull request #1692 from fabrixxm/desktopnotifications
Desktop notifications
2015-06-26 08:45:16 +02:00
rabuzarus
37501a883e make notes work 2015-06-25 22:57:26 +02:00
rabuzarus
94b21245bc some more work to get acl data into populate_acl 2015-06-25 18:57:42 +02:00
fabrixxm
d2a593b4a0 Merge pull request #1693 from rabuzarus/events-reminder
use title in events-reminder
2015-06-25 15:06:55 +02:00
rabuzarus
d23440af15 use colorbox to display upcomming events 2015-06-25 13:43:41 +02:00
Fabrixxm
6fc864c947 rework mod/ping and desktop notification logic
`mod/ping.php` returns all notifications ordered by date
mixing system notifications, private messages, intros, registrations
remove 'notify_full' mode
remove `&arr;` from unseen notes, 'seen' attrib now is "1" or "0"
new note attribute 'timestamp'
desktop notification logic use timestamp to check which notification show to the user
notification html template use timestamp to show full date to user in tooltip
`relative_date()` don't append full date on dates older than 24 hours
2015-06-25 10:02:26 +02:00
Michael Vogel
0bac4722cb Vier: Just another thread improvment 2015-06-24 21:49:51 +02:00
Fabrixxm
e29d05ce4a notifications order, unseen css class
ping return notfications ordered by notification id
notifications list get seen/unseen class from ping xml
global.css define 'notify-unseen'
2015-06-24 16:10:06 +02:00
Michael Vogel
3841c41186 Improved width for nested comments. 2015-06-24 14:20:08 +02:00
Fabrixxm
cc9da2512b move field help text css to global.css 2015-06-24 10:11:11 +02:00
Fabrixxm
4036ad2554 Fix desktop notification
use on/off field for enable/disable desktop notification
show only new notifications after enable
use localstorage to save enabled/disalbed and last notification id
hide settings on browsers without desktop notification
2015-06-24 09:49:53 +02:00
Fabrixxm
511c2d2c91 rino: settings in admin, choose lowest common on notify 2015-06-23 17:36:26 +02:00
Fabrixxm
a3cd16bd9f remove localized htconfig templates 2015-06-23 12:35:51 +02:00
Fabrixxm
d06beb1431 install: load htconfig template from templates/ 2015-06-23 12:35:51 +02:00
5549dd1dbe Merge pull request #1682 from fabrixxm/issue-1625
admin: allow deletion of any users but yourself
2015-06-23 11:05:16 +02:00
Fabrixxm
3168b44317 admin: allow deletion of any users but yourself
fix #1625
2015-06-23 10:39:28 +02:00
Fabrixxm
53e6dd6637 Add contact detail to contact drop confirm
fix #1629
2015-06-23 10:09:27 +02:00
fabrixxm
35e9fc3b02 use fields template in photo edit form 2015-06-22 20:07:19 +02:00
Michael Vogel
bc42b6440a Vier: Improved threading 2015-06-21 20:40:39 +02:00
Michael Vogel
66058c6cf4 Remote subscribe from a GNU Social site is now possible 2015-06-13 19:51:45 +02:00
rabuzarus
c01dbc274c fix remote-link button in vier 2015-06-11 02:49:09 +02:00
Michael Vogel
a2ae4ccc9b Merge pull request #1636 from rabuzarus/albums_widget
make use of global.css
2015-05-31 18:04:40 +02:00
rabuzarus
afd1e0e6d0 make use of global.css 2015-05-31 13:55:21 +02:00
fabrixxm
1cf3e778e8 Merge pull request #1622 from rabuzarus/albums_widget
move html to photo_albums.tpl
2015-05-31 10:07:43 +02:00
Michael Vogel
2550e02399 Merge pull request #1627 from rabuzarus/section-title
move html of h2 headings to section_title.tpl
2015-05-31 09:52:46 +02:00
Michael Vogel
b778467121 Merge pull request #1620 from tobiasd/20150529-de
DE update to the strings
2015-05-31 01:05:11 +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
ffefc512d3 DE update to the strings 2015-05-29 08:46:40 +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
bfcd3bbc9e CS update to the strings 2015-05-27 09:58:20 +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
8990a22dc0 duepuntozer: style video delete button 2015-05-24 10:35:55 +02:00
fabrixxm
d204e2524b vier: style video delete button 2015-05-24 10:34:17 +02:00
fabrixxm
646ea377ac quattro: readd video delete button styles
because i'm not so good at resolving merge conflicts...
2015-05-24 10:28:15 +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
fabrixxm
dd9f4439ce update IT 2015-05-23 20:08:57 +02:00
rabuzarus
5e6c140fc1 add double click on calendar day for frost theme 2015-05-23 20:02:57 +02:00
rabuzarus
6731ffbfc8 event preview for frost theme 2015-05-23 19:23:32 +02:00
rabuzarus
3504b3b94f make frost + frost-mobile work with datepicker 2015-05-23 18:49:56 +02:00
rabuzarus
76283ff205 cleanup quattro less file 2015-05-23 17:50:18 +02:00
rabuzarus
9c803f7dbb quattro css changes added to the less file 2015-05-23 17:45:44 +02:00
Michael Vogel
41d5e89f50 Merge pull request #1592 from tobiasd/20150522-de
DE update to the strings
2015-05-23 09:21:05 +02:00
rabuzarus
2ad8fdc40b port of red matrix datepicker implementation 2015-05-22 18:53:18 +02:00
a9fa049659 DE update to the strings 2015-05-22 16:58:16 +02:00
0f0e570aa0 NL update to the strings 2015-05-21 19:03:28 +02:00
fabrixxm
dbafc917c2 update IT 2015-05-21 10:54:03 +02:00
fabrixxm
8bbffe0a54 update IT 2015-05-21 10:50:29 +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
d4cb18538e PT-BR: update to the strings 2015-05-16 07:41:40 +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
b5e10329f2 The oembed iframe now has a class name to use it for stylesheets. 2015-04-30 06:12:21 +02:00
e9dd3b38f3 DE update to the strings 2015-04-25 11:18:30 +02:00
14d61b5644 FR update of the strings 2015-04-14 13:41:56 +02:00
60a17ef88e CS update of the strings 2015-04-14 13:40:24 +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
26eceaacbe Merge remote-tracking branch 'upstream/develop' into 1504-unified-follow 2015-04-09 19:49:57 +02:00
Michael Vogel
f6ea872986 The behaviour when following a new contact is now unified. 2015-04-09 00:10:21 +02:00
4ad52a417a DE update to the strings 2015-04-08 12:06:05 +02:00
Michael Vogel
3195157b2e Merge pull request #1499 from tobiasd/20150407_lng
CS, FR update to the strings
2015-04-07 19:08:30 +02:00
Johannes Schwab
107b495183 fix infinite scrolling with frost-mobile 2015-04-07 13:26:09 +02:00
7ecc401b5c FR update of the strings 2015-04-07 09:07:04 +02:00
52549dae7b CS update to the strings 2015-04-07 09:00:12 +02:00
106b0b5d23 Merge pull request #1460 from FlxAlbroscheit/develop
Issue 1163: Feature allowing desktop-notifications
2015-04-05 11:37:05 +02:00
415960a31a DE update to the strings 2015-04-02 21:34:59 +02:00
33952e5f1d DE update to the strings 2015-04-02 18:23:27 +02:00
FlxAlbroscheit
f054dbfc8d Feature for desktop-notifications 2015-03-31 02:11:46 +02:00
0309c481a3 updating the core translation 2015-03-30 09:21:01 +02:00
dd21750d90 Merge pull request #1428 from FlxAlbroscheit/develop
Access a contact directly from the contact-manager-page
2015-03-12 07:13:31 +01:00
FlxAlbroscheit
82359bb6cc Give access to contact's profile-URL 2015-03-10 22:47:38 +01:00
Michael Vogel
2eba5a32df New screenshot for "vier". 2015-03-09 23:21:40 +01:00
Michael Vogel
08696acb18 Merge remote-tracking branch 'upstream/develop' into 1503-faster-tags 2015-03-08 03:23:49 +01:00
Michael Vogel
67d39770ed Improved the margins of the headers 2015-03-07 21:12:18 +01:00
96a5257d9c RO: update to the strings 2015-03-05 22:48:50 +01:00
Michael Vogel
52e33d50ad Changing header sizes and changing the header type of oembed data. 2015-03-01 21:58:31 +01:00
Michael Vogel
da49814cbb Use a header element for the oembed data. 2015-03-01 21:24:10 +01:00
Michael Vogel
bf0f7c3d0a New bbcode elements h1 to h6 for a better conversion of Diaspora content 2015-03-01 20:07:56 +01:00
fabrixxm
eb1f21d1e5 Merge pull request #1412 from annando/1502-vier-plus-default
"plus" is now the default style at "vier" for new installations
2015-02-23 08:51:31 +01:00
Michael Vogel
f3cc065e66 Show the profile visibility only for Friendica contacts. 2015-02-21 20:03:02 +01:00
Michael Vogel
19af382ffb "plus" is now the default style at "vier" for new installations 2015-02-21 09:44:13 +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
7e42315d9c Merge pull request #1408 from tobiasd/issue885
decreasing bubble display time in themes from 10s to 5s
2015-02-19 23:02:55 +01:00
985d771b13 decreasing bubble display time in themes from 10s to 5s 2015-02-19 21:24:09 +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
9f4523dc9a fix infinite scrolling with frost 2015-02-13 01:21:57 +01:00
Johannes Schwab
12d7ca9b84 improved infinite scrollling 2015-02-13 00:40:59 +01:00
e3b6770ad4 CS, ZH-CN: update to the strings 2015-02-12 07:59:21 +01:00
400e11fd9f ZH-CN update to the strings 2015-02-10 07:47:26 +01:00
4e4702fb8b CS, IT: update to the strings 2015-02-09 19:53:35 +01:00
Fabrixxm
f4f0f2bbc7 update IT strings 2015-02-09 11:55:14 +01:00
93cb464d79 DE update to the strings 2015-02-09 11:19:56 +01:00
Michael Vogel
21c63e8b65 Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape 2015-02-09 10:16:48 +01:00
18cfb5e726 Merge pull request #1377 from tobiasd/20150209cs
CS update to the strings
2015-02-09 08:45:48 +01:00
898d4b2a62 CS update to the strings 2015-02-09 07:57:03 +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
1418d6bc27 Merge pull request #1373 from annando/1502-bugfix-admin-aside
Bad HTML in the admin side menu for webfinger and probe
2015-02-08 12:47:46 +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
cea445de2e FR update for the strings 2015-02-08 10:44:47 +01:00
5aba3abfc1 CS DE FR: update to the strings 2015-02-05 11:06:23 +01:00
485432e734 FR: some more updates to the strings 2015-02-04 11:54:13 +01:00
14dec94d33 DE FR: update to the strings 2015-02-04 11:41:06 +01:00
Michael Vogel
f5ec5a4349 Some diabook features can dramatically slow down the system. There is a new switch to disable this. 2015-02-03 19:59:47 +01:00
09b90244c3 Merge pull request #1344 from annando/1502-new-vier-version
New version for "Vier"
2015-02-02 21:50:54 +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
Michael Vogel
dbe52c74b5 Added Beanow as author, since he did most of the last changes. 2015-02-02 21:03:14 +01:00
Michael Vogel
9f0e19762e New version for "Vier". The navigation was restructured and several other stuff was changed as well, thanks to Beanow! 2015-02-02 21:00:32 +01:00
8a17c3d348 added diagnostics tools to the admin side panel 2015-02-02 18:26:38 +01:00
Michael Vogel
1fb79a1a59 Merge pull request #1333 from tobiasd/20150131_ptbr
PT-BR: update to the strings
2015-02-01 16:40:24 +01:00
Silke Meyer
c90e47556a added setting for server's sender email address 2015-01-31 15:54:12 +01:00
ac86aa5822 PT-BR: update to the strings 2015-01-31 08:42:36 +01:00
fabrixxm
147413507b Merge pull request #1320 from tobiasd/20150127adminpanel
add links to the plugin config pages for active plugins
2015-01-28 08:24:29 +01:00
3df7370fa8 add links to the plugin config pages for active plugins 2015-01-27 14:34:11 +01:00
Michael Vogel
6a34210353 Merge remote-tracking branch 'upstream/develop' into 1501-better-contact-list 2015-01-27 10:20:00 +01:00
Michael Vogel
848c09935a The contact list in mails now contains not only the name but also the address. 2015-01-27 08:04:24 +01:00
fabrixxm
44df625bad Merge pull request #1305 from tobiasd/20150123-quaddro
making the ignore button in contact suggestions visible in quattro
2015-01-25 11:59:17 +01:00
fabrixxm
174d78c768 Merge pull request #1317 from tobiasd/20150125cs
CS update to the strings
2015-01-25 11:55:22 +01:00
fc62c329c5 Merge pull request #1316 from annando/issue-1197
Issue 1197: New hook for "oembed_fetch_url"
2015-01-25 08:23:52 +01:00
5cb3a0fced CS update to the strings 2015-01-25 08:21:55 +01:00
Michael Vogel
cb9196f6d6 Issue 1197: New hook for "oembed_fetch_url" 2015-01-25 00:58:51 +01:00
a33ca89bb7 adding missing styling to the ignore button in quattro 2015-01-24 07:22:55 +01:00
c5b8956730 FR update to the strings 2015-01-24 07:05:55 +01:00
619f2a86f3 DE update to the strings 2015-01-24 07:05:42 +01:00
d3bb944700 making the ignore button in contact suggestions visible in quattro 2015-01-23 09:51:24 +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
a21fe4059b Merge pull request #1285 from annando/1501-enhanced-poco
"location" and "about" for contacts, improved suggestions, improved contacts exchange
2015-01-09 08:37:05 +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
b0ffe11b21 add thread un/ignore functionality to quattro theme 2015-01-05 09:05:27 +01:00
882f9c83d6 FR update to the strings 2015-01-02 08:26:08 +01:00
32400f5127 FR IT update to the strings 2014-12-31 12:41:00 +01:00
e24f97de43 FR update to the strings 2014-12-30 09:04:35 +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
dcd78603d3 Merge pull request #1243 from tobiasd/20141212
RO and FR: update to the core strings
2014-12-14 07:56:18 +01:00
Michael Vogel
8b433c2d11 Vier: New style "dark" 2014-12-13 23:13:34 +01:00
f02435408c RO and FR: update to the core strings 2014-12-12 19:01:08 +01:00
Silke Meyer
f493252ac8 Use a sans-serif font-family in breathe 2014-12-06 20:05:30 +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
Fabrixxm
295b4d7f61 Update develop from 'master' 2014-10-16 10:47:40 +02:00
56cd536652 use noscrape by default, add opt-out option to disable it 2014-10-13 19:19:54 +02:00
fabrixxm
6f92dd00d3 Merge pull request #1182 from tobiasd/20141009
RO: update to the strings
2014-10-13 15:01:42 +02:00
5c316fa541 RO: update to the strings 2014-10-09 17:59:27 +02:00
75f6f3d68b PT-BR: updating the strings 2014-10-07 18:34:43 +02:00
Fabrixxm
e2dc4f922c Friendica 'Ginger' 3.3 2014-10-06 08:56:55 +02:00
74be3ac543 updating core translations from transifex 2014-09-28 15:04:54 +02:00
fabrixxm
bd0b93e630 Merge pull request #1165 from annando/1409-issue-1157
Issue 1157: Unused javascript function is removed.
2014-09-27 19:03:20 +02:00
Michael Vogel
2bbd7ab67f Issue 1157: Unused javascript function is removed. 2014-09-27 14:17:50 +02:00
hauke
2743514791 bug fix #1135, show more is usable again 2014-09-22 13:53:16 +02:00
fabrixxm
f6cebf607f remove unneeded htconfig templates 2014-09-20 12:14:59 +02:00
fabrixxm
f6cfdf4af1 remove uneeded email templates 2014-09-20 12:10:24 +02:00
fabrixxm
d2afb263ae Set internal PuSH server as default 2014-09-20 12:08:10 +02:00
fabrixxm
6da5cf8037 fix residual curCSS, should fix #1153 2014-09-20 11:24:06 +02:00
Fabrixxm
133b5bca59 fix oembed video template 2014-09-17 11:02:58 +02:00
Fabrixxm
d1029e1fb2 tweak quattro theme 2014-09-17 10:59:19 +02:00
hauke
76535578ba bug fix: live function is deprecated 2014-09-15 19:48:17 +02:00
Michael Vogel
f9bec79a2c In the profiles the remote connect field was missing 2014-09-11 23:38:24 +02:00
fabrixxm
fd97f3013d fix quattro scroll and flash and vier flash on display page 2014-09-11 18:56:33 +02:00
fabrixxm
df1f9d5eb7 Update IT strings 2014-09-10 19:05:43 +02:00
2234f257b6 missed the settings template for duepunto 2014-09-07 18:02:58 +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
fabrixxm
b7bd29c347 Merge pull request #1124 from tobiasd/duepuntoderivs
added variations of duepuntozero to the theme as options to be selected
2014-09-07 15:04:26 +02:00
hauke
baabb5ba8b removed fancybox as it is not used anywhere 2014-09-07 14:54:10 +02:00
6415cc1a2c remove screenshot for greenzero 2014-09-07 14:31:46 +02:00
fabrixxm
21b1e09fad Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup 2014-09-07 14:28:03 +02:00
2c8ca3ec36 deleted some editicon.png copies 2014-09-07 14:23:24 +02:00
fabrixxm
a8c90155f8 db update mail via notification()
remove last template
2014-09-07 14:23:03 +02:00
a9782251e5 updating config files for duepuntozero 2014-09-07 14:00:09 +02:00
c72d850113 added slackr to duepuntoderivates 2014-09-07 13:57:51 +02:00
fabrixxm
5861bdd6e9 registration request as system notification
kill the template
send email to all admins
2014-09-07 13:55:02 +02:00
0989ad335f added purplezero to duepunto as variation 2014-09-07 13:41:02 +02:00
22d0190041 revive easterbunny from the dead 2014-09-07 13:29:56 +02:00
bbf22938ae added Comix as a colorset of duepuntozero 2014-09-07 13:09:02 +02:00
2802402e57 added darkzero as colorset of duepuntozero 2014-09-07 13:01:23 +02:00
f0aaafa7aa added Greenzero as colorset of duepuntozero 2014-09-07 12:48:23 +02:00
fabrixxm
735e6bbcb4 Merge pull request #1121 from Beanow/hotfix/bug-1105
Fix illegal offset error for vier and quattro.
2014-09-07 12:48:13 +02:00
fabrixxm
a5df9b8b5d Somebody stop me! (not really..) 2014-09-07 12:35:08 +02:00
fabrixxm
5997fb19ee More template gore! 2014-09-07 12:29:13 +02:00
fabrixxm
803854738b another massacre of templates 2014-09-07 11:48:23 +02:00
Beanow
8345ac7313 Fix illegal offset error for vier and quattro.
Fixes #1105
2014-09-07 11:47:08 +02:00
fabrixxm
cab46e2772 Merge pull request #1120 from silke/deprecated-themes
Deprecated themes
2014-09-07 11:42:04 +02:00
fabrixxm
a58e990cfc Merge pull request #1118 from tugelbend/master
bug fix #1115: settings were hidden on "social network" and "plugin" page
2014-09-07 11:37:55 +02:00
fabrixxm
9368c7e510 html mail template add img tag only if source_photo is defined 2014-09-07 11:20:56 +02:00
fabrixxm
9a0c37eb47 new password mail via notification()
new include/text.php::deindent() function
remove unused templates
2014-09-07 11:20:06 +02:00
Silke Meyer
12012be79d marked four more themes as unsupported 2014-09-07 11:00:58 +02:00
fabrixxm
d85bdd8fb0 lost password verification mail via notification() 2014-09-07 10:27:39 +02:00
Silke Meyer
d001ee5c65 Marked several themes from the zero theme as deprecated (all but
duepunto).
2014-09-07 10:26:45 +02:00
hauke
a162ea7251 bug fix #1115 2014-09-07 10:26:38 +02:00
Silke Meyer
a9b69b063c Marked several old themes as unsupported 2014-09-07 08:17:22 +02:00
hauke
2947be66b6 bug fix, wrong js lib included 2014-09-06 19:14:58 +02:00
fabrixxm
0e628f840f send ostatus follow/share notifications via notification()
remove unused templates
2014-09-06 18:15:18 +02:00
hauke
392b53dbf9 minified js files where out of date and inconsistently used. Removed until decision on minifying strategy 2014-09-06 17:46:31 +02:00
fabrixxm
1bdddebd44 connection confirm notification mail via notification()
remove unused email templates
add a check for unexpected reponse from server
2014-09-06 17:28:46 +02:00
hauke
5205756898 Merge branch 'release/ui-improvements' 2014-09-06 17:02:25 +02:00
hauke
7dcf37f053 changed cursor style on settings page globally 2014-09-06 17:01:05 +02:00
hauke
25d7087d9e Merge branch 'feature/2014-09-hackathon-ui-improvements' into develop 2014-09-06 16:55:07 +02:00
0e9c8f6f1a Merge pull request #1108 from tugelbend/master
jquery update to version 1.11
2014-09-06 16:35:24 +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
fabrixxm
83df1f4583 fix italian smarty3 email templates 2014-09-06 16:12:05 +02:00
267927d2dd Merge pull request #1106 from silke/frost-mobile-modifications
Frost mobile modifications
2014-09-06 14:52:12 +02:00
Silke Meyer
6369399b9f Shrink user icons in timeline to 48x48 2014-09-06 14:38:43 +02:00
Silke Meyer
b9b490057a different minor modifications 2014-09-06 14:25:36 +02:00
hauke
ec68e33c6b make items on settings pages fold/unfold on click 2014-09-06 13:53:23 +02:00
Silke Meyer
3290f6b360 Reduced height of navbar 2014-09-06 12:20:55 +02:00
4aa2ae488b Merge pull request #1102 from tobiasd/newstrings20140906a
updating message.po and string.php
2014-09-06 12:20:42 +02:00
97a8a7b362 ZH-CN: update to the strings 2014-09-06 12:13:04 +02:00
d0b1f0f5ba RO: update to the strings 2014-09-06 12:12:38 +02:00
dd65b06ecf PT-BR: update to the strings 2014-09-06 12:12:19 +02:00
4571670e4f PL: update to the strings 2014-09-06 12:11:59 +02:00
b948dca729 NL: update to the strings 2014-09-06 12:11:44 +02:00
c0e9e1849a NB-NO: update to the strings 2014-09-06 12:11:00 +02:00
70031d8d3e IT: update to the strings 2014-09-06 12:10:36 +02:00
414451cdad IS: update to the strings 2014-09-06 12:09:08 +02:00
57f3ccc967 RU: update to the strings 2014-09-06 12:08:48 +02:00
cb0a2b3d35 FR: update to the strings 2014-09-06 12:08:20 +02:00
ebbaedb97d ES: update to the strings 2014-09-06 12:08:02 +02:00
d283ed4f51 EO: update to the strings 2014-09-06 12:07:45 +02:00
6ddfaaae82 DE: update to the strings 2014-09-06 12:07:13 +02:00
e982697e17 CA: update to the strings 2014-09-06 12:05:44 +02:00
582b90613b CS: update to the strings 2014-09-06 12:05:25 +02:00
fe8a5a93b4 BG: update to the strings 2014-09-06 12:04: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
0e2376b457 Updated font awesome to new version 2014-09-04 01:01:39 +02:00
Michael Vogel
7eeb320085 It is now possible to ignore threads. 2014-09-04 00:58:52 +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
c5cc99c716 BBCode: Depending upon the image size of the preview picture for a link, the image is displayed differently 2014-08-25 14:08:26 +02:00
Michael Vogel
33b612a920 Bugfix: There was a JS error that prevented the work of the comment buttons 2014-08-25 14:07:11 +02:00
Michael Vogel
94d2557077 Vier: Some more design changes to "plus" style. 2014-08-21 01:00: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
271a184e1e proxy: Added support for long addresses. "vier": New style "Plus" 2014-08-16 01:40:38 +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