clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,792 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

2233 Commits

Author SHA1 Message Date
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
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
rabuzarus 6944d67dbc photos view: fix js error with undefined variable 2016-05-13 01:26:07 +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
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
rabuzarus 7ee9c536ee fix: contact edit poll_interval wasn't submitted 2016-04-20 15:37:34 +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 d9b6355bb8 added lang info to frost themes 2016-04-03 21:00:18 +02: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 996cd8c24e The Font Awesome library is now updated, the replxy button is changed 2016-03-05 13:29:01 +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
rabuzarus 0db83b9586 contactedit-actions-button: move repair back to tabbar 2016-02-23 19:19:45 +01:00
Michael Vogel 7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +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
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
Andrej Stieben e104c58191 Added div#pause to themes' default.php 
As requested by @tobiasd and @rabuzarus.
 2016-02-09 16:41:19 +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
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
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
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 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
rabuzarus d0ade828c0 rework autocomplete: some cleanup and docu 2016-01-24 19:56:23 +01:00
rabuzarus 39a849c113 rework autocomplete: new ac for poke, contacts, prv_messages 2016-01-22 17:47:48 +01:00
rabuzarus e3475bd587 rework autocomplete: css work 2016-01-21 13:28:29 +01:00
Michael Vogel 6c7cf2a766 Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-18 00:53:18 +01:00
rabuzarus f428635682 vier: add missing forumlist_profile 2016-01-17 15:54:58 +01:00
Michael Vogel 90a8d6f0f5 Several performance improvements 2016-01-15 23:27:25 +01:00
rabuzarus 556f76de01 vier: mobile view - fix word breaking 2016-01-13 19:56:21 +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
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
rabuzarus 89c0a8f8a8 vier: remove double available accesskeys 2015-12-30 00:48:11 +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 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
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
rabuzarus e68fcc146a vier: fix for 2205 2015-12-28 04:57:49 +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
rabuzarus 19a72b30b4 vier: fix missing icons 2015-12-15 15:13:46 +01:00
Tobias Diekershoff 4a7d6eb13c resized icons to 16px 2015-12-13 08:09:53 +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 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 1fb636ba1e Vier: The line-height seems to make problems with windows 2015-12-07 21:45: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 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 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
rabuzarus 39b85c8486 vier event_form: include bb-tags for editing 2015-11-30 16:00:41 +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
Tobias Diekershoff ba441789b9 followup for #2110 putting the styling in less file and recompile css 2015-11-29 11:18:32 +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 3b6d3d1ade Merge pull request #2099 from rabuzarus/2611_new_user_addr 
generate addr for new registered users
 2015-11-27 21:35:46 +01:00
rabuzarus 620299dc25 include friendica address in hcard 2015-11-26 17:46:38 +01:00
rabuzarus ddf3589fc5 count unread forum items for forumlist widget (ping.php) 2015-11-24 22:14:26 +01:00
Michael Vogel 5a1f763de0 The mobile.css seems to only work for mobiles at the moment. 2015-11-17 20:39:30 +01:00
Michael Vogel a9444ec774 The mobile.css was commented out ... 2015-11-17 20:11:06 +01:00
Michael Vogel 4b21512f56 This is a quick fix for the the forumlist. 2015-11-17 19:56:32 +01:00
Michael Vogel e43c7a4447 Merge pull request #2061 from rabuzarus/0711_forumlist 
move forumlist addon to core
 2015-11-17 08:46:15 +01:00
fabrixxm c81f63a5b3 vier mobile: prefixed transition in css, mobile-related javascript only on mobile 2015-11-12 09:41:04 +01:00
fabrixxm 54460bdf35 fix tab icon padding 2015-11-12 09:41:04 +01:00
fabrixxm b3e09b817f fix menu icon, add icon to tab 2015-11-12 09:40:28 +01:00
fabrixxm e5edd7b7db mobile friendly tabs 2015-11-12 09:40:28 +01:00
Michael Vogel 31c44bd398 Vier: The left menu does now appear reliably even if the user had scrolled down. 2015-11-12 08:57:57 +01:00
rabuzarus 988d0327ae forumlist: forgot some required_once for plugin_enabled() 2015-11-11 21:37:16 +01:00
rabuzarus 215205d376 forumlist: nodeinfo_plugin_enabled() is now plugin_enabled() 2015-11-11 21:31:26 +01:00
Michael Vogel cba2a8b64b Vier: Make it look more beautiful under Linux 2015-11-10 16:25:36 +01:00
fabrixxm df866253b0 aside bar as menu in mobile 2015-11-08 19:08:00 +01:00
fabrixxm c700a6fb37 duepuntozero, vier: add unread messages per group 2015-11-08 18:02:04 +01:00
fabrixxm 3c1127e613 remove debug code 2015-11-08 17:04:39 +01:00
fabrixxm d522d7095d quattro: add unread message count per groups 2015-11-08 16:55:44 +01:00
Tobias Diekershoff 631afe5810 Merge pull request #2035 from FlxAlbroscheit/develop 
Preview the last 5 conversations in message-sidebar
 2015-11-08 16:03:04 +01:00
fabrixxm ae9c9829fa Remove language selectors from themes 
This is now a user setting
 2015-11-08 14:42:54 +01:00
fabrixxm fb3ac68cc0 Add user language in settings, use that field as language for UI 2015-11-08 14:23:49 +01:00
FlxAlbroscheit 06676e7c1b Preview last five conversations in message-sidebar 2015-11-07 18:57:40 +01:00
FlxAlbroscheit 1b2349d011 Preview last five conversations in message-sidebar 2015-11-07 18:56:05 +01:00
FlxAlbroscheit a8c033a7f6 Preview last five conversations in message-sidebar 2015-11-07 18:55:13 +01:00
Michael Vogel 0f563525bd Optical adjustments for contacts/set "last_failure" when inaccessible 2015-11-06 09:15:20 +01:00
Michael Vogel 0f41f35041 The contact template now displays the address if available 2015-11-06 00:47:54 +01:00
Michael Vogel 5b2e1188c0 Vier: Network name, "ago" and the quote description are now smaller when mobile. 2015-11-04 00:07:05 +01:00
Michael Vogel 546fd6cbbe Merge remote-tracking branch 'upstream/develop' into 1511-vier-mobile2 2015-11-03 23:56:57 +01:00
Michael Vogel 3b11436b02 Merge pull request #1989 from rabuzarus/allfriends 
template-rework: let common friends and allfriends use viewcontact_te…
 2015-11-03 23:27:24 +01:00
Michael Vogel 451b07cfe7 Mobile should be better now 2015-11-03 23:11:36 +01:00
Michael Vogel eff6f3a57d On small computers the stylesheet changed to mobile by accident. 2015-11-03 19:14:28 +01:00
rabuzarus e785759a8b template-rework:make use of get_contact_details_by_url() 2015-11-03 14:31:15 +01:00
Michael Vogel e3fdb33df0 Vier: Added the credits to the pages without left sidebar 2015-11-03 01:19:22 +01:00
Michael Vogel 1831066259 Vier is now a little bit more mobile ready. 2015-11-02 23:12:09 +01:00
Michael Vogel 6a53e3959f Vier: The different styles are now working with the right menubar 2015-11-01 09:45:02 +01:00
rabuzarus f0f3360c4b vier: include private forums in forum widget 2015-10-29 15:34:55 +01:00
Michael Vogel aee4522ad4 The contact page now shows the connection status. 2015-10-27 23:10:52 +01:00
Tobias Diekershoff 11a7eb8d8f Merge pull request #1985 from annando/1510-vier-optimize-touch 
Vier: The usability with a touch device is improved
 2015-10-27 08:59:47 +01:00
Tobias Diekershoff 4079084492 Merge pull request #1975 from rabuzarus/template_rework 
Template rework for contact related pages
 2015-10-27 08:59:03 +01:00
Michael Vogel 4f9ec8efac Vier: The usability with a touch device is improved 2015-10-25 21:01:39 +01:00
rabuzarus 4c263aa4ac Merge develop into manage 
Conflicts:
	view/global.css
 2015-10-25 16:57:04 +01:00
Tobias Diekershoff 03ff349a94 Merge pull request #1982 from annando/1510-reduced-profile 
Profile data are now reduced to only the most important fields
 2015-10-25 16:54:24 +01:00
rabuzarus bac61cf596 manage-selector: some cleanup and css work 2015-10-25 16:49:45 +01:00
rabuzarus 5b93bff6da poke template: make use of global.css 2015-10-25 14:40:56 +01:00
Michael Vogel 4631c13d08 Profile data are now reduced to only the most important fields 2015-10-25 09:15:36 +01:00
rabuzarus 8f92b6eea4 some work on poke template 2015-10-24 19:51:58 +02:00
rabuzarus 442d59abc4 template rework: multi-row view for the other themes 2015-10-23 21:45:16 +02:00
rabuzarus b6cceda131 template rework: revert commit because plugin community home uses the css classes 2015-10-23 15:41:49 +02:00
rabuzarus 7c9df68964 template rework: revert #b2bb600 for vier (is needed for right sidebar) 2015-10-23 15:23:00 +02:00
rabuzarus fad8ebc355 template rework: two row contact page for vier 2015-10-23 15:18:05 +02:00
rabuzarus efb12aed20 template rework: little theme specific changes (frost, quattro) 2015-10-23 01:32:03 +02:00
rabuzarus b2bb600f3a template rework: delete unused css 2015-10-23 01:04:47 +02:00
rabuzarus f9c0c1d696 template rework: use viewcontact_template.tpl for contact dealing pages 2015-10-18 17:12:48 +02:00
rabuzarus 9176e739a4 sugest.php: themeable as whole page 2015-10-17 21:25:21 +02:00
Michael Vogel 66ea33623b Vier: Some small changes in the template for events 2015-10-13 20:15:01 +02:00
fabrixxm fd8e8d005a attend functionality for duepuntozero 2015-10-12 20:09:33 +02:00
Tobias Diekershoff da8c81a12e cleanup forgotten lines 2015-10-12 15:58:34 +02:00
Tobias Diekershoff 3debdf0a91 attend functionality for quattro theme (part of #1953) 2015-10-12 15:34:18 +02:00
Tobias Diekershoff ce03ccc95c Merge pull request #1929 from rabuzarus/event-attendance 
port of reds event attendance feature
 2015-10-12 15:10:03 +02:00
Michael Vogel adba75600a Vier: Support for the new IFTTT addon. 2015-10-11 23:36:23 +02:00
rabuzarus 649578ae33 Merge develop-new into event-attendance-new 
Conflicts:
	include/conversation.php
 2015-10-11 19:39:55 +02:00
Michael Vogel 61c3ce7a21 Bugfix: The contact names had to be escaped 2015-10-08 00:25:55 +02:00
Michael Vogel 1f0b759e2f Added resize possibility to proxy function 2015-10-07 08:25:10 +02:00
Michael Vogel 607817d1b3 Vier: Avoid an error when calling the admin settings of "vier" when "vier" is not activated. 2015-10-05 17:38:57 +02:00
Michael Vogel 1d71dde7ef Beautyfied code. Link to "follow" on community profiles 2015-10-04 14:40:02 +02:00
Michael Vogel 3b18c6cb0c Small optical changes in "vier" 2015-10-04 12:24:00 +02:00
Michael Vogel 3ae0deadb6 The right side now contains much stuff from diabook - but completely reworked. 2015-10-03 12:55:55 +02:00
Michael Vogel 47c855388e Vier: Menu at the right side (inspired and copyied from diabook) 2015-10-01 08:19:35 +02:00
Michael Vogel 5fe357ee75 Rearrange the navigation bar on smaller windows 2015-09-30 21:59:55 +02:00
Michael Vogel 68a6f0298e The events moved from the profile to the navigation bar - for supported themes 2015-09-30 18:50:44 +02:00
rabuzarus 7cb4ea52fd port of the event attendance feature of red matrix with example implementation for vier theme. 2015-09-30 16:58:02 +02:00
rabuzarus f5c7006f30 rest of the consensus porting work and integration into friendica 
Credits to Mike Macgirvin for the code
 2015-09-30 14:38:13 +02:00
Michael Vogel 6e981ed798 Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events 2015-09-29 10:35:50 +02:00
Michael Vogel c33957a6e9 Internationalisation of events/Move events to the navigation bar 2015-09-27 14:00:15 +02:00