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
