Commit graph

4669 commits

Author SHA1 Message Date
Michael Vogel
af42e5e481 Merge pull request #2932 from Hypolite/issue/missing-private-image-src
Fix Friendica private image URL replacing
2016-12-09 15:54:11 +01:00
Tobias Diekershoff
3512c87e64 DE, ES update to the translation 2016-12-09 12:36:28 +01:00
Hypolite Petovan
88e336b3bc Merge remote-tracking branch 'refs/remotes/origin/develop' into issue/missing-private-image-src
# Conflicts:
#	doc/htconfig.md
2016-12-07 23:15:46 -05:00
Tobias Diekershoff
a4959626ad Merge pull request #2996 from rabuzarus/20161206_-_help_doc_move_content
docu docs: some polishing
2016-12-06 22:05:08 +01:00
Michael Vogel
9457d30751 Merge pull request #2994 from tobiasd/20161206-frontendworker
add frontend worker to the admin panel and regen master messages.po file
2016-12-06 22:01:29 +01:00
Tobias Diekershoff
71cfe6db94 show some of the worker options only when the worker process is active 2016-12-06 21:47:37 +01:00
rabuzarus
b65433c823 docu docs: some polishing 2016-12-06 15:03:57 +01:00
rabuzarus
11507440ae frio: change some link behavior of user menu in the nav bar 2016-12-06 14:11:22 +01:00
Tobias Diekershoff
ac5617c40c add frontend worker to the admin panel and regen master messages.po file 2016-12-06 08:44:59 +01:00
Hypolite Petovan
979fc6d38a Add protocol whitelist for href/src attributes
- Add strict URL checker for src attributes
- Add protocol whitelist for href attributes
- Add error styling if URL fails to pass filter
- Add doc for new htconfig value
- Add emphasis to config key names in htconfig doc
2016-12-03 14:19:57 -05:00
Tobias Diekershoff
7ecc0a063c Update DE translation THX Rabuzarus 2016-12-03 10:09:40 +01:00
Michael
d49325d177 Disable richtext editor for frio - followup for #2938 2016-11-29 20:04:31 +00:00
Michael Vogel
efb2df41ba Merge pull request #2977 from rabuzarus/20161128_-_help_page_polishing
Add protocol docu to the help docs
2016-11-29 19:38:31 +01:00
Michael Vogel
9894f7cea7 Merge pull request #2965 from tobiasd/20161122-cpActiveResponse
active response
2016-11-28 21:14:42 +01:00
rabuzarus
3cb9324072 frio: some css work for help docs 2016-11-28 18:40:25 +01:00
Tobias Diekershoff
425bd83c8d Merge pull request #2974 from rabuzarus/2511_frio_fix_default_js_arg
Frio Bugfix: correct wrong use of default arg 'title' in modal.js
2016-11-25 23:29:26 +01:00
rabuzarus
5068563cf5 small code formatting correction 2016-11-25 19:18:01 +01:00
rabuzarus
a194c44de9 Frio Bugfix: correct wrong use of default arg 'title' in modal.js 2016-11-25 19:13:40 +01:00
Hypolite Petovan
fac144e3d4 Add active response support to frost theme
- Add active classes to wall_thread.tpl
- Add styles
- Fix event icon not appearing at full opacity on hover
2016-11-22 18:42:37 +01:00
Hypolite Petovan
d406b17fe0 Remove extra whitespaces 2016-11-22 16:32:43 +01:00
Hypolite Petovan
9064277bd4 Add active response support to frio theme (continued)
- Added active class to search_item.tpl
2016-11-22 16:32:14 +01:00
Hypolite Petovan
3e4781172f Add response active support to vier theme
- Add active class to wall_thread.tpl, search_item.tpl, photo_item.tpl
- Add style
Note: because of an !important in the Dark variant stylesheet, the
active links won't show up
2016-11-22 16:32:04 +01:00
Hypolite Petovan
e361536cd8 Added response active support to smoothly
- Added "self" class to wall_thread.tpl to avoid conflict with the
already existing "active" class
- Added style
2016-11-22 16:31:52 +01:00
Hypolite Petovan
92da411465 Add active response support to quattro theme
- Add active classes to wall_thread.tpl, search_item.tpl and
photo_item.tpl
- Add styles both in the master LESS file and the generated variant CSS
themes
2016-11-22 16:31:37 +01:00
Hypolite Petovan
b98f23dcd4 Added active response support to frost-mobile
- Added active class to wall_thread.tpl
- Added styles
- Fixed background-size declarations to be able to add padding to icons
2016-11-22 16:31:25 +01:00
Hypolite Petovan
065c12e652 Add active like style to duepuntozero
- Update general wall_thread.tpl
- Add specific styles for duepuntozero
2016-11-22 16:31:14 +01:00
Hypolite Petovan
a55c03896c [frio] Enable Like Rotator on posts
- Move rotator from hidden block to post header
2016-11-22 16:31:01 +01:00
Hypolite Petovan
bdc7d1b87a [frio] Add active class to responses current user holds
- Add active class when the self attribute is found
- Add CSS styling to active response links
2016-11-22 16:30:48 +01:00
Tobias Diekershoff
01b46f5ec0 ES translation of the core THX Albert 2016-11-21 18:35:17 +01:00
Tobias Diekershoff
e375517a31 DE translation of the core THX Andreas 2016-11-21 11:45:19 +01:00
Michael Vogel
b33e817586 Merge pull request #2951 from tobiasd/20161120-mysql
add MySQL warning in admin panel
2016-11-20 17:09:49 +01:00
Tobias Diekershoff
b03009d962 use an array for warnings in admin panel 2016-11-20 16:14:09 +01:00
Michael
7ad4a8ca93 The warning if a group contains members of several network types can now be supressed. 2016-11-20 12:09:18 +00:00
Michael Vogel
7ca4648ffd Merge pull request #2945 from tobiasd/20161119-admindbwarn
Show a warning message in the admin panel when MyISAM is still in use
2016-11-20 12:38:52 +01:00
Tobias Diekershoff
7aaaa0a3c7 Show a warning message in the admin panel when MyISAM is still in use 2016-11-20 09:50:14 +01:00
rabuzarus
72953cd1e1 fix indent 2016-11-20 02:07:58 +01:00
rabuzarus
cf07a4413c Bugfix: frio - use white-space: pre-wrap for code elements 2016-11-20 01:51:32 +01:00
Michael Vogel
8a62470599 Merge pull request #2939 from rabuzarus/berlin_frio_fix_match_wrapper_floating
Bugfix: float for remote-friends-in-common wrapper
2016-11-19 21:55:40 +01:00
Michael Vogel
a7a6a1a378 Merge pull request #2936 from tobiasd/20161119-issue844
Additional info in registration request
2016-11-19 21:40:02 +01:00
rabuzarus
1d8f18ff86 Bugfix: float for remote-friends-in-common wrapper 2016-11-19 21:14:28 +01:00
Tobias Diekershoff
ba24b1b651 Merge pull request #2937 from rabuzarus/1811_jot_charackter_counter
frio: add a very simple character counter to the jot
2016-11-19 19:37:41 +01:00
Tobias Diekershoff
b95bf00e89 Additional info in registration request 2016-11-19 18:22:49 +01:00
Silke Meyer
d22807e613 Removes a number of deprecated themes 2016-11-19 18:19:15 +01:00
Silke Meyer
e32a39d129 Marked themes frost and frost-mobile as unsupported 2016-11-19 18:17:21 +01:00
rabuzarus
a8d1a3f997 frio: add a very simple character counter to the jot 2016-11-18 23:48:31 +01:00
Tobias Diekershoff
7aef99a4f0 ES translation of the core THX Albert 2016-11-17 07:42:41 +01:00
rabuzarus
02a0269a67 Frio Bugfix: clear float at the end of comment-edit 2016-11-16 14:19:09 +01:00
Tobias Diekershoff
deaf82cfd0 DE translation of the core THX Andreas 2016-11-13 11:23:19 +01:00
Tobias Diekershoff
6657302602 DE translation of the core 2016-11-10 10:28:20 +01:00
Tobias Diekershoff
af214e317d ES translation of the core THX Alberto Díaz Tormo! 2016-11-10 10:27:58 +01:00
Hypolite Petovan
98d52bc568 [frio] fix wall_thread.tpl error with unstareable items 2016-11-04 21:19:07 -04:00
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