Commit graph

5068 commits

Author SHA1 Message Date
Hypolite Petovan
3579a14945 bbcode documentation: minor formatting changes 2016-11-03 21:01:09 -04:00
Hypolite Petovan
68bf1aa4cd bbcode documentation: fix anchors on frio 2016-11-02 22:41:07 -04:00
Hypolite Petovan
6626ef64a9 bbcode documentation: enable overline 2016-11-01 23:07:37 -04:00
Michael Vogel
75a996c4e4 Merge pull request #2839 from Hypolite/Issue-#2822
Issue #2822 - Fix [Embedded content - reload the page to view]
2016-10-25 07:31:20 +02:00
rabuzarus
3a7062af43 frio: line-break for event-owner names in event modals 2016-10-22 15:44:06 +02:00
Hypolite Petovan
71e93d9eb9 Remove debug and extra new lines 2016-10-21 14:24:43 -04:00
Hypolite Petovan
c340d590f7 Fix calendar strings escape
- Fix base event_head.tpl file
- Fix the rest of frio strings
2016-10-21 14:14:20 -04:00
Hypolite Petovan
3358b55433 [frio] Fix unescaped calendar Javascript strings
In French, “today” is “aujourd’hui”, which breaks the current calendar
Javascript strings quoted declaration.

This PR adds quote escaping to the i18n strings.
2016-10-21 11:29:23 -04:00
Hypolite Petovan
b0a0cf94e4 Fix Issue #2865 - reshared posts and additional text
😉
2016-10-20 21:41:17 -04:00
Michael Vogel
1218e2f885 Merge pull request #2863 from rabuzarus/0510-update_fullcalendar
frio: some improvements for displaying events
2016-10-18 00:37:45 +02:00
rabuzarus
b317f811e7 frio: better handling of event location in event hover cards 2016-10-17 22:58:30 +02:00
rabuzarus
967c3b3deb frio: events - don't show author name if there is no author name 2016-10-17 22:51:51 +02:00
rabuzarus
430ffb792e frio: stop the custom cal rendering (if no author-name exist) only for the modes agendaWeek and agendaDay 2016-10-17 22:14:12 +02:00
fabrixxm
b50769b6d0 Merge pull request #2859 from rabuzarus/0510-update_fullcalendar
quattro: fix events_reminder
2016-10-17 20:14:01 +02:00
rabuzarus
88f1affb2f quattro: fix events_reminder 2016-10-17 18:57:21 +02:00
Hypolite Petovan
5efab810f5 [frio] Fix code block display 2016-10-16 23:57:34 -04:00
rabuzarus
8064ff6ecb update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover 2016-10-16 16:04:53 +02:00
Hypolite Petovan
a843858654 Merge from develop 2016-10-08 13:45:14 -04:00
rabuzarus
88cef50aa2 frio: provide a edit profile button for the advanced profile page 2016-10-05 18:07:58 +02:00
rabuzarus
2a3e235f9a show/hide page-flags according to the account-type 2016-10-05 14:45:19 +02:00
Tobias Diekershoff
aab6ec0ede DE update to the translation 2016-10-04 07:59:35 +02:00
Hypolite Petovan
d9a5554543 Fix Issue #2822 - Add new setting to user settings page
- Convert formatting to PSR-2
- Add new bandwitdh saver setting
2016-10-02 15:25:10 -04:00
Hypolite Petovan
4021109696 Improve field_checkbox.tpl
- Adds a hidden field to ensure the checkbox item will have a value
during save.
- Fix quotes for HTML attribute values
2016-10-02 15:21:20 -04:00
rabuzarus
b59f8fe9e0 Merge pull request #2834 from Hypolite/Issue-#2800
Fix Issue #2800 - Prevent internal link from switching to Safari in standalone mode
2016-10-02 05:50:10 +02:00
Hypolite Petovan
0094dd8240 Remove repeated comment in frio notification template 2016-10-01 19:03:32 -04:00
Hypolite Petovan
4242c3f749 Fix Issue #2800 - Prevent internal link from switching to Safari in standalone mode
- Add link switch prevention to frio theme
- Add reference to the script page
2016-10-01 18:53:25 -04:00
Hypolite Petovan
f302f66dcd Fix Issue #2800 - Prevent internal links to switch to Safari in standalone mode
Add a event delegation to keep internal links inside the standalone
window.

Fixes 1. of #2800
2016-10-01 18:19:43 -04:00
rabuzarus
21b3037342 frio: improve readabillity for code blocks 2016-10-01 21:16:23 +02:00
Tobias Diekershoff
82dcc3fe79 Merge pull request #2821 from Hypolite/Issue-#2817
Fix #2817 - Move translation language folder in a subfolder of view
2016-10-01 10:58:32 +02:00
Hypolite Petovan
76b1b109e5 Fix Issue #2823 - Ugly scrollbars in oembed iframes and broken resizing
- Fix _resizeIframe function, shorten the timeout between calls
- Simplify the oembed iframe generation code and reduce the minimum
iframe height to 200px
- Add smooth CSS transition for iframe resizing
2016-09-30 23:26:22 -04:00
Hypolite Petovan
5a5284b94e Fix #2817
- Move translation folders under `view/lang`
2016-09-30 10:45:47 -04:00
Hypolite Petovan
f4c2e2244d Fix #2814
- [frio] Add a wrapping `a` tag around the notification text
- Add an event listener preventing popup menus to close when they are
themselves clicked
2016-09-29 23:46:43 -04:00
Hypolite Petovan
a05a425448 [frio] Capitalize Jot tabs title
- Revert translation term change for "permissions"
2016-09-28 21:09:03 -04:00
Hypolite Petovan
24969d79d8 [frio] Capitalize dropdown menu links 2016-09-28 20:59:54 -04:00
Hypolite Petovan
b99b0ad931 [frio] Capitalize a few terms for consistency
- Changed the translation term "permissions" because only frio is using
it
- Changed the vote links style because it is shared with other themes
2016-09-28 20:53:25 -04:00
Hypolite Petovan
34acfa1706 [frio] Fix whitespace style.css 2016-09-28 20:51:56 -04:00
rabuzarus
af3a672570 Merge pull request #2807 from Hypolite/frio-larger-view-develop
[frio] Changes to shared post display (width, base font size)
2016-09-28 20:32:11 +02:00
Hypolite Petovan
ed5e46892d Set block quote size to current text-size 2016-09-28 14:25:41 -04:00
Hypolite Petovan
7de64afc45 Fix abnormal font size for shared posts
- Use normal font size for shared content
2016-09-28 14:01:12 -04:00
Hypolite Petovan
f64bd451ca [frio] Increase available width for shared content
- Added a bottom margin to the shared header
- Removed padding and horizontal margins for the shared content
2016-09-28 13:08:58 -04:00
Hypolite Petovan
01a8671b66 Revert "[frio] Increase center column width"
This reverts commit 0c383ad9ff.
2016-09-28 12:58:44 -04:00
Hypolite Petovan
37b4b0205d [frio] Remove shared content horizontal margins 2016-09-28 11:59:54 -04:00
Hypolite Petovan
0c383ad9ff [frio] Increase center column width
- Added two Bootstrap divisions to the center column
2016-09-28 11:59:05 -04:00
Tobias Diekershoff
4aa834564a Merge pull request #2802 from annando/xmpp-profile
New fields for the DFRN protocol (XMPP and Account Type)
2016-09-27 20:57:56 +02:00
Michael Vogel
2f06e9360f "Company" is now "Organisation" and there is an auto update 2016-09-26 19:35:01 +00:00
Michael Vogel
d632d282cd We are now having an account type and are publishing it 2016-09-25 20:37:27 +00:00
Michael Vogel
196eb6009f The XMPP address is now in the profile and will be transmitted 2016-09-25 15:28:00 +00:00
Tobias Diekershoff
89b5c9276b DE update to the translation 2016-09-24 14:16:58 +02:00
Tobias Diekershoff
076475383b FR update to the strings, THX Hypolite Petovan 2016-09-24 09:35:23 +02:00
Michael Vogel
3f35fed35a Special characters should be escaped 2016-09-23 06:29:02 +00:00
Tobias Diekershoff
529d2fc74b DE update to the translation 2016-09-22 12:37:39 +02:00
Tobias Diekershoff
754dc02753 PT BR update to the strings 2016-09-21 11:44:01 +02:00
Tobias Diekershoff
e5c2c66487 Show the worker queue count if the workers are active 2016-09-20 15:45:55 +02:00
Roland Haeder
c825cc8d0d
This merge brings back dbm::is_result() where I could find it.
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-09-18 23:21:18 +02:00
Tobias Diekershoff
88285b4cbf The info is not that important 2016-09-14 06:45:05 +02:00
Tobias Diekershoff
f85821839b display current state of PHP logging in admin panel logging informations 2016-09-13 22:52:21 +02:00
fabrixxm
3d6e3cbb78 Merge branch 'master' into develop 2016-09-13 17:19:57 +02:00
Tobias Diekershoff
4eec289522 FR update to the strings, THX Damien Goutte-Gattat 2016-09-13 15:41:38 +02:00
Michael Vogel
4d959f2f9d Merge pull request #2771 from rabuzarus/0709-frio-dropItem-fix
frio: fix dropItem() didn't work for hubzila posts
2016-09-07 06:53:53 +02:00
rabuzarus
d506b0906c frio: fix dropItem() didn't work for hubzila posts 2016-09-07 03:22:02 +02:00
rabuzarus
ced8923323 frio: show attachment icons in posts 2016-09-06 16:21:14 +02:00
Michael Vogel
9209d88c4a Set the charset for the SQL connection for new installations 2016-09-01 03:50:41 +00:00
rabuzarus
9653ae98ae frio: resize textareas on typing. 2016-08-23 16:48:13 +02:00
rabuzarus
37ae63e120 fix contact dropping on contact edit page also for other themes 2016-08-17 16:51:04 +02:00
rabuzarus
212aa99f28 frio: fix contact dropping on contact edit page 2016-08-17 14:32:43 +02:00
rabuzarus
efdb98de6d frio: fix - add string to template 2016-08-13 18:59:59 +02:00
Tobias Diekershoff
dbab4db754 Merge pull request #2727 from rabuzarus/1008-item-highlight
frio: highlight - test if the item is available in the dom
2016-08-10 14:49:27 +02:00
rabuzarus
83e95a5841 frio: highlight - test if the item is available in the dom 2016-08-10 14:42:57 +02:00
Tobias Diekershoff
2a79b8c235 Merge pull request #2726 from rabuzarus/1008-item-highlight
Frio: fix auto jump to the item position in /display
2016-08-10 14:42:11 +02:00
rabuzarus
5e440e5359 frio: highlight - wait until the whole page is loaded 2016-08-10 14:26:16 +02:00
rabuzarus
cf23a81c33 frio: highlight - use offset() instead of postion() 2016-08-10 14:14:58 +02:00
rabuzarus
531cba5ce5 frio: fix - I used the wrong variable 2016-08-10 13:33:49 +02:00
rabuzarus
7e65d84577 frio: fix for display auto position scroll + some cleanup 2016-08-10 13:07:13 +02:00
Tobias Diekershoff
42b7c9cd74 DE translation 2016-08-10 12:31:54 +02:00
rabuzarus
40b0a8e30c frio: Remote is now called Guest 2016-08-09 14:39:18 +02:00
rabuzarus
f52a06d013 frio: correct spelling 2016-08-08 22:25:54 +02:00
rabuzarus
4adc758adb frio: add some missing page background 2016-08-08 22:16:32 +02:00
rabuzarus
62b23b0631 frio: background for people search 2016-08-08 21:54:34 +02:00
Michael Vogel
fe5e775b00 Merge pull request #2718 from rabuzarus/0808-frio_notifications_css
frio: unify size of notif-images + background color for unseen notifs
2016-08-08 21:31:00 +02:00
rabuzarus
6b979e5ad8 frio: fix duplicated ID's in aside section 2016-08-08 17:15:35 +02:00
rabuzarus
27f04100c8 frio: unify size of notif-images + background color for unseen notifs 2016-08-08 14:05:33 +02:00
Michael Vogel
61e3a8ca3a Merge pull request #2702 from rabuzarus/0308-Notifications-restructure
notifications restructure
2016-08-08 07:41:48 +02:00
Tobias Diekershoff
991914d563 vier 2016-08-06 10:54:54 +02:00
Tobias Diekershoff
a9196dc0f8 Merge pull request #2712 from rabuzarus/0508-frio_mobile_login
frio - provide mobile login/register buttons for mobile view
2016-08-06 06:52:42 +02:00
rabuzarus
f9ccdce4d4 Raise frio version number to 0.7
Since I never raised the version number since starting this theme I raise the version of frio to 0.7 and removed the alpha. It is still much stuff to do for a 1.0 version but frio has done the last half year big steps forward.
2016-08-05 20:37:51 +02:00
rabuzarus
8cc4d7a128 Update README.md 2016-08-05 20:31:14 +02:00
rabuzarus
a5a28d11fc frio - provide mobile login/register buttons for mobile view 2016-08-05 20:17:06 +02:00
Michael Vogel
6abeff10c0 Merge pull request #2711 from rabuzarus/0408-frio-photo-tpl-fix
photos - include paginate into the templates - provide a photo_album.…
2016-08-04 23:59:43 +02:00
rabuzarus
3921113e5c photos - include paginate into the templates - provide a photo_album.tpl for frio 2016-08-04 21:53:22 +02:00
rabuzarus
94d297155c frio:implement comment highlighting with jquery.color 2016-08-04 19:59:45 +02:00
Michael Vogel
d698534027 Merge pull request #2707 from tobiasd/20160804-de
DE translations THX Andreas
2016-08-04 14:58:24 +02:00
Tobias Diekershoff
3432268e80 Merge pull request #2708 from rabuzarus/0407-frio-picture-wall-fix
frio:fix jot - posts with images were not available on wall
2016-08-04 14:57:15 +02:00
rabuzarus
e374ec2bc8 frio:fix jot - posts with images were not available on wall 2016-08-04 14:33:08 +02:00
Tobias Diekershoff
c46a7ddd4a DE translations THX Andreas 2016-08-04 12:12:52 +02:00
Tobias Diekershoff
30b93b74db Merge pull request #2706 from rabuzarus/0308-frio_accept_requests_mobile
frio: add intro action buttons for mobile devices
2016-08-04 12:08:40 +02:00
rabuzarus
e34e1f7c2b frio: add intro action buttons for mobile devices 2016-08-04 11:36:31 +02:00
Michael Vogel
2d63f9deb6 Worker fastlane can now be activated from the admin interface 2016-08-04 08:51:34 +02:00
rabuzarus
ae905cbd1b Merge develop into 0308-Notifications-restructure
Conflicts:
	mod/notifications.php
2016-08-03 12:53:38 +02:00
Tobias Diekershoff
35bbc3948f DE update to the strings 2016-08-02 12:30:04 +02:00
rabuzarus
6d3c15fe91 notifications - add attendance notifications 2016-08-02 00:01:43 +02:00
rabuzarus
bcee356f66 notifications - add docu & pagination 2016-08-01 23:04:41 +02:00
rabuzarus
7a4be1cead notifications.php: move more code to NotificationsManager 2016-08-01 18:18:11 +02:00
Tobias Diekershoff
75be187216 Merge pull request #2682 from annando/1607-api-generic-xml
API: XML is now generated without templates
2016-08-01 07:25:24 +02:00
Tobias Diekershoff
a684a1c519 Merge pull request #2691 from rabuzarus/2607-contact_confirm
frio: intro templates + some restructure of core notifications.php
2016-08-01 07:15:24 +02:00
rabuzarus
f7fa5f166b notifications.php: unify label strings 2016-07-30 11:03:21 +02:00
Michael Vogel
313bc5b0d2 Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-30 10:02:39 +02:00
Tobias Diekershoff
3034edca70 Merge pull request #2693 from rabuzarus/2107-contact_edit
frio: contact_edit.tpl was missing a bracket
2016-07-28 15:34:34 +02:00
rabuzarus
e74da01276 frio: contac_edit.tpl was missing a bracket 2016-07-28 11:45:41 +02:00
rabuzarus
320751660d frio: intro notifications + some restructuring in core for notifications 2016-07-27 19:53:22 +02:00
Michael Vogel
287c9cfbdd Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-26 22:15:49 +02:00
Tobias Diekershoff
3e8da763ba IS update to the translations THX Sveinn í Felli 2016-07-26 11:18:38 +02:00
Tobias Diekershoff
18a35e9ceb Merge pull request #2688 from rabuzarus/2607-drop
frio: provide confirm modal
2016-07-26 10:45:52 +02:00
rabuzarus
694637f9c3 frio: provide confirm modal 2016-07-26 10:36:34 +02:00
rabuzarus
768d10536f frio: templates for contact_edit and crepair 2016-07-26 09:09:40 +02:00
Tobias Diekershoff
0cbc102c93 DE update to the strings 2016-07-21 09:20:21 +02:00
Michael Vogel
0e7ff6b4db Removed (now) unused templates 2016-07-19 08:46:41 +02:00
Michael Vogel
838f976715 Some more improvements to xml.php, code cleanup 2016-07-17 23:59:35 +02:00
fabrixxm
ce2f765d28 API: rework share as retweet
new shared status xml template.
<retweeted_status> element in xml.
parent status keeps his body and author, 'retweeted_status'
get body, author and plink from share bbcode.
2016-07-13 22:29:07 +02:00
fabrixxm
d98ab84d76 API: update template for friendica:owner data
api_user_xml.tpl lost his root element.
Includer templates must provide it.
This allow to use same data structure under different root tag.
2016-07-13 20:11:18 +02:00
rabuzarus
15471f3835 add possibility to load custom page templates + none.php pagetemplate is part of core now 2016-07-11 10:33:39 +02:00
rabuzarus
1cf4924e20 frio: fix url variable for textcomplete in contact_template 2016-07-03 09:50:34 +02:00
Michael Vogel
2ef50cb7e6 Site settings: some settings are disabled when the worker is active 2016-07-02 23:08:33 +02:00
rabuzarus
9170955f80 frio: fix textcomplete for jot 2016-07-01 17:03:40 +02:00
rabuzarus
571a4fed99 frio: restructure jot modal and make jot modal work on mobile 2016-06-27 10:33:20 +02:00
rabuzarus
75f838c53b frio: move some more headings to the navbar 2016-06-26 11:02:12 +02:00
rabuzarus
aec885b963 frio: fix - jot default was not removed in every case while inserting content 2016-06-26 03:49:21 +02:00
Tobias Diekershoff
6c22cb917a Merge pull request #2639 from rabuzarus/2506_viewcontact_tabs
viewcontacts - make the tabbar available even if hide-friends is active
2016-06-25 19:48:35 +02:00
rabuzarus
fd72f36ffe move html from function micropro() to own templates 2016-06-25 18:46:47 +02:00
rabuzarus
06959d745e viewcontacts - make the tabbar available even if hide-friends is active 2016-06-25 16:20:44 +02:00
Michael Vogel
9f99f37975 Merge pull request #2637 from rabuzarus/2506_wallmessage_js
frio: Wallmessage - distinguish between own and foreign host
2016-06-25 14:09:44 +02:00
rabuzarus
84263ee8de frio: Wallmessage - distinguish between own and foreign host 2016-06-25 13:02:53 +02:00
rabuzarus
073f520cee add missing strings for frio 2016-06-25 12:21:13 +02:00
Michael Vogel
49c19a3c00 Merge pull request #2628 from rabuzarus/1906-event-test
move the cal addon (exporting calendars) to core
2016-06-21 22:48:31 +02:00
Ben Roberts
864cf0f70d update MF2 and vcard data for issue #2629 2016-06-21 10:23:43 -04:00
rabuzarus
71c9f562ae move the cal addon (exporting calendars) to core 2016-06-20 23:31:49 +02:00
Michael Vogel
b411380c4c Merge pull request #2625 from rabuzarus/1906-event-test
frio: disable the events module link in the profile tab
2016-06-20 14:26:27 +02:00
rabuzarus
80f5065eb0 frio: disable the events module link in the profile tab 2016-06-20 13:44:11 +02:00
Michael Vogel
9aa5c2f821 Merge pull request #2623 from rabuzarus/1906-event-test
implement a public calendar for vistors of someones profile page
2016-06-20 06:23:25 +02:00
Tobias Diekershoff
9ea9494a9e Merge pull request #2620 from dissolve/2617
recreate fix for #2617 on correct branch
2016-06-20 00:06:52 +02:00
rabuzarus
7495a34b32 implement a public calendar for vistors of someones profile page 2016-06-19 22:04:34 +02:00
Michael Vogel
d0033ca5cf Merge pull request #2621 from rabuzarus/1206-events-template
frio - events - fix double click on date
2016-06-18 21:32:07 +02:00
rabuzarus
ee0942b96d frio - events - fix double click on date 2016-06-18 15:23:35 +02:00
Michael Vogel
bf2e23c205 Merge pull request #2616 from rabuzarus/1206-events-template
use standard templates in events + frio templates for events
2016-06-18 15:01:00 +02:00
Ben Roberts
22de27327c recreate fix for #2617 on correct branch 2016-06-18 08:16:09 -04:00
rabuzarus
48a77af49d frio - events - delete unneeded css 2016-06-17 14:52:42 +02:00
rabuzarus
134d5949d5 frio - events - restore lost css bracket after merging develop branch 2016-06-17 14:39:59 +02:00
rabuzarus
7dc5fc8b9f Merge develop into 1206-events-template
Conflicts:
	view/theme/frio/css/style.css
2016-06-17 14:33:08 +02:00
rabuzarus
4313982e02 frio - event - code clean up + docu 2016-06-17 14:27:33 +02:00
rabuzarus
606f42701c frio - event - some js and template refactoring + event view css styling 2016-06-17 14:09:18 +02:00
rabuzarus
0148d0e5d2 frio - event - correct some js 2016-06-17 11:18:54 +02:00
rabuzarus
c99da380cf frio: events - adapt changes to the templates of the other themes 2016-06-17 10:33:12 +02:00
rabuzarus
8b4c416713 frio: events - split event form in different sections 2016-06-16 20:16:16 +02:00
rabuzarus
0167a2bd61 port of Hubzillas code highlight feature 2016-06-16 11:38:12 +02:00
rabuzarus
7b602a20e6 frio - bookmarklet - open jot only if it is available 2016-06-16 00:27:45 +02:00
rabuzarus
dfce0f5b64 frio: open jot modal automatically on bookmarklet page 2016-06-16 00:20:00 +02:00
Tobias Diekershoff
5ec7626b12 Merge pull request #2610 from rabuzarus/1406-frio-search-fix
frio: fix searchbox - comment tag wasn't closed
2016-06-14 13:44:14 +02:00
rabuzarus
7ec13d4534 frio: fix searchbox - comment tag wasn't closed 2016-06-14 10:41:14 +02:00
Michael Vogel
365101066a Merge pull request #2605 from rabuzarus/1306-aside-group-fix
frio: fix an css issue with sidebar-group checkbox alignment
2016-06-13 14:34:08 +02:00
rabuzarus
06792d6b37 frio: fix an css issue with sidebar-group checkbox alignment 2016-06-13 12:17:33 +02:00
rabuzarus
82b6917c5f frio: settings_display.tpl + rise frio to 0.2 Alpha 2016-06-13 10:57:42 +02:00
rabuzarus
5e98f27fcd frio: events - work on event_form.tpl + datetime.php 2016-06-13 10:19:38 +02:00
Michael Vogel
9354d86f38 Merge pull request #2601 from rabuzarus/1206-short-info-fix
frio: bind short-info scrollspy on class fn (insteadof p-addr)
2016-06-12 21:59:46 +02:00
rabuzarus
468f2d001e frio: scrollspy info - forgot to change all classes 2016-06-12 20:34:41 +02:00
rabuzarus
605399032d frio: bind short-info scrollspy on class fn (insteadof p-addr) 2016-06-12 20:25:30 +02:00
rabuzarus
85efa93898 frio: little css fix 2016-06-12 20:20:17 +02:00
rabuzarus
9db614de64 frio: some template clean up 2016-06-12 20:09:02 +02:00
rabuzarus
b19af8f0b7 frio: add css for settings templates 2016-06-12 19:59:27 +02:00
rabuzarus
0aa15f74ff Merge develop into 1106-frio-settings 2016-06-12 19:34:06 +02:00
rabuzarus
0af572ffba frio: first part for event template work 2016-06-12 18:23:10 +02:00
Michael Vogel
6d50d18242 Merge pull request #2584 from rabuzarus/0906-profiles
some restructure in profiles.php + frio template for profiles settings
2016-06-12 14:20:42 +02:00
Michael Vogel
0eb69b963e Merge pull request #2587 from rabuzarus/1006-short-info
frio: a short contact informations will be provided at the second nav…
2016-06-12 12:12:43 +02:00
rabuzarus
5fc5ef5461 frio: provide login.tpl 2016-06-12 11:51:43 +02:00
rabuzarus
3264efb238 Merge pull request #2583 from fabrixxm/frio-login-modal
Frio: login button opens a modal
2016-06-12 10:50:56 +02:00
rabuzarus
56b600381e frio: add some more settings templates 2016-06-12 00:15:48 +02:00
rabuzarus
f2ad8dd1d4 frio: add settings.tpl 2016-06-11 22:35:08 +02:00
rabuzarus
8ac7575d5b frio: closed profile setting sections on page load 2016-06-11 18:51:20 +02:00
rabuzarus
c2f116f8fd frio short contact informations - some optical polishing 2016-06-11 17:43:02 +02:00
rabuzarus
d39f679230 Merge develop into 1006-short-info
Conflicts:
	view/theme/frio/js/theme.js
2016-06-11 10:52:26 +02:00
fabrixxm
2ec06c1a38 use js/modal.js to show Login page in modal 2016-06-11 09:58:26 +02:00
fabrixxm
f8c62f0407 Frio: make jslint more happy 2016-06-11 09:40:50 +02:00
rabuzarus
70f97a3536 frio: a short contact informations - better fadeOut handling 2016-06-11 01:40:28 +02:00
rabuzarus
3c49a410e5 frio: a short contact informations - add border-radius to profile picture (this fits better to the rest of the profile pictures) 2016-06-11 01:32:29 +02:00
rabuzarus
53fb8b1181 frio: a short contact informations will be provided at the second nav bar by scrolling down (on pages where vcard is available) 2016-06-11 01:28:25 +02:00
rabuzarus
db5438ab1a frio: improvements in search behavior
- search value woll be added to nav search input
- focus on nav search input as main search
- save search button appears in the second navbar if search is available
- search heading appears in the second navbar
- provide a mobile search by pressing the search icon
- dirfind: heading distinguish between people and form search
- some js fixes in theme.js
2016-06-10 20:34:25 +02:00
rabuzarus
3a9a9e6a1c frio + core: some restructure in profiles.php + frio template for profiles settings 2016-06-10 11:24:38 +02:00
Fabrixxm
8c1422103e Frio: login button opens a modal 2016-06-10 10:40:13 +02:00
Tobias Diekershoff
e8d39b290a show the workerqueue in the admin panel summary 2016-06-09 18:08:40 +02:00
rabuzarus
f79a7bc455 frio: improvements it js jot behavior
- cache the original jot everytime (to restore it after modal close)
- possibility to edit event items
2016-06-08 20:53:01 +02:00
Michael Vogel
aad00ddc04 Renamed template 2016-06-08 07:11:16 +02:00
Michael Vogel
f59b21d4a8 Merge remote-tracking branch 'upstream/develop' into 1606-shared-template 2016-06-07 22:40:29 +02:00
Michael Vogel
d034822f07 Merge pull request #2574 from rabuzarus/0607-saved-search
provide a general content wrapper + frio saved searches
2016-06-07 22:38:50 +02:00
Michael Vogel
e2e32eecac New template for shared content instead of hardcoded stuff in source 2016-06-07 22:29:50 +02:00
rabuzarus
26336a60e9 content_wrapper.tpl respects content with no title 2016-06-07 16:38:22 +02:00
rabuzarus
71b30e0651 profice a general content wrapper template. 2016-06-07 16:32:02 +02:00
rabuzarus
3a368214c0 frio: saved_searches_aside & searchbox template 2016-06-07 15:29:38 +02:00
Tobias Diekershoff
03c09e4c3f Merge pull request #2573 from rabuzarus/0606-more-hovercard
frio: some hover-card css fixes
2016-06-07 11:32:56 +02:00
rabuzarus
60ca6b7f07 frio: some hover card css fixes (enable on mouseleave again - forgot it) 2016-06-07 10:16:31 +02:00
rabuzarus
d570a90c05 frio: some hover card css fixes 2016-06-07 10:13:08 +02:00
Michael Vogel
bd01a1c63a Merge pull request #2572 from rabuzarus/0606-more-hovercard
frio: fix close hovercard on mousleave
2016-06-07 06:10:46 +02:00
rabuzarus
d752ea9abc frio: fix close hovercard on mousleave 2016-06-07 01:42:01 +02:00
rabuzarus
615db43736 frio: add group_side widget template 2016-06-07 01:28:38 +02:00
rabuzarus
c87d426d5f frio: follow & peoplefind widget template 2016-06-07 00:38:39 +02:00
Michael Vogel
db44ea0482 Merge pull request #2567 from rabuzarus/0606-photo-menu
photo_menu: now the photo_menu does have at all places the same struc…
2016-06-06 21:28:25 +02:00
rabuzarus
5c52736221 photo_menu: now the photo_menu does have at all places the same structure 2016-06-06 16:54:29 +02:00
rabuzarus
33ad8bdc53 frio: extend hovercard to wall-item-responses (likes, attendend) and wall-item-bottom mentions 2016-06-06 11:05:29 +02:00
Tobias Diekershoff
ec89274cd8 Merge pull request #2563 from rabuzarus/0506-contact-transition
frio: give the contact actions a little transition effect
2016-06-06 06:07:09 +02:00
Michael Vogel
4b640dbd97 Fetching of profile data improved 2016-06-05 21:17:55 +02:00
rabuzarus
43b0550094 frio: remove legacy transition css 2016-06-05 17:12:13 +02:00
rabuzarus
84e5276a3a frio: give the contact actions a little transition effect 2016-06-05 09:56:53 +02:00
rabuzarus
b53391a975 frio: fix bulk deletion doesn't appear if post item was inserted by js 2016-06-03 18:55:57 +02:00
rabuzarus
030f44b2fe frio: give images in the networstream a little border-radius 2016-06-02 22:11:41 +02:00
rabuzarus
cd0d5d6a18 frio: remove js part for shared-content div because it's now done by core 2016-06-02 20:59:31 +02:00
Michael Vogel
d7c0e664f7 Merge pull request #2555 from rabuzarus/0106-contact_actions
frio: adding contact actions on hover for contacts in contact view
2016-06-01 22:05:09 +02:00
Michael Vogel
51f6e09e68 Merge pull request #2556 from tobiasd/shashapes
ShaShape font updated
2016-06-01 21:21:48 +02:00
Tobias Diekershoff
b23a253151 ShaShape font updated 2016-06-01 20:03:56 +02:00
rabuzarus
300591560e frio: adding contact actions on hover for contacts in contact view 2016-06-01 17:21:57 +02:00
rabuzarus
64c871bf4c frio: give the heading "messages" a class "heading" - This is needed for pm modal where class heading becomes the modal title) 2016-06-01 14:04:39 +02:00
rabuzarus
d3369aeca1 frio: provide a tooltip for nav search 2016-06-01 11:59:35 +02:00
rabuzarus
d663447e3c frio: show tooltip only on hover (and not on focus) 2016-06-01 09:39:20 +02:00
Michael Vogel
e2c0f04eeb Added short description to "mark as seen" 2016-06-01 07:05:44 +02:00
Michael Vogel
ef566ecbc3 Changed option description 2016-06-01 07:03:03 +02:00
Michael Vogel
9dd6fec0e0 The user name moved to the central. 2016-05-31 22:27:36 +02:00
Michael Vogel
9a442da852 Removed todo 2016-05-31 22:09:35 +02:00
Michael Vogel
de3eb5a1b7 Frio: Removed github link, changed notification description 2016-05-31 22:07:29 +02:00
Michael Vogel
060b7193e6 Indention of the html code 2016-05-30 21:43:49 +02:00
Michael Vogel
58ef15c6c1 The file widget looks now better as well 2016-05-30 21:17:28 +02:00
Michael Vogel
b798288a5b Frio: The network widget now shows the selected network 2016-05-30 21:00:00 +02:00
Michael Vogel
7bfa9b5650 Merge pull request #2547 from rabuzarus/3005-frio_display_fix
frio: commented out some js for the color highlight in /display/ beca…
2016-05-30 15:06:16 +02:00
rabuzarus
3948e2923a frio: commented out some js for the color highlight in /display/ because it causes some errors in ff 2016-05-30 15:01:30 +02:00
Tobias Diekershoff
2d280f55ac Merge pull request #2544 from annando/issue-1769
Issue 1769: Some enhancements for sending wall mails
2016-05-30 14:35:04 +02:00
Michael Vogel
5218667196 Merge remote-tracking branch 'upstream/develop' into 1605-frio-template-clean 2016-05-30 07:24:06 +02:00
Michael Vogel
7e6598f2c0 Adopted the changes to the other themes as well. 2016-05-30 07:18:25 +02:00
Tobias Diekershoff
b2c6bf0078 Merge pull request #2543 from annando/frio-hovercard
Frio: Hovercard is now a core function
2016-05-30 06:25:29 +02:00
Michael Vogel
ecb67feca1 Adapting the changes to search_item.tpl as well 2016-05-30 05:21:57 +02:00
Michael Vogel
09931b7124 frio: Some small template clean up 2016-05-29 23:42:22 +02:00
Michael Vogel
47efc6df63 Frio: The separator dots are enabled again 2016-05-29 23:02:48 +02:00
Michael Vogel
0a617da044 Wall message can now redirect to your own page if you are connected. 2016-05-29 21:29:26 +02:00
rabuzarus
d40f32cc55 Merge pull request #2542 from annando/1605-more-frio2
Frio: Bugfix for linebreaks in location
2016-05-29 15:59:28 +02:00
Michael Vogel
3d3498af1b And some more 2016-05-29 15:40:24 +02:00
Michael Vogel
c0ea789786 Some location changes 2016-05-29 15:33:36 +02:00
Michael Vogel
98f7c73d10 Frio: Hovercard is now a core function 2016-05-29 15:28:31 +02:00
Michael Vogel
036ca6a6e1 frio: Bugfix for linebreak of locations in comments 2016-05-29 10:56:49 +02:00
Michael Vogel
db99ce9512 Merge pull request #2538 from rabuzarus/2805_frio_mobile
frio: open hovercard on click if device is a mobile device
2016-05-28 13:49:05 +02:00
Michael Vogel
05a13a99b2 Frio: Location should look now similar everywhere 2016-05-28 13:47:41 +02:00
rabuzarus
9285ba8178 Merge pull request #2536 from annando/1605-more-frio
Frio: Like, Dislike and comment are having icons, links are underlined
2016-05-28 13:38:55 +02:00
Michael Vogel
4a388e84af Frio: Adopt changes to search_item.tpl as well. 2016-05-28 13:08:43 +02:00
rabuzarus
9dc4420561 frio: open hovercard on click if device is a mobile device 2016-05-28 13:07:24 +02:00
Michael Vogel
79517cb7d2 Merge pull request #2534 from fabrixxm/frio-smallfixes
Small fixes to Frio theme
2016-05-28 10:08:25 +02:00
Michael Vogel
add258ac08 Frio: Like, Dislike and comment are having icons, links are underlined 2016-05-28 09:57:19 +02:00
Michael Vogel
d91052f73a Frio: When hovering over the notification entries the cursor is now a pointer 2016-05-27 20:33:29 +02:00
fabrixxm
e568020718 Frio: remove header(location) in default.php
The call to header() is too late in code (output was already sent)
2016-05-27 15:53:11 +02:00
fabrixxm
6fcad290a4 Frio: Fix warnings in config page 2016-05-27 15:50:51 +02:00
Michael Vogel
2d6740c340 Frio: Added a link to the thread on the same server 2016-05-26 23:23:24 +02:00
rabuzarus
8ec4243253 Merge branch 'master' of ../save/merge/frio into frio_merge 2016-05-25 15:14:09 +02:00
rabuzarus
b67378ac69 restructuring for PR for friendica main repo 2016-05-25 15:12:29 +02:00
Tobias Diekershoff
cf5ca15711 DE translation THX Abrax 2016-05-19 12:01:38 +02:00
Fabrixxm
6734aa5c28 Make user table in admin sortable via table headers
new GET param for /admin/user: 'o'
value is db table to order by. values are limited by script.
invalid values are discarded.
preped with '-' to order descending.
show unicode arrows in table headers to visually indicate sorting.
2016-05-16 14:38:00 +02:00
Tobias Diekershoff
d6a124ee2b Merge pull request #2511 from rabuzarus/1205_photo_live_update
1205 photo live update
2016-05-13 07:57:13 +02:00
rabuzarus
6944d67dbc photos view: fix js error with undefined variable 2016-05-13 01:26:07 +02:00
rabuzarus
d454905d3c infinite_scroll: move js from index.php to main.js 2016-05-11 01:52:05 +02:00
Tobias Diekershoff
3a819e3630 Merge pull request #2500 from fabrixxm/feature_mobile_notification_menu
style notification menu to be more mobile-friendly
2016-05-02 15:20:56 +02:00
Fabrixxm
343c7faba4 style notification menu to be more mobile-friendly 2016-05-02 14:55:57 +02:00
Fabrixxm
9a6cfcfd88 small fix to embed iframes on mobile 2016-05-02 14:17:55 +02:00
Roland Haeder
3e701b90ac
Continued rewriting:
- use dba::is_result() everywhere (where I found the old, bad way)
- converted some spaces -> tabs for code
- converted some CRLF -> LF as mixures of both is not good

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 14:24:44 +02:00
rabuzarus
c1c71732bd
login: use ARIA instead of <fieldset> tag 2016-05-01 13:48:52 +02:00
rabuzarus
f695c918fd
vier-mobile: expand embedded video on play 2016-05-01 13:48:52 +02:00
rabuzarus
aef332aad0
vier-mobile: little css fix 2016-05-01 13:48:52 +02:00
rabuzarus
10ac4a4475
vier-mobile: fix embedded video for tablets and bigger 2016-05-01 13:48:52 +02:00
rabuzarus
08abb4ae79
vier-mobile: fix embedded video and embedded link images for tablets and bigger 2016-05-01 13:48:52 +02:00
rabuzarus
d049c8d5c5
vier-mobile: fix threaded view for tablets and bigger 2016-05-01 13:48:52 +02:00
Michael Vogel
829e7ace06
Vier: No visible login border/no search and events without login 2016-05-01 13:48:52 +02:00
Tobias Diekershoff
aab5442b50
ES translations thx TupambaeNet 2016-05-01 13:48:52 +02:00
Tobias Diekershoff
7931555b64
make doxygen a bit more happy 2016-05-01 13:48:52 +02:00
Tobias Diekershoff
01ef271901
make doxygen a bit more happy 2016-05-01 13:48:52 +02:00
rabuzarus
0056403b15
fix: contact edit poll_interval wasn't submitted 2016-05-01 13:48:52 +02:00
Tobias Diekershoff
ccb0875c57
reorganize the htconfig template 2016-05-01 13:48:52 +02:00
Tobias Diekershoff
cc0b4ff0f9
during installation choose the highest RINO version possible 2016-05-01 13:48:52 +02:00
rabuzarus
856f54da62
rework autocompletion: Update mobile.css 2016-05-01 13:48:52 +02:00
rabuzarus
d32c0e8eb4
vier: colorbox fix (img max-width: 100%) 2016-05-01 13:48:52 +02:00
rabuzarus
5bc17e0b91
rework autocomplete: use minified version + delete old fk.autocomplete.js 2016-05-01 13:48:52 +02:00
rabuzarus
cc7d1d453b
rework autocomplete: seperate bbcode completion 2016-05-01 13:47:24 +02:00
rabuzarus
bc720c0918
quattro fix for #2385 - respect acl on event edit 2016-05-01 13:47:24 +02:00
Tobias Diekershoff
fe97315acb
Issue 2241: added language selector to the admin wizard 2016-05-01 13:47:24 +02:00
Tobias Diekershoff
bf3f31f701
added aria describedby elements refering to field help to the input templates 2016-05-01 13:47:24 +02:00
Tobias Diekershoff
5ce6d2c5bd
added lang info to frost themes 2016-05-01 13:47:24 +02:00
Tobias Diekershoff
9a6afaa307
set language in HTML header to selected UI language 2016-05-01 13:47:24 +02:00
Michael Vogel
887f2e92a5
Unused files are removed 2016-05-01 13:46:08 +02:00
Michael Vogel
cd57c49600
Retraction could work now as well. 2016-05-01 13:46:08 +02:00
rabuzarus
2bd60075ae
rework autocomplete: some styling if contact is forum 2016-05-01 13:46:08 +02:00
rabuzarus
341a22800d
rework autocomplete: add class dir and static function 2016-05-01 13:46:08 +02:00
rabuzarus
586b251539
rework autocomplete: some cleanup and docu 2016-05-01 13:46:08 +02:00
rabuzarus
7ee0bca2bb
rework autocomplete: new ac for poke, contacts, prv_messages 2016-05-01 13:45:38 +02:00
rabuzarus
52896d64c2
rework autocomplete: css work 2016-05-01 13:45:38 +02:00
rabuzarus
35bd5792bc
rework autocomplete: initial commit 2016-05-01 13:45:17 +02:00
Tobias Diekershoff
9ec9ea3844 Merge pull request #2484 from rabuzarus/25.04_login_template
login: use ARIA instead of <fieldset> tag
2016-04-26 06:43:48 +02:00
rabuzarus
7e199c72ac login: use ARIA instead of <fieldset> tag 2016-04-25 23:40:07 +02:00
rabuzarus
9943d4a60a vier-mobile: expand embedded video on play 2016-04-25 22:12:53 +02:00
Michael Vogel
1f4f60a82d Merge pull request #2480 from rabuzarus/2504_vier_mobile_fix
vier mobile fixes
2016-04-25 21:41:43 +02:00
rabuzarus
4daa9a50f5 vier-mobile: little css fix 2016-04-25 20:30:02 +02:00
rabuzarus
fa66fa9b28 vier-mobile: fix embedded video for tablets and bigger 2016-04-25 20:24:36 +02:00
rabuzarus
7b48ef23d5 vier-mobile: fix embedded video and embedded link images for tablets and bigger 2016-04-25 20:04:10 +02:00
rabuzarus
c553ab9b46 vier-mobile: fix threaded view for tablets and bigger 2016-04-25 19:54:03 +02:00
Michael Vogel
0c5f315294 Vier: No visible login border/no search and events without login 2016-04-24 21:45:06 +02:00
Tobias Diekershoff
031f6cbf64 ES translations thx TupambaeNet 2016-04-22 17:33:39 +02:00
Michael Vogel
ee72f1e4bd Merge pull request #2468 from tobiasd/2242-and-htconfig
stuff for the installer and htconfig template
2016-04-21 06:41:02 +02:00
Tobias Diekershoff
caa541f939 make doxygen a bit more happy 2016-04-20 16:08:17 +02:00
Tobias Diekershoff
6601582a12 make doxygen a bit more happy 2016-04-20 16:06:39 +02:00
rabuzarus
7ee9c536ee fix: contact edit poll_interval wasn't submitted 2016-04-20 15:37:34 +02:00
Tobias Diekershoff
7c6ebae5c0 reorganize the htconfig template 2016-04-20 14:30:22 +02:00
Tobias Diekershoff
d3293dfcf2 during installation choose the highest RINO version possible 2016-04-20 14:17:48 +02:00
rabuzarus
9190380dec rework autocompletion: Update mobile.css 2016-04-17 22:27:49 +02:00
rabuzarus
84238e1b89 vier: colorbox fix (img max-width: 100%) 2016-04-17 15:34:15 +02:00
Tobias Diekershoff
bbd5878734 Merge pull request #2449 from rabuzarus/1404_reworked_autocomplete
new autocompletion
2016-04-16 08:16:21 +02:00
rabuzarus
ed6ada0da5 rework autocomplete: use minified version + delete old fk.autocomplete.js 2016-04-15 02:25:58 +02:00
rabuzarus
98b62b80f3 rework autocomplete: seperate bbcode completion 2016-04-14 23:59:29 +02:00
rabuzarus
01b02dbcaa Merge develop into 1404_reworked_autocomplete
Conflicts:
	include/text.php
	view/templates/head.tpl
	view/theme/duepuntozero/style.css
	view/theme/vier/style.css
2016-04-14 16:23:51 +02:00
rabuzarus
c73e93b19b quattro fix for #2385 - respect acl on event edit 2016-04-13 17:43:46 +02:00
Tobias Diekershoff
5df20fda11 Issue 2241: added language selector to the admin wizard 2016-04-06 20:13:34 +02:00
fabrixxm
295489e9a5 Merge pull request #2434 from tobiasd/20160403-lng
lang info in HTML header
2016-04-06 09:04:13 +02:00
Tobias Diekershoff
1ee405c9c3 added aria describedby elements refering to field help to the input templates 2016-04-04 08:10:27 +02:00
Tobias Diekershoff
d9b6355bb8 added lang info to frost themes 2016-04-03 21:00:18 +02:00
Tobias Diekershoff
a88d950c33 set language in HTML header to selected UI language 2016-04-03 20:55:39 +02:00
Michael Vogel
3f2a23d48c Unused files are removed 2016-03-15 07:05:10 +01:00
Michael Vogel
a0aeea4a89 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-12 07:38:25 +01:00
Michael Vogel
bc21fca345 Remove the setting description from the documentation since it isn't a hidden one anymore. 2016-03-11 23:44:46 +01:00
Michael Vogel
b12dbe8831 The worker settings are now available in the admin settings 2016-03-11 23:28:11 +01:00
Michael Vogel
918efbafac Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-06 21:20:00 +01:00
fabrixxm
d30d13959b Merge pull request #2328 from rabuzarus/0602_contact_profile
polishing of the contact-edit page
2016-03-06 19:56:59 +01:00
Michael Vogel
bb06026147 Settings for only importing threads from our ostatus contacts 2016-03-06 14:09:04 +01:00
Michael Vogel
305f6f9a7b Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-06 08:41:24 +01:00
Michael Vogel
6468fbb905 Retraction could work now as well. 2016-03-06 01:37:47 +01:00
Michael Vogel
996cd8c24e The Font Awesome library is now updated, the replxy button is changed 2016-03-05 13:29:01 +01:00
fabrixxm
11310aa93b Merge pull request #2389 from Quix0r/rewrites/theme_info_array_init
$a->theme_info = array() should be avoided
2016-03-01 15:32:34 +01:00
Roland Haeder
08abdfda68
<form> and <html> or <head> are not self-closing tags.
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 14:49:56 +01:00
Roland Haeder
04a7d6384e
No need to set $a->theme_info = array() everywhere if you can define it in App
itself.

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 14:27:38 +01:00
Tobias Diekershoff
09060c0ed3 adding some colors to the Federation Statistics page of the admin panel 2016-02-29 17:24:34 +01:00
rabuzarus
0db83b9586 contactedit-actions-button: move repair back to tabbar 2016-02-23 19:19:45 +01:00
Michael Vogel
2eb461ed2c Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content 2016-02-18 08:15:58 +01:00
Michael Vogel
7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +01:00
Tobias Diekershoff
e22d980e91 IT update to the strings 2016-02-17 15:13:45 +01:00
Michael Vogel
c770b00d6d Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content 2016-02-17 12:18:46 +01:00
Michael Vogel
c5b724828a Just some more removed baseurls ... 2016-02-17 08:08:28 +01:00
Michael Vogel
f7537c9e90 Remove the baseurl where possible to avoid mixed content 2016-02-17 00:01:24 +01:00
Sakałoŭ Alaksiej
a9f80d435b Complemented and improved russian translation 2016-02-16 20:57:15 +03:00
Michael Vogel
307f90cdfe Vier: Pictures in the side bar shouldn't be larger than the side bar 2016-02-13 14:21:53 +01:00
Tobias Diekershoff
c5f2157eb2 Merge pull request #2336 from stieben/move-div-pause
Move div#pause to view/default.php
2016-02-11 07:36:37 +01:00
Andrej Stieben
e104c58191 Added div#pause to themes' default.php
As requested by @tobiasd and @rabuzarus.
2016-02-09 16:41:19 +01:00
Andrej Stieben
4d7a6aaed2 Moved div#pause from index.php to view/default.php
This closes #2320.
2016-02-09 15:54:35 +01:00
rabuzarus
2e04a00d30 contactedit-actions-button: some adjustment for vier dark scheme 2016-02-08 23:25:48 +01:00
rabuzarus
0c764684bb Merge develop into 0602_contact_profile 2016-02-08 23:16:02 +01:00
rabuzarus
0b5d7b300e contactedit-actions-button: adjust the themes and template polishing 2016-02-08 23:15:20 +01:00
rabuzarus
991cbd604a contact-edit-actions-button: initial commit 2016-02-08 01:56:15 +01:00
fabrixxm
102c06a41f fix error in template in notifications page 2016-02-07 14:29:07 +01:00
fabrixxm
d6cf791677 Merge pull request #2324 from rabuzarus/0502_vier_dark
vier: some consistency fixes for the dark scheme
2016-02-07 09:53:24 +01:00
fabrixxm
ecfb6ec924 Merge pull request #2313 from rabuzarus/0302_forum_class
forums.php is now ForumManager.php and providing class ForumManager
2016-02-07 09:28:50 +01:00
rabuzarus
95819684c2 Merge develop into 0502_vier_dark
Conflicts:
	view/theme/vier/dark.css
2016-02-06 13:09:41 +01:00
rabuzarus
0bccfea596 vier: some consistency fixes for the dark scheme 2016-02-06 00:54:50 +01:00
rabuzarus
bcf1020635 vier smileybutton: dark.css insert new line at the end of the file 2016-02-05 21:38:55 +01:00
rabuzarus
9fd3d8116b vier smileybutton: little polish in dark.css 2016-02-05 21:30:31 +01:00
rabuzarus
41405ed0f2 vier: display smiley-preview as inline-block - needs addons update 2016-02-05 21:24:01 +01:00
Tobias Diekershoff
8bca68c77c Merge pull request #2317 from rabuzarus/0402_vier_mobile_textarea
vier: remove some hardcoded css to be more mobile friendly
2016-02-05 06:57:07 +01:00
Tobias Diekershoff
437784b7bb Merge pull request #2318 from annando/1602-vier-font
Vier: The font "system" can make the system look ugly
2016-02-05 06:56:26 +01:00
Michael Vogel
b85369a03b Vier: The font "system" can make the system look ugly 2016-02-04 18:58:33 +01:00
rabuzarus
a75be65860 vier: little float fix 2016-02-04 16:45:39 +01:00
rabuzarus
12c6ba9081 vier: remove some hardcoded css to be more mobile friendly 2016-02-04 16:21:40 +01:00
rabuzarus
52dbb0b4a2 Forum class - rename Class CamelCase and rename some methods 2016-02-04 14:51:54 +01:00
rabuzarus
9a54afa629 Forum class - rename Class CamelCase and rename some methods 2016-02-04 14:47:20 +01:00
fabrixxm
e11ff25de2 fix empty ACL window on desktop 2016-02-03 23:22:45 +01:00
rabuzarus
c1070e4655 forums.php is now forum.php and providing class forum 2016-02-03 18:05:26 +01:00
Fabrixxm
f21e3e46c7 Vier mobile: better jot buttons on small screens 2016-02-03 15:01:24 +01:00
Fabrixxm
1ddae21cff Vier mobile: fix content width, events style, oembed 2016-02-03 14:48:46 +01:00
Fabrixxm
3c6ebfa5a9 Vier - mobile friendly ACL window and form fields 2016-02-03 14:03:00 +01:00
Tobias Diekershoff
f0912d6219 Merge pull request #2310 from rabuzarus/0302_vier_photo
vier: use object-fit: cover for recent photos view
2016-02-03 07:07:38 +01:00
rabuzarus
58c1f9a60f vier: use object-fit: cover for recent photos view 2016-02-03 03:59:42 +01:00
rabuzarus
ad5be2901e rework autocomplete: some styling if contact is forum 2016-02-03 00:25:33 +01:00
rabuzarus
aee94b38c1 rework autocomplete: add class dir and static function 2016-02-01 18:21:29 +01:00
Tobias Diekershoff
447ed7af53 IT update to the strings 2016-01-31 12:02:05 +01:00
rabuzarus
162f754e2d Merge develop into 1901_autocomplete 2016-01-30 16:57:54 +01:00
rabuzarus
8e0f04026c vier: some fixes for mobile view 2016-01-30 01:53:21 +01:00
Michael Vogel
4208acf4b6 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn 2016-01-25 23:51:11 +01:00
Tobias Diekershoff
d395959e41 DE update to the strings 2016-01-25 07:13:29 +01:00
rabuzarus
d0ade828c0 rework autocomplete: some cleanup and docu 2016-01-24 19:56:23 +01:00
Michael Vogel
f38f1806c1 We don't need these templates anymore 2016-01-24 08:22:09 +01:00
rabuzarus
39a849c113 rework autocomplete: new ac for poke, contacts, prv_messages 2016-01-22 17:47:48 +01:00
Tobias Diekershoff
6174017048 Merge pull request #2275 from rabuzarus/2101_event_reminder
fix events_reminder popup
2016-01-21 16:18:36 +01:00
rabuzarus
03bef2c8f8 fix events_reminder popup 2016-01-21 13:44:38 +01:00
rabuzarus
e3475bd587 rework autocomplete: css work 2016-01-21 13:28:29 +01:00
Tobias Diekershoff
c012017023 DE update to the strings 2016-01-21 11:56:19 +01:00
Tobias Diekershoff
f635e81d94 NL update to the strings THX Dasrakel 2016-01-20 17:54:40 +01:00
rabuzarus
16e4e94b29 rework autocomplete: initial commit 2016-01-19 18:11:40 +01:00
fabrixxm
a1eb7a8791 Merge pull request #2266 from tobiasd/20160119-de
DE update to the strings
2016-01-19 13:47:43 +01:00
Tobias Diekershoff
fe6d8ecd1c DE update to the strings 2016-01-19 10:55:55 +01:00
Tobias Diekershoff
846153d388 some beautification to the template code 2016-01-19 07:20:07 +01:00
Michael Vogel
32c7896c5d Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-18 18:49:04 +01:00
Tobias Diekershoff
c6f0333026 moved some CSS stuff from the template to global.css 2016-01-18 13:22:07 +01:00
Michael Vogel
6c7cf2a766 Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-18 00:53:18 +01:00
Michael Vogel
36ba415df3 Merge pull request #2257 from rabuzarus/locked_features_united
feature management for admins
2016-01-18 00:51:50 +01:00
Tobias Diekershoff
98be92f48c DE update to the strings 2016-01-17 22:25:05 +01:00
rabuzarus
f428635682 vier: add missing forumlist_profile 2016-01-17 15:54:58 +01:00
rabuzarus
c1ed2bd975 feature management for admins: Merge branch 'devolop' 2016-01-17 03:25:17 +01:00
Michael Vogel
228ce9e27e Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-16 17:39:45 +01:00
Tobias Diekershoff
75f0053550 forgot the template 2016-01-16 13:57:40 +01:00
Tobias Diekershoff
20fe67f378 removed remote update functionality from admin panel 2016-01-16 11:52:21 +01:00
Michael Vogel
90a8d6f0f5 Several performance improvements 2016-01-15 23:27:25 +01:00
Tobias Diekershoff
629c69d9dd only show the reload link if plugins are found 2016-01-15 19:35:45 +01:00
Tobias Diekershoff
7a7ffb2299 issue 2240 when no addon are installed hint the location of sources in the admin panel 2016-01-15 18:19:22 +01:00
Tobias Diekershoff
5099f43c42 only show platforms with counts > 0 2016-01-15 18:19:22 +01:00
Tobias Diekershoff
8e7d53cd41 added Chart.js 1.0.2 to friendica library and use it instead of CDN version for graphs 2016-01-15 18:19:21 +01:00
Tobias Diekershoff
0d5fed5b3b beautification of HTML code 2016-01-15 18:19:21 +01:00
Tobias Diekershoff
0a5c9e96a8 moved viewing of friendica logs into a separate subpage, thus created a new template 2016-01-15 18:19:21 +01:00
Tobias Diekershoff
ddb17d36a2 added PHP logging hint fields to the template 2016-01-15 18:19:21 +01:00
Tobias Diekershoff
c1aa668fef add log viewer to the aside menu of the admin panel 2016-01-15 18:19:21 +01:00
Tobias Diekershoff
4af584cec2 small fix for the ShaShape font 2016-01-15 18:19:20 +01:00
Tobias Diekershoff
a4104d7c17 1st stuff for federation stats in the admin panel 2016-01-15 18:19:19 +01:00
fabrixxm
f4173d1764 Merge pull request #2244 from annando/1601-gcontact-total
Global contacts are now playing a central role
2016-01-14 10:14:52 +01:00
rabuzarus
556f76de01 vier: mobile view - fix word breaking 2016-01-13 19:56:21 +01:00
Michael Vogel
885dc1df81 gcontact update script, rebuilt follow page, query speedup for community and network groups 2016-01-10 09:19:00 +01:00
fabrixxm
fcf7a791f1 Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget"
This reverts commit 83e54f70d3, reversing
changes made to ecf576bdd0.
2016-01-04 11:46:19 +01:00
fabrixxm
83e54f70d3 Merge pull request #2223 from rabuzarus/2912_photo_widget
photo aside widget for profile page
2016-01-04 10:06:07 +01:00
Michael Vogel
771d0c4bfa Merge pull request #2224 from rabuzarus/2812_js_scrollbars
Since we can easily remove it, we can accept this - and change it back if we need to. I haven't check accessibility - but this can be done later.
2016-01-03 14:09:17 +01:00
Tobias Diekershoff
680f1073cb Typo in DE translations 2016-01-03 12:57:42 +01:00
fabrixxm
907d20940a Merge pull request #2221 from rabuzarus/2812_vier_mobile_icons
vier: make TopNavBar mobile friendly
2015-12-31 09:38:27 +01:00
Tobias Diekershoff
ab5d0aa5e6 DE update to the strings 2015-12-31 07:32:15 +01:00
Tobias Diekershoff
6961fa636a FR update to the strings 2015-12-30 08:55:59 +01:00
rabuzarus
f8256fc53b make perfect scrollbars work with quattro 2015-12-30 03:12:52 +01:00
rabuzarus
89c0a8f8a8 vier: remove double available accesskeys 2015-12-30 00:48:11 +01:00
rabuzarus
3366e530cd photo aside widget: little polish 2015-12-30 00:37:24 +01:00
rabuzarus
20fbf670db photo aside widget for profile page 2015-12-30 00:26:50 +01:00
Michael Vogel
b41ab85feb Merge pull request #2220 from rabuzarus/2812_notify_menu
vier: some visual work on the notification menu
2015-12-29 14:31:41 +01:00
rabuzarus
871fb609d4 vier: add missing clear divs to right aside 2015-12-29 02:01:17 +01:00
rabuzarus
51a8864519 vier: make TopNavBar mobile friendly 2015-12-29 00:23:59 +01:00
rabuzarus
e93156427e use perfect-scrollbars for nav-notifications-menu (and in vier aside) 2015-12-28 23:16:34 +01:00
rabuzarus
43d35315db vier nav-notification-menu: further polishing 2015-12-28 22:04:54 +01:00
rabuzarus
c7d2d95705 vier nav-notification-menu: small cleanup 2015-12-28 20:52:11 +01:00
rabuzarus
093a3e6742 some work on vier nav-notification-menu 2015-12-28 20:40:04 +01:00
Tobias Diekershoff
99861b9fa6 Merge pull request #2216 from fabrixxm/feature-api-like
Works on API and a small refractor, updated docs
2015-12-28 18:39:21 +01:00
fabrixxm
6da04d16bd get rid of unwanted <br>s in items with oembed
fix video thumbnail in quattro, vier, duepuntozero themes
2015-12-28 18:07:31 +01:00
Michael Vogel
9d83892151 Merge pull request #2215 from rabuzarus/2812_vier_mobile_fix
vier: fix for 2205
2015-12-28 10:41:39 +01:00
fabrixxm
696fe53d8f sizes links in xml output of api/frienidca/photo is an array 2015-12-28 10:23:06 +01:00
fabrixxm
6b60560ea2 Changes in api
- Api functions can define an HTTP method to use to call them. "405 Method Not Allowed" is returned on error
- Api function that modify data accepts only POST as method.
- A list of HTTP return code related exception is added
- Api functions throw HTTP exceptions instead of return false or die()
- api_call() catches HTTP exceptions and return error message with corret HTTP response code
- api_format_items() returns also item activities count (# of like/dislike etc)
- api/friendica/photos/list return more info about photos. xml format added.
- api/friendica/photo/detail return more info, links to all sizes, no data except if 'size' parameter is passed. xml format added.
- new api api/friendica/activity/<verb> and api/friendica/activity/un<verb> to add or remove like/dislike/attend status
2015-12-28 10:23:06 +01:00
rabuzarus
e68fcc146a vier: fix for 2205 2015-12-28 04:57:49 +01:00
Michael Vogel
8b25f51116 XRD now should react more like an OStatus server 2015-12-28 01:04:14 +01:00
Fabrixxm
d4dd863b4b quattro: style managed unread notification 2015-12-21 16:19:56 +01:00
Fabrixxm
b79d98aea5 quattro: fix PM aside template
errors was raised with new "show message list in aside" patch
2015-12-21 09:43:10 +01:00
Tobias Diekershoff
719989249f FR: update to the translation 2015-12-17 08:27:02 +01:00
rabuzarus
19a72b30b4 vier: fix missing icons 2015-12-15 15:13:46 +01:00
Tobias Diekershoff
9640eb7c81 IT update to the strings 2015-12-14 16:56:40 +01:00
Tobias Diekershoff
053b69eee4 FR update to the strings 2015-12-14 16:30:28 +01:00
Tobias Diekershoff
e97a6dfb77 DE update to the strings 2015-12-14 16:27:00 +01:00
fabrixxm
5b5b942325 Merge pull request #2172 from tobiasd/20151212-frosticons
added event icons from frost-mobile to frost
2015-12-13 09:21:03 +01:00
Tobias Diekershoff
4a7d6eb13c resized icons to 16px 2015-12-13 08:09:53 +01:00
Michael Vogel
ec9b1b7afd There is now a fragmentation level for the table optimisation 2015-12-12 17:46:24 +01:00
Tobias Diekershoff
a7b37faafd added event icons from frost-mobile to frost 2015-12-12 06:23:54 +01:00
fabrixxm
8d1af68f44 missing frost-mobile event icons 2015-12-11 19:38:00 +01:00
Michael Vogel
6bd23721c2 Merge pull request #2169 from tobiasd/20151211-FR
update to the French translation
2015-12-11 11:23:49 +01:00
Tobias Diekershoff
5f27f509cb Merge pull request #2167 from annando/1512-profile-aside
Sometimes there wasn't a linebreak before the address in the profile
2015-12-11 08:10:23 +01:00
Tobias Diekershoff
36769d77eb FR update to the strings THX Perig 2015-12-11 08:03:09 +01:00
Michael Vogel
138d745f5e Sometimes there wasn't a linebreak before the address in the profile 2015-12-10 21:39:44 +01:00
Michael Vogel
1e0f26da8d Merge pull request #2166 from rabuzarus/1012_vier-forum
vier: fix little misspelling
2015-12-10 21:19:16 +01:00
rabuzarus
776cbe4a37 vier: fix little misspelling 2015-12-10 13:30:11 +01:00
Michael Vogel
59b2bde9a7 Do a linebreak before the output of rendertime 2015-12-08 19:41:27 +01:00
Michael Vogel
1fb636ba1e Vier: The line-height seems to make problems with windows 2015-12-07 21:45:33 +01:00
Michael Vogel
01c9d13927 Issue 1871: Show an information if a group is empty 2015-12-05 23:29:42 +01:00
Tobias Diekershoff
f849ff0155 SV messages.po regenerated from strings.php 2015-12-04 21:31:33 +01:00
fabrixxm
38d46b164a quattro: some love to events pages 2015-12-04 20:43:35 +01:00
fabrixxm
f739fdc517 Quattro: Rss icon for atom feed link in profile 2015-12-04 19:57:19 +01:00
fabrixxm
f44846555a quattro: hide acl button in edit post
fix #1780
2015-12-04 19:29:13 +01:00
Fabrixxm
ddbba521c5 Add support for attending an event to frost themes
fix #1953
2015-12-04 15:01:46 +01:00
Michael Vogel
1a170c8743 Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
Conflicts:
	mod/contacts.php
	mod/crepair.php
2015-12-03 14:38:04 +01:00
Michael Vogel
1f9644bded Merge pull request #2131 from rabuzarus/3011_hcard_vcard
unify hcard and vcard
2015-12-03 14:16:52 +01:00
rabuzarus
1d6d9d3d24 photos-albms widget: add some classes 2015-12-01 21:07:05 +01:00
rabuzarus
cd7ec72b20 unify hcard and vcard: make $pdesc available in hcard&vcard 2015-12-01 19:47:23 +01:00
rabuzarus
39b37281a7 Merge develop into 3011_hcard_vcard 2015-12-01 18:34:13 +01:00
rabuzarus
89c5989cfb unify hcard and vcard 2015-12-01 18:31:08 +01:00
Michael Vogel
06a4b0dc5e Header removed in the contact area 2015-12-01 18:21:05 +01:00
Michael Vogel
fe900ac576 Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework 2015-12-01 17:16:31 +01:00
Michael Vogel
6910604ffb Merge pull request #2125 from rabuzarus/2911_event_template
vier event_form: include bb-tags for editing
2015-12-01 17:13:46 +01:00
Tobias Diekershoff
91bac8a6e0 DE translations THX Abrax 2015-12-01 13:56:23 +01:00
Michael Vogel
1c93729c46 Tab is added to "all friends" and "common friends" 2015-12-01 08:12:05 +01:00
rabuzarus
39b85c8486 vier event_form: include bb-tags for editing 2015-11-30 16:00:41 +01:00
fabrixxm
2753e62483 Merge pull request #2119 from annando/1511-contact-evolution
Refurbished contact settings/contact posts
2015-11-30 14:45:23 +01:00
fabrixxm
a60b702df1 Merge pull request #2113 from annando/1511-manage-notifications
The manage page now shows the notifications
2015-11-30 12:04:53 +01:00
Michael Vogel
4efb6c6f79 Merge pull request #2120 from rabuzarus/2911_network_header
2911 network header
2015-11-30 08:30:34 +01:00
rabuzarus
a6aac8f950 networkheader: do css work the other supported themes 2015-11-30 01:24:22 +01:00
Michael Vogel
42d903dd68 Redesign of the contact pages, new tab for contact statuses 2015-11-29 23:22:05 +01:00
Tobias Diekershoff
f45a8f1a03 Merge pull request #2106 from annando/1511-ostatus-bookmark-design
Small OStatus changes
2015-11-29 23:19:12 +01:00
Michael Vogel
5649e9e193 The contact page now contains more data 2015-11-29 17:04:48 +01:00
rabuzarus
70860e5836 new_event: default size of textfields 2015-11-29 16:16:18 +01:00
Tobias Diekershoff
ba441789b9 followup for #2110 putting the styling in less file and recompile css 2015-11-29 11:18:32 +01:00
Michael Vogel
583a2f709b Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design 2015-11-29 10:25:44 +01:00
Tobias Diekershoff
be40fb8186 Merge pull request #2110 from annando/1511-subscribe-feed
Issue 1779: Atom feed link under the connect link on the profile page
2015-11-29 08:40:39 +01:00
rabuzarus
1a0cb99d56 redesign the network page header when cid selected 2015-11-29 04:57:42 +01:00
rabuzarus
f5597da059 forumlist - mark selected forum as selected 2015-11-28 23:52:12 +01:00
Michael Vogel
58a261a29a Other themes are now supported as well 2015-11-28 23:18:01 +01:00
Michael Vogel
3067663909 The manage page now shows the unread notifications 2015-11-28 22:56:48 +01:00
rabuzarus
a3059d02d4 group_side - unify look with forumlist 2015-11-28 20:09:28 +01:00
Michael Vogel
388847e1f3 Issue 1779: There is now an atom feed link under the connect link on the profile page 2015-11-28 18:11:34 +01:00
Michael Vogel
679ce3243e Admin settings for table optimisation 2015-11-28 16:35:16 +01:00
Michael Vogel
3b6d3d1ade Merge pull request #2099 from rabuzarus/2611_new_user_addr
generate addr for new registered users
2015-11-27 21:35:46 +01:00
rabuzarus
620299dc25 include friendica address in hcard 2015-11-26 17:46:38 +01:00
rabuzarus
ddf3589fc5 count unread forum items for forumlist widget (ping.php) 2015-11-24 22:14:26 +01:00
Tobias Diekershoff
1f583c9657 NL update to the strings, thx Ralph 2015-11-19 07:30:27 +01:00
Michael Vogel
41fe07e128 Merge remote-tracking branch 'upstream/develop' into 1511-forumlist-fix 2015-11-17 21:34:01 +01:00
Michael Vogel
edb303d44a Merge pull request #2086 from rabuzarus/0711_forumlist
0711 forumlist
2015-11-17 21:33:25 +01:00
rabuzarus
a07a0fd1d7 forumlist: fix id conflict and js show-more 2015-11-17 20:57:12 +01:00
Michael Vogel
5a1f763de0 The mobile.css seems to only work for mobiles at the moment. 2015-11-17 20:39:30 +01:00
Michael Vogel
a9444ec774 The mobile.css was commented out ... 2015-11-17 20:11:06 +01:00
Michael Vogel
4b21512f56 This is a quick fix for the the forumlist. 2015-11-17 19:56:32 +01:00
Michael Vogel
e43c7a4447 Merge pull request #2061 from rabuzarus/0711_forumlist
move forumlist addon to core
2015-11-17 08:46:15 +01:00
Fabrixxm
0a9e017d34 Installer use static css, fix #2071 2015-11-13 10:56:06 +01:00
fabrixxm
c81f63a5b3 vier mobile: prefixed transition in css, mobile-related javascript only on mobile 2015-11-12 09:41:04 +01:00
fabrixxm
54460bdf35 fix tab icon padding 2015-11-12 09:41:04 +01:00
fabrixxm
b3e09b817f fix menu icon, add icon to tab 2015-11-12 09:40:28 +01:00
fabrixxm
e5edd7b7db mobile friendly tabs 2015-11-12 09:40:28 +01:00
Tobias Diekershoff
c687069709 Merge pull request #2068 from annando/1511-vier-mobile-aside
Vier-Mobile: The left menu does now appears even when scrolled down
2015-11-12 09:09:28 +01:00
Michael Vogel
31c44bd398 Vier: The left menu does now appear reliably even if the user had scrolled down. 2015-11-12 08:57:57 +01:00
rabuzarus
902735f6d4 forumlist: dbupdate 2015-11-11 23:39:14 +01:00
rabuzarus
988d0327ae forumlist: forgot some required_once for plugin_enabled() 2015-11-11 21:37:16 +01:00
rabuzarus
215205d376 forumlist: nodeinfo_plugin_enabled() is now plugin_enabled() 2015-11-11 21:31:26 +01:00
Michael Vogel
37c68f6548 Merge pull request #2065 from tobiasd/20151110-shashape
ShaShape iconset
2015-11-10 21:55:15 +01:00
Michael Vogel
a320805bd9 Merge pull request #2064 from tobiasd/20151110-de
update to the DE translation by Abrax
2015-11-10 21:53:06 +01:00
Tobias Diekershoff
d6ac6aa615 updated the CSS file for the ShaShape iconset 2015-11-10 20:34:21 +01:00
Tobias Diekershoff
835e6c4955 new version of the ShaShape iconset 2015-11-10 20:12:16 +01:00
Tobias Diekershoff
37e1c916db update to the DE translation by Abrax 2015-11-10 20:02:19 +01:00
Michael Vogel
cba2a8b64b Vier: Make it look more beautiful under Linux 2015-11-10 16:25:36 +01:00
rabuzarus
abf9ebd466 forumlist: small fix 2015-11-10 12:53:56 +01:00
rabuzarus
96b764425e move forumlist addon to core 2015-11-09 15:56:20 +01:00
fabrixxm
df866253b0 aside bar as menu in mobile 2015-11-08 19:08:00 +01:00
fabrixxm
c700a6fb37 duepuntozero, vier: add unread messages per group 2015-11-08 18:02:04 +01:00
fabrixxm
3c1127e613 remove debug code 2015-11-08 17:04:39 +01:00
fabrixxm
d522d7095d quattro: add unread message count per groups 2015-11-08 16:55:44 +01:00
Tobias Diekershoff
631afe5810 Merge pull request #2035 from FlxAlbroscheit/develop
Preview the last 5 conversations in message-sidebar
2015-11-08 16:03:04 +01:00
fabrixxm
ae9c9829fa Remove language selectors from themes
This is now a user setting
2015-11-08 14:42:54 +01:00
fabrixxm
fb3ac68cc0 Add user language in settings, use that field as language for UI 2015-11-08 14:23:49 +01:00
fabrixxm
e74916d395 Merge pull request #2042 from tobiasd/develop
some icons were added to the ShaShape iconset
2015-11-08 12:44:44 +01:00
Tobias Diekershoff
4b9fa3fb7e some icons were added to the ShaShape iconset 2015-11-08 12:33:48 +01:00
fabrixxm
0363bab040 js: add new Dialog object
The Dialog is used by code to show urls in colorbox.
Templates can overwrite `show()` function to change its behaviour
2015-11-08 12:01:19 +01:00
FlxAlbroscheit
06676e7c1b Preview last five conversations in message-sidebar 2015-11-07 18:57:40 +01:00
FlxAlbroscheit
1b2349d011 Preview last five conversations in message-sidebar 2015-11-07 18:56:05 +01:00
FlxAlbroscheit
a8c033a7f6 Preview last five conversations in message-sidebar 2015-11-07 18:55:13 +01:00
FlxAlbroscheit
603dad93f3 Preview last five conversations in message-sidebar 2015-11-07 18:54:20 +01:00
Tobias Diekershoff
b3e3149e50 wrong filename 2015-11-07 16:30:31 +01:00
Tobias Diekershoff
f2013951a9 wrong filename 2015-11-07 16:28:31 +01:00
Tobias Diekershoff
0c6097fbcd initial commit of the ShaShape iconset by Andi Stadler 2015-11-07 16:24:22 +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
0f563525bd Optical adjustments for contacts/set "last_failure" when inaccessible 2015-11-06 09:15:20 +01:00
Michael Vogel
0f41f35041 The contact template now displays the address if available 2015-11-06 00:47:54 +01:00
Michael Vogel
5b2e1188c0 Vier: Network name, "ago" and the quote description are now smaller when mobile. 2015-11-04 00:07:05 +01:00
Michael Vogel
546fd6cbbe Merge remote-tracking branch 'upstream/develop' into 1511-vier-mobile2 2015-11-03 23:56:57 +01:00
Michael Vogel
3b11436b02 Merge pull request #1989 from rabuzarus/allfriends
template-rework: let common friends and allfriends use viewcontact_te…
2015-11-03 23:27:24 +01:00
Michael Vogel
451b07cfe7 Mobile should be better now 2015-11-03 23:11:36 +01:00
Michael Vogel
eff6f3a57d On small computers the stylesheet changed to mobile by accident. 2015-11-03 19:14:28 +01:00
rabuzarus
e785759a8b template-rework:make use of get_contact_details_by_url() 2015-11-03 14:31:15 +01:00
Michael Vogel
e3fdb33df0 Vier: Added the credits to the pages without left sidebar 2015-11-03 01:19:22 +01:00
Michael Vogel
1831066259 Vier is now a little bit more mobile ready. 2015-11-02 23:12:09 +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
6a53e3959f Vier: The different styles are now working with the right menubar 2015-11-01 09:45:02 +01:00
Michael Vogel
2f47d63a29 Merge pull request #2000 from tobiasd/20151027-credits
a credits page
2015-10-31 22:34:30 +01:00
Tobias Diekershoff
c00847a79d use section_title.tpl for page title 2015-10-30 18:05:45 +01:00
rabuzarus
f0f3360c4b vier: include private forums in forum widget 2015-10-29 15:34:55 +01:00
Tobias Diekershoff
a48156aab6 display names listed in credits.txt from /credits 2015-10-29 08:48:41 +01:00
Tobias Diekershoff
dff1a73bd3 basic styling of the credits list 2015-10-29 08:48:41 +01:00
Michael Vogel
5a58f55a36 Set the maximum avatar size to 80 pixels 2015-10-28 00:18:56 +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
Tobias Diekershoff
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
Tobias Diekershoff
11a7eb8d8f Merge pull request #1985 from annando/1510-vier-optimize-touch
Vier: The usability with a touch device is improved
2015-10-27 08:59:47 +01:00
Tobias Diekershoff
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
Michael Vogel
ac744b61f9 Some small optical and structural changes to the manage template 2015-10-26 08:16:37 +01:00
Michael Vogel
4f9ec8efac Vier: The usability with a touch device is improved 2015-10-25 21:01:39 +01:00
rabuzarus
4c263aa4ac Merge develop into manage
Conflicts:
	view/global.css
2015-10-25 16:57:04 +01:00
Tobias Diekershoff
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
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
5b93bff6da poke template: make use of global.css 2015-10-25 14:40:56 +01:00
rabuzarus
e0e6762ed8 some inital work to have profile pics on manage page 2015-10-25 14:00:08 +01:00
Michael Vogel
4631c13d08 Profile data are now reduced to only the most important fields 2015-10-25 09:15:36 +01:00
rabuzarus
8f92b6eea4 some work on poke template 2015-10-24 19:51:58 +02:00
rabuzarus
eb33698556 some minor changes in crepair.tpl 2015-10-24 16:01:55 +02:00
rabuzarus
ea2b3b2f76 move html from crepair.php to template 2015-10-24 15:57:46 +02:00
rabuzarus
442d59abc4 template rework: multi-row view for the other themes 2015-10-23 21:45:16 +02:00
rabuzarus
86f94570ef template rework: delete unused templates 2015-10-23 16:49:12 +02:00
rabuzarus
b6cceda131 template rework: revert commit because plugin community home uses the css classes 2015-10-23 15:41:49 +02:00
rabuzarus
7c9df68964 template rework: revert #b2bb600 for vier (is needed for right sidebar) 2015-10-23 15:23:00 +02:00
rabuzarus
fad8ebc355 template rework: two row contact page for vier 2015-10-23 15:18:05 +02:00
rabuzarus
efb12aed20 template rework: little theme specific changes (frost, quattro) 2015-10-23 01:32:03 +02:00
rabuzarus
b2bb600f3a template rework: delete unused css 2015-10-23 01:04:47 +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
4c1c614fa6 Merge viewcontact into template_rework 2015-10-17 22:28:09 +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
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
6d559bf8a9 viewcontact: use section_title.tpl as headding 2015-10-17 21:40:41 +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
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
Tobias Diekershoff
a961c29d05 Merge pull request #1962 from annando/1510-attend-vier
Vier: Some small changes in the template for events
2015-10-14 06:42:50 +02:00
Michael Vogel
66ea33623b Vier: Some small changes in the template for events 2015-10-13 20:15:01 +02:00
Tobias Diekershoff
db14dc13c3 DE: update to the strings 2015-10-13 17:35:08 +02:00
Tobias Diekershoff
1df5a7212b DE: translation of the attend strings THX to Abrax 2015-10-13 17:06:35 +02:00
Tobias Diekershoff
154c55b36e Merge pull request #1957 from fabrixxm/duepuntozeroattend
attend functionality for duepuntozero
2015-10-12 21:16:40 +02:00
fabrixxm
fd8e8d005a attend functionality for duepuntozero 2015-10-12 20:09:33 +02:00
fabrixxm
735755aa0e Merge pull request #1956 from tobiasd/20151012-de
DE Update to the translation, thx Abrax
2015-10-12 19:04:51 +02:00
Tobias Diekershoff
5839242792 DE Update to the translation, thx Abrax 2015-10-12 18:08:11 +02:00
Tobias Diekershoff
da8c81a12e cleanup forgotten lines 2015-10-12 15:58:34 +02:00
Tobias Diekershoff
3debdf0a91 attend functionality for quattro theme (part of #1953) 2015-10-12 15:34:18 +02:00
Tobias Diekershoff
ce03ccc95c Merge pull request #1929 from rabuzarus/event-attendance
port of reds event attendance feature
2015-10-12 15:10:03 +02:00
Michael Vogel
adba75600a Vier: Support for the new IFTTT addon. 2015-10-11 23:36:23 +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
efbdb57f92 Reworked contact relations between Friendica and Diaspora 2015-10-10 11:06:18 +02:00
Tobias Diekershoff
26983bafff Merge pull request #1944 from annando/1510-proxy-picture-size
Picture size and bugfix for contact names with "<" and ">"
2015-10-08 08:03:42 +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
Tobias Diekershoff
b4ec07ab27 IT: update to the strings 2015-10-07 06:20:54 +02:00
Michael Vogel
607817d1b3 Vier: Avoid an error when calling the admin settings of "vier" when "vier" is not activated. 2015-10-05 17:38:57 +02:00
Michael Vogel
d3ac3f8490 Added the contact menu to the search as well. 2015-10-05 08:08:59 +02:00
Michael Vogel
72ecb9e67b Bugfix: Repairing a contact was more like killing the contact ... 2015-10-04 19:39:55 +02:00
Tobias Diekershoff
9f68676db6 Merge pull request #1934 from annando/1510-better-notification
Let the notification look more like the follow dialog
2015-10-04 17:49:02 +02:00
Michael Vogel
4003b9cc5d Let the notification look more like the follow dialog 2015-10-04 17:18:58 +02:00
Tobias Diekershoff
e1f3f2bc6c Merge pull request #1933 from annando/1510-follow-more-data
Show more information when following a new contact
2015-10-04 17:02:27 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
01d38a353c DE update to the translation 2015-10-04 09:23:58 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
4db21f85c4 DE, ES, IT: update to the translations 2015-09-01 15:12:09 +02:00
Tobias Diekershoff
32c063b9a5 IT update to the translations 2015-08-31 19:02:12 +02:00
Tobias Diekershoff
3665ab3de0 FR update to the translations 2015-08-31 19:01:56 +02:00
Tobias Diekershoff
fe5a5c72f5 ES update to the translations 2015-08-31 19:01:42 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
cc145f0e25 Merge pull request #1850 from tobiasd/20150824-de
DE updated translation
2015-08-24 14:27:13 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
b67adebd9c DE update to the strings 2015-08-17 12:02:03 +02:00
Tobias Diekershoff
621dec1606 reconstruct the description for more flexible translations 2015-08-17 07:20:50 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
5013e5daf1 use to link to queue inspector 2015-08-12 19:58:53 +02:00
Tobias Diekershoff
f439ac47c4 admin panel: inspect queue 2015-08-12 15:44:59 +02:00
Tobias Diekershoff
6b93325f70 make Inspect Queue link visible in admin adide menu 2015-08-12 15:44:03 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
26ec1fbf34 FR: update to the translations 2015-08-05 07:11:39 +02:00
Tobias Diekershoff
43b2e69421 DE: update of the translation 2015-08-04 08:06:49 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
bbd2e4abc1 make the 'noshare' checkbox checked by default for photo upload 2015-07-17 17:05:55 +02:00
Tobias Diekershoff
ba790def22 NL update to the strings 2015-07-14 16:31:45 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
a54dd8a9db DE: update to the strings 2015-07-13 08:14:00 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
b8f99f459b DE update to the strings 2015-06-30 09:45:05 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
a9fa049659 DE update to the strings 2015-05-22 16:58:16 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
d4cb18538e PT-BR: update to the strings 2015-05-16 07:41:40 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
e9dd3b38f3 DE update to the strings 2015-04-25 11:18:30 +02:00
Tobias Diekershoff
14d61b5644 FR update of the strings 2015-04-14 13:41:56 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
7ecc401b5c FR update of the strings 2015-04-07 09:07:04 +02:00
Tobias Diekershoff
52549dae7b CS update to the strings 2015-04-07 09:00:12 +02:00
Tobias Diekershoff
106b0b5d23 Merge pull request #1460 from FlxAlbroscheit/develop
Issue 1163: Feature allowing desktop-notifications
2015-04-05 11:37:05 +02:00
Tobias Diekershoff
415960a31a DE update to the strings 2015-04-02 21:34:59 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
0309c481a3 updating the core translation 2015-03-30 09:21:01 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
e3b6770ad4 CS, ZH-CN: update to the strings 2015-02-12 07:59:21 +01:00
Tobias Diekershoff
400e11fd9f ZH-CN update to the strings 2015-02-10 07:47:26 +01:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
18cfb5e726 Merge pull request #1377 from tobiasd/20150209cs
CS update to the strings
2015-02-09 08:45:48 +01:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
cea445de2e FR update for the strings 2015-02-08 10:44:47 +01:00
Tobias Diekershoff
5aba3abfc1 CS DE FR: update to the strings 2015-02-05 11:06:23 +01:00
Tobias Diekershoff
485432e734 FR: some more updates to the strings 2015-02-04 11:54:13 +01:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
a33ca89bb7 adding missing styling to the ignore button in quattro 2015-01-24 07:22:55 +01:00
Tobias Diekershoff
c5b8956730 FR update to the strings 2015-01-24 07:05:55 +01:00
Tobias Diekershoff
619f2a86f3 DE update to the strings 2015-01-24 07:05:42 +01:00
Tobias Diekershoff
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
Tobias Diekershoff
c5200f9327 profile edit homepage field type URL 2015-01-19 08:15:20 +01:00
Tobias Diekershoff
d58bac1138 template for password now support required and autofocus 2015-01-16 19:36:09 +01:00
Tobias Diekershoff
8b20af6ef5 template for input fields now supports required, autofocus and types email, url 2015-01-16 19:31:23 +01:00
Tobias Diekershoff
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
Tobias Diekershoff
b0ffe11b21 add thread un/ignore functionality to quattro theme 2015-01-05 09:05:27 +01:00
Tobias Diekershoff
882f9c83d6 FR update to the strings 2015-01-02 08:26:08 +01:00
Tobias Diekershoff
32400f5127 FR IT update to the strings 2014-12-31 12:41:00 +01:00
Tobias Diekershoff
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
tobiasd
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
5c316fa541 RO: update to the strings 2014-10-09 17:59:27 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
a9782251e5 updating config files for duepuntozero 2014-09-07 14:00:09 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
0989ad335f added purplezero to duepunto as variation 2014-09-07 13:41:02 +02:00
Tobias Diekershoff
22d0190041 revive easterbunny from the dead 2014-09-07 13:29:56 +02:00
Tobias Diekershoff
bbf22938ae added Comix as a colorset of duepuntozero 2014-09-07 13:09:02 +02:00
Tobias Diekershoff
2802402e57 added darkzero as colorset of duepuntozero 2014-09-07 13:01:23 +02:00
Tobias Diekershoff
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
tobiasd
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
tobiasd
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
tobiasd
4aa2ae488b Merge pull request #1102 from tobiasd/newstrings20140906a
updating message.po and string.php
2014-09-06 12:20:42 +02:00
Tobias Diekershoff
97a8a7b362 ZH-CN: update to the strings 2014-09-06 12:13:04 +02:00
Tobias Diekershoff
d0b1f0f5ba RO: update to the strings 2014-09-06 12:12:38 +02:00
Tobias Diekershoff
dd65b06ecf PT-BR: update to the strings 2014-09-06 12:12:19 +02:00
Tobias Diekershoff
4571670e4f PL: update to the strings 2014-09-06 12:11:59 +02:00
Tobias Diekershoff
b948dca729 NL: update to the strings 2014-09-06 12:11:44 +02:00
Tobias Diekershoff
c0e9e1849a NB-NO: update to the strings 2014-09-06 12:11:00 +02:00
Tobias Diekershoff
70031d8d3e IT: update to the strings 2014-09-06 12:10:36 +02:00
Tobias Diekershoff
414451cdad IS: update to the strings 2014-09-06 12:09:08 +02:00
Tobias Diekershoff
57f3ccc967 RU: update to the strings 2014-09-06 12:08:48 +02:00
Tobias Diekershoff
cb0a2b3d35 FR: update to the strings 2014-09-06 12:08:20 +02:00
Tobias Diekershoff
ebbaedb97d ES: update to the strings 2014-09-06 12:08:02 +02:00