mexon/friendica
1
0
Fork 0
Code Pull requests Activity
13348 commits 5 branches 60 tags 188 MiB
Commit graph

4139 commits

Author SHA1 Message Date
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
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