Commit Graph

4584 Commits

Author SHA1 Message Date
rabuzarus 093a3e6742 some work on vier nav-notification-menu 2015-12-28 20:40:04 +01:00
Tobias Diekershoff 99861b9fa6 Merge pull request #2216 from fabrixxm/feature-api-like
Works on API and a small refractor, updated docs
2015-12-28 18:39:21 +01:00
fabrixxm 6da04d16bd get rid of unwanted <br>s in items with oembed
fix video thumbnail in quattro, vier, duepuntozero themes
2015-12-28 18:07:31 +01:00
Michael Vogel 9d83892151 Merge pull request #2215 from rabuzarus/2812_vier_mobile_fix
vier: fix for 2205
2015-12-28 10:41:39 +01:00
fabrixxm 696fe53d8f sizes links in xml output of api/frienidca/photo is an array 2015-12-28 10:23:06 +01:00
fabrixxm 6b60560ea2 Changes in api
- Api functions can define an HTTP method to use to call them. "405 Method Not Allowed" is returned on error
- Api function that modify data accepts only POST as method.
- A list of HTTP return code related exception is added
- Api functions throw HTTP exceptions instead of return false or die()
- api_call() catches HTTP exceptions and return error message with corret HTTP response code
- api_format_items() returns also item activities count (# of like/dislike etc)
- api/friendica/photos/list return more info about photos. xml format added.
- api/friendica/photo/detail return more info, links to all sizes, no data except if 'size' parameter is passed. xml format added.
- new api api/friendica/activity/<verb> and api/friendica/activity/un<verb> to add or remove like/dislike/attend status
2015-12-28 10:23:06 +01:00
rabuzarus e68fcc146a vier: fix for 2205 2015-12-28 04:57:49 +01:00
Michael Vogel 8b25f51116 XRD now should react more like an OStatus server 2015-12-28 01:04:14 +01:00
Fabrixxm d4dd863b4b quattro: style managed unread notification 2015-12-21 16:19:56 +01:00
Fabrixxm b79d98aea5 quattro: fix PM aside template
errors was raised with new "show message list in aside" patch
2015-12-21 09:43:10 +01:00
Tobias Diekershoff 719989249f FR: update to the translation 2015-12-17 08:27:02 +01:00
rabuzarus 19a72b30b4 vier: fix missing icons 2015-12-15 15:13:46 +01:00
Tobias Diekershoff 9640eb7c81 IT update to the strings 2015-12-14 16:56:40 +01:00
Tobias Diekershoff 053b69eee4 FR update to the strings 2015-12-14 16:30:28 +01:00
Tobias Diekershoff e97a6dfb77 DE update to the strings 2015-12-14 16:27:00 +01:00
fabrixxm 5b5b942325 Merge pull request #2172 from tobiasd/20151212-frosticons
added event icons from frost-mobile to frost
2015-12-13 09:21:03 +01:00
Tobias Diekershoff 4a7d6eb13c resized icons to 16px 2015-12-13 08:09:53 +01:00
Michael Vogel ec9b1b7afd There is now a fragmentation level for the table optimisation 2015-12-12 17:46:24 +01:00
Tobias Diekershoff a7b37faafd added event icons from frost-mobile to frost 2015-12-12 06:23:54 +01:00
fabrixxm 8d1af68f44 missing frost-mobile event icons 2015-12-11 19:38:00 +01:00
Michael Vogel 6bd23721c2 Merge pull request #2169 from tobiasd/20151211-FR
update to the French translation
2015-12-11 11:23:49 +01:00
Tobias Diekershoff 5f27f509cb Merge pull request #2167 from annando/1512-profile-aside
Sometimes there wasn't a linebreak before the address in the profile
2015-12-11 08:10:23 +01:00
Tobias Diekershoff 36769d77eb FR update to the strings THX Perig 2015-12-11 08:03:09 +01:00
Michael Vogel 138d745f5e Sometimes there wasn't a linebreak before the address in the profile 2015-12-10 21:39:44 +01:00
Michael Vogel 1e0f26da8d Merge pull request #2166 from rabuzarus/1012_vier-forum
vier: fix little misspelling
2015-12-10 21:19:16 +01:00
rabuzarus 776cbe4a37 vier: fix little misspelling 2015-12-10 13:30:11 +01:00
Michael Vogel 59b2bde9a7 Do a linebreak before the output of rendertime 2015-12-08 19:41:27 +01:00
Michael Vogel 1fb636ba1e Vier: The line-height seems to make problems with windows 2015-12-07 21:45:33 +01:00
Michael Vogel 01c9d13927 Issue 1871: Show an information if a group is empty 2015-12-05 23:29:42 +01:00
Tobias Diekershoff f849ff0155 SV messages.po regenerated from strings.php 2015-12-04 21:31:33 +01:00
fabrixxm 38d46b164a quattro: some love to events pages 2015-12-04 20:43:35 +01:00
fabrixxm f739fdc517 Quattro: Rss icon for atom feed link in profile 2015-12-04 19:57:19 +01:00
fabrixxm f44846555a quattro: hide acl button in edit post
fix #1780
2015-12-04 19:29:13 +01:00
Fabrixxm ddbba521c5 Add support for attending an event to frost themes
fix #1953
2015-12-04 15:01:46 +01:00
Michael Vogel 1a170c8743 Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
Conflicts:
	mod/contacts.php
	mod/crepair.php
2015-12-03 14:38:04 +01:00
Michael Vogel 1f9644bded Merge pull request #2131 from rabuzarus/3011_hcard_vcard
unify hcard and vcard
2015-12-03 14:16:52 +01:00
rabuzarus 1d6d9d3d24 photos-albms widget: add some classes 2015-12-01 21:07:05 +01:00
rabuzarus cd7ec72b20 unify hcard and vcard: make $pdesc available in hcard&vcard 2015-12-01 19:47:23 +01:00
rabuzarus 39b37281a7 Merge develop into 3011_hcard_vcard 2015-12-01 18:34:13 +01:00
rabuzarus 89c5989cfb unify hcard and vcard 2015-12-01 18:31:08 +01:00
Michael Vogel 06a4b0dc5e Header removed in the contact area 2015-12-01 18:21:05 +01:00
Michael Vogel fe900ac576 Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework 2015-12-01 17:16:31 +01:00
Michael Vogel 6910604ffb Merge pull request #2125 from rabuzarus/2911_event_template
vier event_form: include bb-tags for editing
2015-12-01 17:13:46 +01:00
Tobias Diekershoff 91bac8a6e0 DE translations THX Abrax 2015-12-01 13:56:23 +01:00
Michael Vogel 1c93729c46 Tab is added to "all friends" and "common friends" 2015-12-01 08:12:05 +01:00
rabuzarus 39b85c8486 vier event_form: include bb-tags for editing 2015-11-30 16:00:41 +01:00
fabrixxm 2753e62483 Merge pull request #2119 from annando/1511-contact-evolution
Refurbished contact settings/contact posts
2015-11-30 14:45:23 +01:00
fabrixxm a60b702df1 Merge pull request #2113 from annando/1511-manage-notifications
The manage page now shows the notifications
2015-11-30 12:04:53 +01:00
Michael Vogel 4efb6c6f79 Merge pull request #2120 from rabuzarus/2911_network_header
2911 network header
2015-11-30 08:30:34 +01:00
rabuzarus a6aac8f950 networkheader: do css work the other supported themes 2015-11-30 01:24:22 +01:00
Michael Vogel 42d903dd68 Redesign of the contact pages, new tab for contact statuses 2015-11-29 23:22:05 +01:00
Tobias Diekershoff f45a8f1a03 Merge pull request #2106 from annando/1511-ostatus-bookmark-design
Small OStatus changes
2015-11-29 23:19:12 +01:00
Michael Vogel 5649e9e193 The contact page now contains more data 2015-11-29 17:04:48 +01:00
rabuzarus 70860e5836 new_event: default size of textfields 2015-11-29 16:16:18 +01:00
Tobias Diekershoff ba441789b9 followup for #2110 putting the styling in less file and recompile css 2015-11-29 11:18:32 +01:00
Michael Vogel 583a2f709b Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design 2015-11-29 10:25:44 +01:00
Tobias Diekershoff be40fb8186 Merge pull request #2110 from annando/1511-subscribe-feed
Issue 1779: Atom feed link under the connect link on the profile page
2015-11-29 08:40:39 +01:00
rabuzarus 1a0cb99d56 redesign the network page header when cid selected 2015-11-29 04:57:42 +01:00
rabuzarus f5597da059 forumlist - mark selected forum as selected 2015-11-28 23:52:12 +01:00
Michael Vogel 58a261a29a Other themes are now supported as well 2015-11-28 23:18:01 +01:00
Michael Vogel 3067663909 The manage page now shows the unread notifications 2015-11-28 22:56:48 +01:00
rabuzarus a3059d02d4 group_side - unify look with forumlist 2015-11-28 20:09:28 +01:00
Michael Vogel 388847e1f3 Issue 1779: There is now an atom feed link under the connect link on the profile page 2015-11-28 18:11:34 +01:00
Michael Vogel 679ce3243e Admin settings for table optimisation 2015-11-28 16:35:16 +01:00
Michael Vogel 3b6d3d1ade Merge pull request #2099 from rabuzarus/2611_new_user_addr
generate addr for new registered users
2015-11-27 21:35:46 +01:00
rabuzarus 620299dc25 include friendica address in hcard 2015-11-26 17:46:38 +01:00
rabuzarus ddf3589fc5 count unread forum items for forumlist widget (ping.php) 2015-11-24 22:14:26 +01:00
Tobias Diekershoff 1f583c9657 NL update to the strings, thx Ralph 2015-11-19 07:30:27 +01:00
Michael Vogel 41fe07e128 Merge remote-tracking branch 'upstream/develop' into 1511-forumlist-fix 2015-11-17 21:34:01 +01:00
Michael Vogel edb303d44a Merge pull request #2086 from rabuzarus/0711_forumlist
0711 forumlist
2015-11-17 21:33:25 +01:00
rabuzarus a07a0fd1d7 forumlist: fix id conflict and js show-more 2015-11-17 20:57:12 +01:00
Michael Vogel 5a1f763de0 The mobile.css seems to only work for mobiles at the moment. 2015-11-17 20:39:30 +01:00
Michael Vogel a9444ec774 The mobile.css was commented out ... 2015-11-17 20:11:06 +01:00
Michael Vogel 4b21512f56 This is a quick fix for the the forumlist. 2015-11-17 19:56:32 +01:00
Michael Vogel e43c7a4447 Merge pull request #2061 from rabuzarus/0711_forumlist
move forumlist addon to core
2015-11-17 08:46:15 +01:00
Fabrixxm 0a9e017d34 Installer use static css, fix #2071 2015-11-13 10:56:06 +01:00
fabrixxm c81f63a5b3 vier mobile: prefixed transition in css, mobile-related javascript only on mobile 2015-11-12 09:41:04 +01:00
fabrixxm 54460bdf35 fix tab icon padding 2015-11-12 09:41:04 +01:00
fabrixxm b3e09b817f fix menu icon, add icon to tab 2015-11-12 09:40:28 +01:00
fabrixxm e5edd7b7db mobile friendly tabs 2015-11-12 09:40:28 +01:00
Tobias Diekershoff c687069709 Merge pull request #2068 from annando/1511-vier-mobile-aside
Vier-Mobile: The left menu does now appears even when scrolled down
2015-11-12 09:09:28 +01:00
Michael Vogel 31c44bd398 Vier: The left menu does now appear reliably even if the user had scrolled down. 2015-11-12 08:57:57 +01:00
rabuzarus 902735f6d4 forumlist: dbupdate 2015-11-11 23:39:14 +01:00
rabuzarus 988d0327ae forumlist: forgot some required_once for plugin_enabled() 2015-11-11 21:37:16 +01:00
rabuzarus 215205d376 forumlist: nodeinfo_plugin_enabled() is now plugin_enabled() 2015-11-11 21:31:26 +01:00
Michael Vogel 37c68f6548 Merge pull request #2065 from tobiasd/20151110-shashape
ShaShape iconset
2015-11-10 21:55:15 +01:00
Michael Vogel a320805bd9 Merge pull request #2064 from tobiasd/20151110-de
update to the DE translation by Abrax
2015-11-10 21:53:06 +01:00
Tobias Diekershoff d6ac6aa615 updated the CSS file for the ShaShape iconset 2015-11-10 20:34:21 +01:00
Tobias Diekershoff 835e6c4955 new version of the ShaShape iconset 2015-11-10 20:12:16 +01:00
Tobias Diekershoff 37e1c916db update to the DE translation by Abrax 2015-11-10 20:02:19 +01:00
Michael Vogel cba2a8b64b Vier: Make it look more beautiful under Linux 2015-11-10 16:25:36 +01:00
rabuzarus abf9ebd466 forumlist: small fix 2015-11-10 12:53:56 +01:00
rabuzarus 96b764425e move forumlist addon to core 2015-11-09 15:56:20 +01:00
fabrixxm df866253b0 aside bar as menu in mobile 2015-11-08 19:08:00 +01:00
fabrixxm c700a6fb37 duepuntozero, vier: add unread messages per group 2015-11-08 18:02:04 +01:00
fabrixxm 3c1127e613 remove debug code 2015-11-08 17:04:39 +01:00
fabrixxm d522d7095d quattro: add unread message count per groups 2015-11-08 16:55:44 +01:00
Tobias Diekershoff 631afe5810 Merge pull request #2035 from FlxAlbroscheit/develop
Preview the last 5 conversations in message-sidebar
2015-11-08 16:03:04 +01:00
fabrixxm ae9c9829fa Remove language selectors from themes
This is now a user setting
2015-11-08 14:42:54 +01:00
fabrixxm fb3ac68cc0 Add user language in settings, use that field as language for UI 2015-11-08 14:23:49 +01:00
fabrixxm e74916d395 Merge pull request #2042 from tobiasd/develop
some icons were added to the ShaShape iconset
2015-11-08 12:44:44 +01:00
Tobias Diekershoff 4b9fa3fb7e some icons were added to the ShaShape iconset 2015-11-08 12:33:48 +01:00
fabrixxm 0363bab040 js: add new Dialog object
The Dialog is used by code to show urls in colorbox.
Templates can overwrite `show()` function to change its behaviour
2015-11-08 12:01:19 +01:00
FlxAlbroscheit 06676e7c1b Preview last five conversations in message-sidebar 2015-11-07 18:57:40 +01:00
FlxAlbroscheit 1b2349d011 Preview last five conversations in message-sidebar 2015-11-07 18:56:05 +01:00
FlxAlbroscheit a8c033a7f6 Preview last five conversations in message-sidebar 2015-11-07 18:55:13 +01:00
FlxAlbroscheit 603dad93f3 Preview last five conversations in message-sidebar 2015-11-07 18:54:20 +01:00
Tobias Diekershoff b3e3149e50 wrong filename 2015-11-07 16:30:31 +01:00
Tobias Diekershoff f2013951a9 wrong filename 2015-11-07 16:28:31 +01:00
Tobias Diekershoff 0c6097fbcd initial commit of the ShaShape iconset by Andi Stadler 2015-11-07 16:24:22 +01:00
fabrixxm 5f6ea6357d Add 'Reload active themes' to admin
It will call 'uninstall()' and 'install()' on every active themes
2015-11-06 23:53:10 +01:00
Michael Vogel 0f563525bd Optical adjustments for contacts/set "last_failure" when inaccessible 2015-11-06 09:15:20 +01:00
Michael Vogel 0f41f35041 The contact template now displays the address if available 2015-11-06 00:47:54 +01:00
Michael Vogel 5b2e1188c0 Vier: Network name, "ago" and the quote description are now smaller when mobile. 2015-11-04 00:07:05 +01:00
Michael Vogel 546fd6cbbe Merge remote-tracking branch 'upstream/develop' into 1511-vier-mobile2 2015-11-03 23:56:57 +01:00
Michael Vogel 3b11436b02 Merge pull request #1989 from rabuzarus/allfriends
template-rework: let common friends and allfriends use viewcontact_te…
2015-11-03 23:27:24 +01:00
Michael Vogel 451b07cfe7 Mobile should be better now 2015-11-03 23:11:36 +01:00
Michael Vogel eff6f3a57d On small computers the stylesheet changed to mobile by accident. 2015-11-03 19:14:28 +01:00
rabuzarus e785759a8b template-rework:make use of get_contact_details_by_url() 2015-11-03 14:31:15 +01:00
Michael Vogel e3fdb33df0 Vier: Added the credits to the pages without left sidebar 2015-11-03 01:19:22 +01:00
Michael Vogel 1831066259 Vier is now a little bit more mobile ready. 2015-11-02 23:12:09 +01:00
rabuzarus f196389580 Merge develop into allfriends 2015-11-02 14:31:20 +01:00
Michael Vogel 709aac0652 Only offer the choice to activate Diaspora and OStatus if the system is ready for it 2015-11-01 13:55:49 +01:00
Michael Vogel 6a53e3959f Vier: The different styles are now working with the right menubar 2015-11-01 09:45:02 +01:00
Michael Vogel 2f47d63a29 Merge pull request #2000 from tobiasd/20151027-credits
a credits page
2015-10-31 22:34:30 +01:00
Tobias Diekershoff c00847a79d use section_title.tpl for page title 2015-10-30 18:05:45 +01:00
rabuzarus f0f3360c4b vier: include private forums in forum widget 2015-10-29 15:34:55 +01:00
Tobias Diekershoff a48156aab6 display names listed in credits.txt from /credits 2015-10-29 08:48:41 +01:00
Tobias Diekershoff dff1a73bd3 basic styling of the credits list 2015-10-29 08:48:41 +01:00
Michael Vogel 5a58f55a36 Set the maximum avatar size to 80 pixels 2015-10-28 00:18:56 +01:00
Michael Vogel aee4522ad4 The contact page now shows the connection status. 2015-10-27 23:10:52 +01:00
rabuzarus 299c8b83ac template-rework: let common friends and allfriends use viewcontact_template.tpl 2015-10-27 15:27:26 +01:00
Tobias Diekershoff 367699f785 Merge pull request #1987 from annando/1510-manage-enhancements
Some small optical and structural changes to the manage template
2015-10-27 09:01:35 +01:00
Tobias Diekershoff 11a7eb8d8f Merge pull request #1985 from annando/1510-vier-optimize-touch
Vier: The usability with a touch device is improved
2015-10-27 08:59:47 +01:00
Tobias Diekershoff 4079084492 Merge pull request #1975 from rabuzarus/template_rework
Template rework for contact related pages
2015-10-27 08:59:03 +01:00
Michael Vogel 99ee45e627 The username is now a link 2015-10-26 23:11:42 +01:00
Michael Vogel ac744b61f9 Some small optical and structural changes to the manage template 2015-10-26 08:16:37 +01:00
Michael Vogel 4f9ec8efac Vier: The usability with a touch device is improved 2015-10-25 21:01:39 +01:00
rabuzarus 4c263aa4ac Merge develop into manage
Conflicts:
	view/global.css
2015-10-25 16:57:04 +01:00
Tobias Diekershoff 03ff349a94 Merge pull request #1982 from annando/1510-reduced-profile
Profile data are now reduced to only the most important fields
2015-10-25 16:54:24 +01:00
rabuzarus bac61cf596 manage-selector: some cleanup and css work 2015-10-25 16:49:45 +01:00
Michael Vogel 78a8db55c6 Merge pull request #1981 from rabuzarus/poke
some work on poke template
2015-10-25 14:59:39 +01:00
rabuzarus 5b93bff6da poke template: make use of global.css 2015-10-25 14:40:56 +01:00
rabuzarus e0e6762ed8 some inital work to have profile pics on manage page 2015-10-25 14:00:08 +01:00
Michael Vogel 4631c13d08 Profile data are now reduced to only the most important fields 2015-10-25 09:15:36 +01:00
rabuzarus 8f92b6eea4 some work on poke template 2015-10-24 19:51:58 +02:00
rabuzarus eb33698556 some minor changes in crepair.tpl 2015-10-24 16:01:55 +02:00
rabuzarus ea2b3b2f76 move html from crepair.php to template 2015-10-24 15:57:46 +02:00
rabuzarus 442d59abc4 template rework: multi-row view for the other themes 2015-10-23 21:45:16 +02:00
rabuzarus 86f94570ef template rework: delete unused templates 2015-10-23 16:49:12 +02:00
rabuzarus b6cceda131 template rework: revert commit because plugin community home uses the css classes 2015-10-23 15:41:49 +02:00
rabuzarus 7c9df68964 template rework: revert #b2bb600 for vier (is needed for right sidebar) 2015-10-23 15:23:00 +02:00
rabuzarus fad8ebc355 template rework: two row contact page for vier 2015-10-23 15:18:05 +02:00
rabuzarus efb12aed20 template rework: little theme specific changes (frost, quattro) 2015-10-23 01:32:03 +02:00
rabuzarus b2bb600f3a template rework: delete unused css 2015-10-23 01:04:47 +02:00
rabuzarus 0c3979720f template rework: rearrange sidebar widgets for contact related pages 2015-10-23 00:12:00 +02:00
rabuzarus 2aad62190f template rework: use viewcontact_template.tpl also for directory 2015-10-22 22:48:49 +02:00
rabuzarus f9c0c1d696 template rework: use viewcontact_template.tpl for contact dealing pages 2015-10-18 17:12:48 +02:00
rabuzarus 4c1c614fa6 Merge viewcontact into template_rework 2015-10-17 22:28:09 +02:00
rabuzarus 452a3011f7 Merge suggest into template_rework 2015-10-17 22:22:52 +02:00
rabuzarus dbf1f9efcd Merge dirfind into template_rework 2015-10-17 22:22:35 +02:00
rabuzarus 4b8ca578d1 dirfind: move pagination into template 2015-10-17 22:09:19 +02:00
rabuzarus b9d9bf8ecd directory: move pagination into template 2015-10-17 21:45:55 +02:00
rabuzarus 6d559bf8a9 viewcontact: use section_title.tpl as headding 2015-10-17 21:40:41 +02:00
rabuzarus 9176e739a4 sugest.php: themeable as whole page 2015-10-17 21:25:21 +02:00
rabuzarus 72896b0f6b unify directory page 2015-10-17 19:45:57 +02:00
rabuzarus 20bb16859f dirfind.php: move html to templates 2015-10-17 00:19:01 +02:00
rabuzarus 6ebb21a935 directory.php: move html to templates 2015-10-16 21:44:10 +02:00
Tobias Diekershoff a961c29d05 Merge pull request #1962 from annando/1510-attend-vier
Vier: Some small changes in the template for events
2015-10-14 06:42:50 +02:00
Michael Vogel 66ea33623b Vier: Some small changes in the template for events 2015-10-13 20:15:01 +02:00
Tobias Diekershoff db14dc13c3 DE: update to the strings 2015-10-13 17:35:08 +02:00
Tobias Diekershoff 1df5a7212b DE: translation of the attend strings THX to Abrax 2015-10-13 17:06:35 +02:00
Tobias Diekershoff 154c55b36e Merge pull request #1957 from fabrixxm/duepuntozeroattend
attend functionality for duepuntozero
2015-10-12 21:16:40 +02:00
fabrixxm fd8e8d005a attend functionality for duepuntozero 2015-10-12 20:09:33 +02:00
fabrixxm 735755aa0e Merge pull request #1956 from tobiasd/20151012-de
DE Update to the translation, thx Abrax
2015-10-12 19:04:51 +02:00
Tobias Diekershoff 5839242792 DE Update to the translation, thx Abrax 2015-10-12 18:08:11 +02:00
Tobias Diekershoff da8c81a12e cleanup forgotten lines 2015-10-12 15:58:34 +02:00
Tobias Diekershoff 3debdf0a91 attend functionality for quattro theme (part of #1953) 2015-10-12 15:34:18 +02:00
Tobias Diekershoff ce03ccc95c Merge pull request #1929 from rabuzarus/event-attendance
port of reds event attendance feature
2015-10-12 15:10:03 +02:00
Michael Vogel adba75600a Vier: Support for the new IFTTT addon. 2015-10-11 23:36:23 +02:00
rabuzarus 649578ae33 Merge develop-new into event-attendance-new
Conflicts:
	include/conversation.php
2015-10-11 19:39:55 +02:00
Michael Vogel efbdb57f92 Reworked contact relations between Friendica and Diaspora 2015-10-10 11:06:18 +02:00
Tobias Diekershoff 26983bafff Merge pull request #1944 from annando/1510-proxy-picture-size
Picture size and bugfix for contact names with "<" and ">"
2015-10-08 08:03:42 +02:00
Michael Vogel 61c3ce7a21 Bugfix: The contact names had to be escaped 2015-10-08 00:25:55 +02:00
Michael Vogel 1f0b759e2f Added resize possibility to proxy function 2015-10-07 08:25:10 +02:00
Tobias Diekershoff b4ec07ab27 IT: update to the strings 2015-10-07 06:20:54 +02:00
Michael Vogel 607817d1b3 Vier: Avoid an error when calling the admin settings of "vier" when "vier" is not activated. 2015-10-05 17:38:57 +02:00
Michael Vogel d3ac3f8490 Added the contact menu to the search as well. 2015-10-05 08:08:59 +02:00
Michael Vogel 72ecb9e67b Bugfix: Repairing a contact was more like killing the contact ... 2015-10-04 19:39:55 +02:00
Tobias Diekershoff 9f68676db6 Merge pull request #1934 from annando/1510-better-notification
Let the notification look more like the follow dialog
2015-10-04 17:49:02 +02:00
Michael Vogel 4003b9cc5d Let the notification look more like the follow dialog 2015-10-04 17:18:58 +02:00
Tobias Diekershoff e1f3f2bc6c Merge pull request #1933 from annando/1510-follow-more-data
Show more information when following a new contact
2015-10-04 17:02:27 +02:00
Tobias Diekershoff 18e8d0de59 Merge pull request #1932 from annando/1510-vier-2
Small optical changes in "vier"
2015-10-04 17:01:25 +02:00
Michael Vogel 83ea4f7253 transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues. 2015-10-04 15:55:24 +02:00
Michael Vogel d0ae5ce326 Show more information when following a new contact 2015-10-04 14:41:39 +02:00
Michael Vogel 1d71dde7ef Beautyfied code. Link to "follow" on community profiles 2015-10-04 14:40:02 +02:00
Michael Vogel 3b18c6cb0c Small optical changes in "vier" 2015-10-04 12:24:00 +02:00
Tobias Diekershoff 01d38a353c DE update to the translation 2015-10-04 09:23:58 +02:00
Tobias Diekershoff 05b2836d66 Merge pull request #1926 from annando/1510-permit-crawler
New option to permit crawlers
2015-10-04 08:53:32 +02:00
Michael Vogel 42ad8c2b25 New template for http status messages 2015-10-03 23:19:09 +02:00
Michael Vogel 3ae0deadb6 The right side now contains much stuff from diabook - but completely reworked. 2015-10-03 12:55:55 +02:00
Michael Vogel 47c855388e Vier: Menu at the right side (inspired and copyied from diabook) 2015-10-01 08:19:35 +02:00
Tobias Diekershoff d6beb7db1f add a header to seperate the beginning of week settings 2015-10-01 06:19:57 +02:00
Michael Vogel 5fe357ee75 Rearrange the navigation bar on smaller windows 2015-09-30 21:59:55 +02:00
Michael Vogel 389b7de451 Setting for the first day of the week 2015-09-30 19:18:13 +02:00
Michael Vogel 68a6f0298e The events moved from the profile to the navigation bar - for supported themes 2015-09-30 18:50:44 +02:00
rabuzarus 7cb4ea52fd port of the event attendance feature of red matrix with example implementation for vier theme. 2015-09-30 16:58:02 +02:00
rabuzarus f5c7006f30 rest of the consensus porting work and integration into friendica
Credits to Mike Macgirvin for the code
2015-09-30 14:38:13 +02:00
Michael Vogel 6e981ed798 Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events 2015-09-29 10:35:50 +02:00
Michael Vogel c33957a6e9 Internationalisation of events/Move events to the navigation bar 2015-09-27 14:00:15 +02:00
Tobias Diekershoff 28df4b2cd0 PL update to the strings 2015-09-24 22:09:39 +02:00
Michael Vogel 25fc2c9799 Some changes to stay compatible to Diaspora 2015-09-19 14:00:33 +02:00
Tobias Diekershoff 976a2be1f7 Merge pull request #1892 from annando/1509-vier-attachements
Now attachments of the type "application" are displayed as well.
2015-09-18 21:11:57 +02:00
Michael Vogel 6be65f4eae Now attachments of the type "application" are displayed as well. 2015-09-18 21:09:31 +02:00
Tobias Diekershoff dbc9d87156 DE update to the strings 2015-09-17 14:24:07 +02:00
Michael Vogel 5ac38b7f99 There is now only one central parameter for the global directory. 2015-09-15 22:29:02 +02:00
Tobias Diekershoff 8504cf4f05 Merge pull request #1880 from annando/1509-performance
Some settings to control the system load
2015-09-06 09:02:27 +02:00
Michael Vogel c6d9b2da23 New setting for requery days 2015-09-05 10:54:39 +02:00
Tobias Diekershoff 4db21f85c4 DE, ES, IT: update to the translations 2015-09-01 15:12:09 +02:00
Tobias Diekershoff 32c063b9a5 IT update to the translations 2015-08-31 19:02:12 +02:00
Tobias Diekershoff 3665ab3de0 FR update to the translations 2015-08-31 19:01:56 +02:00
Tobias Diekershoff fe5a5c72f5 ES update to the translations 2015-08-31 19:01:42 +02:00
Tobias Diekershoff af48217465 Merge pull request #1870 from annando/1508-soapbox
Soapbox-Improvements
2015-08-31 06:53:54 +02:00
Michael Vogel 56ae056f1d The "manage" option list is now larger. 2015-08-30 22:45:48 +02:00
Michael Vogel cc3419f101 Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu
Conflicts:
	mod/dfrn_notify.php
2015-08-30 10:44:29 +02:00
Tobias Diekershoff 9aa1e22047 CS update to the strings 2015-08-30 07:24:39 +02:00
Michael Vogel 31fffcf281 Accidentally removed a file 2015-08-29 17:09:25 +02:00
Michael Vogel 82e682ef45 The click behaviour of the top menu bar is now changed completely 2015-08-29 10:14:41 +02:00
Michael Vogel e25457ab68 Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu 2015-08-28 14:16:52 +02:00
Michael Vogel 319df2ed66 The menu bar isn't clickable anymore 2015-08-28 11:36:43 +02:00
Michael Vogel 14af9cd2e8 Remove the unneeded menu buttons- 2015-08-27 00:50:04 +02:00
Michael Vogel 92fbf1bcbd Vier: Use CSS for popup menu 2015-08-27 00:02:06 +02:00
Tobias Diekershoff 7da830c9f6 DE update to the strings 2015-08-26 16:40:31 +02:00
Michael Vogel 6942b16ef5 See issue 1855. OOhembed is removed. 2015-08-25 19:50:23 +02:00
Michael Vogel b1dddd2936 Only offer forum search in local mode. 2015-08-25 05:54:50 +02:00
Michael Vogel d1647222d3 Vier: The "register" page now looks better. 2015-08-24 19:03:03 +02:00
Tobias Diekershoff cc145f0e25 Merge pull request #1850 from tobiasd/20150824-de
DE updated translation
2015-08-24 14:27:13 +02:00
Tobias Diekershoff 26c5c7991a Merge pull request #1849 from fabrixxm/issue-1841
filebrowser: link image to original picture, show error messages
2015-08-24 14:26:09 +02:00
Tobias Diekershoff 489e90281a DE updated translation 2015-08-24 14:21:22 +02:00
fabrixxm cbabac298d filebrowser: link image to original picture, show error messages 2015-08-24 13:54:41 +02:00
Michael Vogel 3bca2db11b Don't show search options in side bar. 2015-08-24 12:12:14 +02:00
Michael Vogel 3ff196f00d Now you can set search options so that searching for contacts or forums isn't occult science anymore. 2015-08-24 11:55:29 +02:00
Tobias Diekershoff fc18123082 Merge pull request #1837 from fabrixxm/feature-1796
add support for oneline,in-text code tag
2015-08-23 17:27:45 +02:00
fabrixxm 2d75e1f422 add support for oneline,in-text code tag 2015-08-20 15:08:55 +02:00
fabrixxm 81d1dfc006 add 'reload active plugins' button in admin/plugins 2015-08-20 15:01:15 +02:00
Michael Vogel e6b85c822d frost-mobile has now a link to the original post. See issue 1793 2015-08-18 20:30:01 +02:00
Michael Vogel 6ae34f4802 Merge pull request #1828 from tobiasd/20150816-fix1621
add the profile url to the settings pages as alternative to the webfi…
2015-08-17 21:51:03 +02:00
Tobias Diekershoff b67adebd9c DE update to the strings 2015-08-17 12:02:03 +02:00
Tobias Diekershoff 621dec1606 reconstruct the description for more flexible translations 2015-08-17 07:20:50 +02:00
Tobias Diekershoff eea258f74c add the profile url to the settings pages as alternative to the webfinger. See issue 1621 2015-08-16 22:39:08 +02:00
Michael Vogel c2a1cf958d The addon "statistics_json" becomes the system setting "nodeinfo" 2015-08-16 21:45:51 +02:00
Tobias Diekershoff 4ca515ab33 Merge pull request #1823 from annando/issue-1348
The login form in the aside section should look now better
2015-08-15 07:19:05 +02:00
Michael Vogel 72c8fff909 Improved register link and open-id input. 2015-08-15 07:08:32 +02:00
Michael Vogel efec7e973e This hopefully will solve issue 1348 2015-08-14 23:32:10 +02:00
Tobias Diekershoff bb4e339d8f DE update to the strings 2015-08-14 13:03:55 +02:00
Michael Vogel 887372a0d7 Bugfix: Conversations with Diaspora now work reliable 2015-08-13 22:49:57 +02:00
Tobias Diekershoff 5013e5daf1 use to link to queue inspector 2015-08-12 19:58:53 +02:00
Tobias Diekershoff f439ac47c4 admin panel: inspect queue 2015-08-12 15:44:59 +02:00
Tobias Diekershoff 6b93325f70 make Inspect Queue link visible in admin adide menu 2015-08-12 15:44:03 +02:00
Tobias Diekershoff 9d0786531d Merge pull request #1810 from annando/issue-1739
Contact requests now contain more information.
2015-08-12 08:17:27 +02:00
Michael Vogel a0f69dc92c Contact requests now contain more information. 2015-08-12 08:07:21 +02:00
Michael Vogel e1088210a6 CSS improved 2015-08-11 22:47:37 +02:00
Tobias Diekershoff 6cfe7b698e Merge pull request #1803 from annando/1508-accessibility
Improved accessibility
2015-08-10 08:48:48 +02:00
Michael Vogel ea14f7e716 Duepontozero now has accesskeys as well. 2015-08-09 12:19:15 +02:00
Michael Vogel d500ea4324 Some more accesskeys for Quattro 2015-08-09 09:55:51 +02:00
Michael Vogel d65d74d460 Added the changes in quattro as well 2015-08-09 09:28:10 +02:00
Michael Vogel 811e4b6ba1 Documentation for accesskeys added 2015-08-09 09:16:45 +02:00
Michael Vogel ccaeb00973 Better link descriptions. 2015-08-08 22:30:43 +02:00
Michael Vogel b4d09777b9 Added many accesskeys ... 2015-08-08 17:33:43 +02:00
Michael Vogel a8a21da6f5 Some steps for a better screen reader compatibility 2015-08-06 08:13:15 +02:00
Tobias Diekershoff 26ec1fbf34 FR: update to the translations 2015-08-05 07:11:39 +02:00
Tobias Diekershoff 43b2e69421 DE: update of the translation 2015-08-04 08:06:49 +02:00
Tobias Diekershoff cd8be48ca7 Merge pull request #1791 from annando/1507-new-poco
Improved Local Directory
2015-08-02 10:31:34 +02:00
rabuzarus bef827f1cc small fixes for filebrowser 2015-08-01 21:20:13 +02:00
Fabrixxm b7aa259c67 hide buglink 2015-07-30 14:19:50 +02:00
Fabrixxm f5657e283c fix folder links in filebrowser dialog 2015-07-29 11:55:26 +02:00
Fabrixxm 52f9465578 filebrowser fixs, use it in comment textareas
move filebrowser js to single file
document filebrowser usage
replace "onclick" for comment style buttons with data-* and move logic to main.js
use filebrowser to insert images in comments
2015-07-29 11:30:04 +02:00
Fabrixxm 70b7de39a7 Upload/Browse popup for files and images
Jot buttons to upload images and files show a popup, where the
user can select a previously uploaded item o upload a new one
2015-07-28 17:20:40 +02:00
Michael Vogel 9717fa82fe New field "created" in gcontacts. New option for timeframe when polling global contacts 2015-07-21 00:05:44 +02:00
Michael Vogel f3c83fb514 Automatically updating the searched contacts while searching it. 2015-07-19 18:02:24 +02:00
Michael Vogel 0bede65a6b Use local search 2015-07-19 13:23:01 +02:00
Tobias Diekershoff 8bfbb935c7 add missing icons to quattros event view 2015-07-19 10:56:40 +02:00
Michael Vogel 2a5fb7b175 Option to discover contacts from remote users (fallback option) 2015-07-19 09:41:36 +02:00
Michael Vogel a0734ceede Merge remote-tracking branch 'upstream/develop' into 1507-new-poco 2015-07-18 22:37:39 +02:00
Michael Vogel cf3214c904 Query other servers periodically for their known contacts 2015-07-18 22:26:06 +02:00
Tobias Diekershoff 9bb805f3dc show profile url in contact-edit overview listing 2015-07-18 10:57:31 +02:00
Michael Vogel f1e7369283 Poco: Option to activate and deactivate detection of last activity. 2015-07-18 00:48:42 +02:00
Tobias Diekershoff bbd2e4abc1 make the 'noshare' checkbox checked by default for photo upload 2015-07-17 17:05:55 +02:00
Tobias Diekershoff ba790def22 NL update to the strings 2015-07-14 16:31:45 +02:00
Tobias Diekershoff 9e138a42f2 Merge pull request #1758 from annando/1507-salmon
OStatus Salmon improvements (Follow, Unfollow works)
2015-07-14 16:24:54 +02:00
Michael Vogel 9ebaa45670 Removed unused template 2015-07-13 23:56:45 +02:00
Tobias Diekershoff a54dd8a9db DE: update to the strings 2015-07-13 08:14:00 +02:00
Tobias Diekershoff 1efda90498 Merge pull request #1755 from annando/1507-template-update
Vier: Some template updates
2015-07-12 21:08:11 +02:00
Michael Vogel 5f86d3d325 removed the picture width, since it is already in the style sheet. 2015-07-12 20:31:49 +02:00
Michael Vogel 6a646d68c5 Updated templates for "vier" (See issue 1733) 2015-07-12 20:27:54 +02:00
Michael Vogel e22ce8403e Merge pull request #1752 from tobiasd/20150712-issue1747
issue 1747
2015-07-12 18:12:19 +02:00
rabuzarus 2c39387e44 fix for saving searches 2015-07-12 17:43:50 +02:00
Tobias Diekershoff d920cf25b0 dont use an empty li, but make a new list for visual separation 2015-07-12 16:16:54 +02:00
Michael Vogel bc6e5a4f2d Merge remote-tracking branch 'upstream/develop' into 1507-diaspora-contact-links 2015-07-06 17:35:48 +02:00
Fabrixxm 95945ecae6 Merge branch 'master' into develop 2015-07-06 16:56:49 +02:00
Michael Vogel c356da2cad Diaspora: Improved parsing of linefeeds 2015-07-05 02:33:28 +02:00
Tobias Diekershoff 3349bba665 Merge pull request #1722 from annando/1506-password-on-install
Ability to enter a password when the first user is created
2015-07-01 07:53:25 +02:00
Michael Vogel 055ee962c9 Ability to enter a password when the first user is created 2015-06-30 23:37:31 +02:00
rabuzarus cf2a90dfa2 system settings is now a variable in settings_display.tpl 2015-06-30 14:51:14 +02:00
Tobias Diekershoff b8f99f459b DE update to the strings 2015-06-30 09:45:05 +02:00
Tobias Diekershoff d4fa6ccfe8 IT update to the strings 2015-06-30 09:44:53 +02:00
fabrixxm 5a23bd400c Merge pull request #1715 from rabuzarus/theme_uid
use local theme settings for visitors
2015-06-30 08:41:07 +02:00
rabuzarus 36abf624d8 make supported themes compatible with get_theme_uid 2015-06-29 23:03:44 +02:00
fabrixxm 28f0e9a2de Merge pull request #1696 from rabuzarus/acl-var
move jotnets to populate_acl
2015-06-29 13:53:37 +02:00
Michael Vogel b9c42c37d1 Vier: Colors for notifications changed 2015-06-29 08:00:52 +02:00
Michael Vogel b795bf2935 Merge pull request #1683 from fabrixxm/issue-1655
Deprecate RINO1 function, implements RINO2, remove unused crypro functions
2015-06-27 17:39:00 +02:00
rabuzarus 8cca849c2e Merge acl-var into develop
Conflicts:
	mod/settings.php
2015-06-27 15:23:19 +02:00
rabuzarus d8c0c62331 work on supported themes to use new acl 2015-06-26 15:44:32 +02:00
Michael Vogel 6eebfb2e13 Merge pull request #1692 from fabrixxm/desktopnotifications
Desktop notifications
2015-06-26 08:45:16 +02:00
rabuzarus 37501a883e make notes work 2015-06-25 22:57:26 +02:00
rabuzarus 94b21245bc some more work to get acl data into populate_acl 2015-06-25 18:57:42 +02:00
fabrixxm d2a593b4a0 Merge pull request #1693 from rabuzarus/events-reminder
use title in events-reminder
2015-06-25 15:06:55 +02:00
rabuzarus d23440af15 use colorbox to display upcomming events 2015-06-25 13:43:41 +02:00
Fabrixxm 6fc864c947 rework mod/ping and desktop notification logic
`mod/ping.php` returns all notifications ordered by date
mixing system notifications, private messages, intros, registrations
remove 'notify_full' mode
remove `&arr;` from unseen notes, 'seen' attrib now is "1" or "0"
new note attribute 'timestamp'
desktop notification logic use timestamp to check which notification show to the user
notification html template use timestamp to show full date to user in tooltip
`relative_date()` don't append full date on dates older than 24 hours
2015-06-25 10:02:26 +02:00
Michael Vogel 0bac4722cb Vier: Just another thread improvment 2015-06-24 21:49:51 +02:00
Fabrixxm e29d05ce4a notifications order, unseen css class
ping return notfications ordered by notification id
notifications list get seen/unseen class from ping xml
global.css define 'notify-unseen'
2015-06-24 16:10:06 +02:00
Michael Vogel 3841c41186 Improved width for nested comments. 2015-06-24 14:20:08 +02:00
Fabrixxm cc9da2512b move field help text css to global.css 2015-06-24 10:11:11 +02:00
Fabrixxm 4036ad2554 Fix desktop notification
use on/off field for enable/disable desktop notification
show only new notifications after enable
use localstorage to save enabled/disalbed and last notification id
hide settings on browsers without desktop notification
2015-06-24 09:49:53 +02:00
Fabrixxm 511c2d2c91 rino: settings in admin, choose lowest common on notify 2015-06-23 17:36:26 +02:00
Fabrixxm a3cd16bd9f remove localized htconfig templates 2015-06-23 12:35:51 +02:00
Fabrixxm d06beb1431 install: load htconfig template from templates/ 2015-06-23 12:35:51 +02:00
Tobias Diekershoff 5549dd1dbe Merge pull request #1682 from fabrixxm/issue-1625
admin: allow deletion of any users but yourself
2015-06-23 11:05:16 +02:00
Fabrixxm 3168b44317 admin: allow deletion of any users but yourself
fix #1625
2015-06-23 10:39:28 +02:00
Fabrixxm 53e6dd6637 Add contact detail to contact drop confirm
fix #1629
2015-06-23 10:09:27 +02:00
fabrixxm 35e9fc3b02 use fields template in photo edit form 2015-06-22 20:07:19 +02:00
Michael Vogel bc42b6440a Vier: Improved threading 2015-06-21 20:40:39 +02:00
Michael Vogel 66058c6cf4 Remote subscribe from a GNU Social site is now possible 2015-06-13 19:51:45 +02:00
rabuzarus c01dbc274c fix remote-link button in vier 2015-06-11 02:49:09 +02:00
Michael Vogel a2ae4ccc9b Merge pull request #1636 from rabuzarus/albums_widget
make use of global.css
2015-05-31 18:04:40 +02:00
rabuzarus afd1e0e6d0 make use of global.css 2015-05-31 13:55:21 +02:00
fabrixxm 1cf3e778e8 Merge pull request #1622 from rabuzarus/albums_widget
move html to photo_albums.tpl
2015-05-31 10:07:43 +02:00
Michael Vogel 2550e02399 Merge pull request #1627 from rabuzarus/section-title
move html of h2 headings to section_title.tpl
2015-05-31 09:52:46 +02:00
Michael Vogel b778467121 Merge pull request #1620 from tobiasd/20150529-de
DE update to the strings
2015-05-31 01:05:11 +02:00
rabuzarus 74267310d6 html to section_title.tpl 2015-05-30 02:21:30 +02:00
rabuzarus 553a152345 Merge photo-template into develop 2015-05-29 16:24:58 +02:00
rabuzarus 5cbb5b140c css work 2015-05-29 16:08:17 +02:00
Tobias Diekershoff 9a22b4818e Merge pull request #1618 from rabuzarus/vcard
remove html and make use of vcard-widget.tpl
2015-05-29 08:52:27 +02:00
Tobias Diekershoff ffefc512d3 DE update to the strings 2015-05-29 08:46:40 +02:00
rabuzarus 415a606a59 better solution to exclude Contact Photos and include count of Photos 2015-05-28 15:54:53 +02:00
fabrixxm b3992e1c65 Merge pull request #1599 from fabrixxm/issue-1574
Issue #1574
2015-05-27 11:07:30 +02:00
Tobias Diekershoff bfcd3bbc9e CS update to the strings 2015-05-27 09:58:20 +02:00
rabuzarus 15499ff1aa first step to get html code from photos.php removed 2015-05-27 03:35:29 +02:00
rabuzarus f309f3a681 remove html and use vcard-widget.tpl 2015-05-26 14:32:40 +02:00
rabuzarus b3054ee9d0 template for searchbox 2015-05-24 20:01:08 +02:00
fabrixxm 8990a22dc0 duepuntozer: style video delete button 2015-05-24 10:35:55 +02:00
fabrixxm d204e2524b vier: style video delete button 2015-05-24 10:34:17 +02:00
fabrixxm 646ea377ac quattro: readd video delete button styles
because i'm not so good at resolving merge conflicts...
2015-05-24 10:28:15 +02:00
fabrixxm b29b01fad4 Merge branch 'develop' into issue-1574 2015-05-24 10:26:21 +02:00
fabrixxm 4554526515 Merge pull request #1570 from rabuzarus/archive-widget
port of red matrix archive widget
2015-05-24 10:18:10 +02:00
fabrixxm 3a71978b0d Merge pull request #1598 from rabuzarus/datepicker
new datetimepicker for event creation
2015-05-24 10:16:29 +02:00
fabrixxm 7c2608e07d quattro: style video delete button 2015-05-23 22:51:34 +02:00
fabrixxm 83697cf3e5 Delete attachments on item deletion
Delete video from videos page
2015-05-23 22:35:02 +02:00
fabrixxm 3cb4f91807 Merge pull request #1596 from rabuzarus/event-preview
event preview for frost theme
2015-05-23 20:15:10 +02:00
fabrixxm dd9f4439ce update IT 2015-05-23 20:08:57 +02:00
rabuzarus 5e6c140fc1 add double click on calendar day for frost theme 2015-05-23 20:02:57 +02:00
rabuzarus 6731ffbfc8 event preview for frost theme 2015-05-23 19:23:32 +02:00
rabuzarus 3504b3b94f make frost + frost-mobile work with datepicker 2015-05-23 18:49:56 +02:00
rabuzarus 76283ff205 cleanup quattro less file 2015-05-23 17:50:18 +02:00
rabuzarus 9c803f7dbb quattro css changes added to the less file 2015-05-23 17:45:44 +02:00
Michael Vogel 41d5e89f50 Merge pull request #1592 from tobiasd/20150522-de
DE update to the strings
2015-05-23 09:21:05 +02:00
rabuzarus 2ad8fdc40b port of red matrix datepicker implementation 2015-05-22 18:53:18 +02:00
Tobias Diekershoff a9fa049659 DE update to the strings 2015-05-22 16:58:16 +02:00
Tobias Diekershoff 0f0e570aa0 NL update to the strings 2015-05-21 19:03:28 +02:00
fabrixxm dbafc917c2 update IT 2015-05-21 10:54:03 +02:00
fabrixxm 8bbffe0a54 update IT 2015-05-21 10:50:29 +02:00
rabuzarus 101804d505 minor polishing 2015-05-19 01:07:40 +02:00
rabuzarus 30348a1bc0 port of red matrix archive-widget 2015-05-19 01:03:08 +02:00
Tobias Diekershoff d4cb18538e PT-BR: update to the strings 2015-05-16 07:41:40 +02:00
Tobias Diekershoff 9575fd4a73 Merge pull request #1560 from rabuzarus/add_event
Double click on day in calendar creats new event starting that day
2015-05-15 08:20:15 +02:00
rabuzarus fc4a76c033 Double click on day in calendar creats new event starting that day 2015-05-15 00:07:41 +02:00
fabrixxm cbbb5da321 Merge pull request #1558 from rabuzarus/event-preview
Event preview
2015-05-14 16:32:24 +02:00
rabuzarus de197405d0 port of red's event editing preview 2015-05-14 13:20:58 +02:00
Tobias Diekershoff 2dd8db7de8 Merge pull request #1554 from FlxAlbroscheit/develop-1
Issue #1504: Creating groups directly from the sidebar in contacts-page
2015-05-13 19:59:58 +02:00
FlxAlbroscheit 4667d0e7e8 Add a group with one click 2015-05-12 14:09:51 +02:00
Michael Vogel 237b5a6e40 New page setting for the maximum frontend load value. 2015-05-02 22:05:04 +02:00
Michael Vogel b5e10329f2 The oembed iframe now has a class name to use it for stylesheets. 2015-04-30 06:12:21 +02:00
Tobias Diekershoff e9dd3b38f3 DE update to the strings 2015-04-25 11:18:30 +02:00
Tobias Diekershoff 14d61b5644 FR update of the strings 2015-04-14 13:41:56 +02:00
Tobias Diekershoff 60a17ef88e CS update of the strings 2015-04-14 13:40:24 +02:00
Michael Vogel 1058d055d1 Merge remote-tracking branch 'upstream/develop' into 1504-contact-update
Conflicts:
	mod/contacts.php
2015-04-12 09:59:28 +02:00
Michael Vogel 2c3e2908b2 There is now a new possibility to update contact data. 2015-04-11 23:51:47 +02:00
Michael Vogel 26eceaacbe Merge remote-tracking branch 'upstream/develop' into 1504-unified-follow 2015-04-09 19:49:57 +02:00
Michael Vogel f6ea872986 The behaviour when following a new contact is now unified. 2015-04-09 00:10:21 +02:00
Tobias Diekershoff 4ad52a417a DE update to the strings 2015-04-08 12:06:05 +02:00
Michael Vogel 3195157b2e Merge pull request #1499 from tobiasd/20150407_lng
CS, FR update to the strings
2015-04-07 19:08:30 +02:00
Johannes Schwab 107b495183 fix infinite scrolling with frost-mobile 2015-04-07 13:26:09 +02:00
Tobias Diekershoff 7ecc401b5c FR update of the strings 2015-04-07 09:07:04 +02:00
Tobias Diekershoff 52549dae7b CS update to the strings 2015-04-07 09:00:12 +02:00
Tobias Diekershoff 106b0b5d23 Merge pull request #1460 from FlxAlbroscheit/develop
Issue 1163: Feature allowing desktop-notifications
2015-04-05 11:37:05 +02:00
Tobias Diekershoff 415960a31a DE update to the strings 2015-04-02 21:34:59 +02:00
Tobias Diekershoff 33952e5f1d DE update to the strings 2015-04-02 18:23:27 +02:00
FlxAlbroscheit f054dbfc8d Feature for desktop-notifications 2015-03-31 02:11:46 +02:00
Tobias Diekershoff 0309c481a3 updating the core translation 2015-03-30 09:21:01 +02:00
Tobias Diekershoff dd21750d90 Merge pull request #1428 from FlxAlbroscheit/develop
Access a contact directly from the contact-manager-page
2015-03-12 07:13:31 +01:00
FlxAlbroscheit 82359bb6cc Give access to contact's profile-URL 2015-03-10 22:47:38 +01:00
Michael Vogel 2eba5a32df New screenshot for "vier". 2015-03-09 23:21:40 +01:00
Michael Vogel 08696acb18 Merge remote-tracking branch 'upstream/develop' into 1503-faster-tags 2015-03-08 03:23:49 +01:00
Michael Vogel 67d39770ed Improved the margins of the headers 2015-03-07 21:12:18 +01:00
Tobias Diekershoff 96a5257d9c RO: update to the strings 2015-03-05 22:48:50 +01:00
Michael Vogel 52e33d50ad Changing header sizes and changing the header type of oembed data. 2015-03-01 21:58:31 +01:00
Michael Vogel da49814cbb Use a header element for the oembed data. 2015-03-01 21:24:10 +01:00
Michael Vogel bf0f7c3d0a New bbcode elements h1 to h6 for a better conversion of Diaspora content 2015-03-01 20:07:56 +01:00
fabrixxm eb1f21d1e5 Merge pull request #1412 from annando/1502-vier-plus-default
"plus" is now the default style at "vier" for new installations
2015-02-23 08:51:31 +01:00
Michael Vogel f3cc065e66 Show the profile visibility only for Friendica contacts. 2015-02-21 20:03:02 +01:00
Michael Vogel 19af382ffb "plus" is now the default style at "vier" for new installations 2015-02-21 09:44:13 +01:00
Michael Vogel 8179f2f65e Only show the relation on native networks. 2015-02-20 23:56:41 +01:00
Michael Vogel a8a37a35db Only show the options that fit to the current network. 2015-02-20 23:12:04 +01:00
Michael Vogel 7e42315d9c Merge pull request #1408 from tobiasd/issue885
decreasing bubble display time in themes from 10s to 5s
2015-02-19 23:02:55 +01:00
Tobias Diekershoff 985d771b13 decreasing bubble display time in themes from 10s to 5s 2015-02-19 21:24:09 +01:00
Michael Vogel 4a1105ede6 scrape/noscrape now contains the date the profile was last updated or the last message was sent. 2015-02-18 23:40:46 +01:00
Fabrixxm b7a50a24c7 Merge branch 'release-3.3.3' into develop 2015-02-18 08:38:06 +01:00
Michael Vogel 4b7ff42a89 Bugfix: See issue 1338 2015-02-17 19:48:02 +01:00
Michael Vogel a26d04574d Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape 2015-02-17 19:18:17 +01:00
Michael Vogel 52de6c11b1 There is now a link to the profile behind the avatar picture on the display page 2015-02-17 17:33:28 +01:00
Fabrixxm 9d3fb417c2 Escape values to input fields (and some 'title' and 'alt') 2015-02-16 09:30:12 +01:00
Johannes Schwab 9f4523dc9a fix infinite scrolling with frost 2015-02-13 01:21:57 +01:00
Johannes Schwab 12d7ca9b84 improved infinite scrollling 2015-02-13 00:40:59 +01:00
Tobias Diekershoff e3b6770ad4 CS, ZH-CN: update to the strings 2015-02-12 07:59:21 +01:00
Tobias Diekershoff 400e11fd9f ZH-CN update to the strings 2015-02-10 07:47:26 +01:00
Tobias Diekershoff 4e4702fb8b CS, IT: update to the strings 2015-02-09 19:53:35 +01:00
Fabrixxm f4f0f2bbc7 update IT strings 2015-02-09 11:55:14 +01:00
Tobias Diekershoff 93cb464d79 DE update to the strings 2015-02-09 11:19:56 +01:00
Michael Vogel 21c63e8b65 Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape 2015-02-09 10:16:48 +01:00
Tobias Diekershoff 18cfb5e726 Merge pull request #1377 from tobiasd/20150209cs
CS update to the strings
2015-02-09 08:45:48 +01:00
Tobias Diekershoff 898d4b2a62 CS update to the strings 2015-02-09 07:57:03 +01:00
Michael Vogel 842ac46857 Scrape now contains the number of contacts as well. 2015-02-08 23:35:29 +01:00
Michael Vogel 7e9ae24511 Moved several settings from .htconfig.php to the admin settings page. 2015-02-08 20:35:40 +01:00
Michael Vogel 8871591a98 Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default
Conflicts:
	mod/admin.php
2015-02-08 13:26:28 +01:00
Tobias Diekershoff b4dc344f9c Merge pull request #1374 from annando/1502-noscrape-always-active
Noscrape is now enabled all the time
2015-02-08 12:48:13 +01:00
Tobias Diekershoff 1418d6bc27 Merge pull request #1373 from annando/1502-bugfix-admin-aside
Bad HTML in the admin side menu for webfinger and probe
2015-02-08 12:47:46 +01:00
Michael Vogel 1781fbff13 Bad HTML in the admin side menu for webfinger and probe 2015-02-08 12:12:19 +01:00
Michael Vogel f931eba7f2 Noscrape is now enabled all the time. 2015-02-08 12:07:35 +01:00
Michael Vogel 1d48ab0191 "altpager" is now the standard value and can be disabled. Depending upon the user reactions we can disable it in an upcoming version. 2015-02-08 11:54:42 +01:00
Tobias Diekershoff cea445de2e FR update for the strings 2015-02-08 10:44:47 +01:00
Tobias Diekershoff 5aba3abfc1 CS DE FR: update to the strings 2015-02-05 11:06:23 +01:00
Tobias Diekershoff 485432e734 FR: some more updates to the strings 2015-02-04 11:54:13 +01:00
Tobias Diekershoff 14dec94d33 DE FR: update to the strings 2015-02-04 11:41:06 +01:00
Michael Vogel f5ec5a4349 Some diabook features can dramatically slow down the system. There is a new switch to disable this. 2015-02-03 19:59:47 +01:00
Tobias Diekershoff 09b90244c3 Merge pull request #1344 from annando/1502-new-vier-version
New version for "Vier"
2015-02-02 21:50:54 +01:00
Michael Vogel 9c0dc86eea Merge pull request #1342 from tobiasd/20150202_admin
added diagnostics tools to the admin side panel
2015-02-02 21:14:41 +01:00
Michael Vogel dbe52c74b5 Added Beanow as author, since he did most of the last changes. 2015-02-02 21:03:14 +01:00
Michael Vogel 9f0e19762e New version for "Vier". The navigation was restructured and several other stuff was changed as well, thanks to Beanow! 2015-02-02 21:00:32 +01:00
Tobias Diekershoff 8a17c3d348 added diagnostics tools to the admin side panel 2015-02-02 18:26:38 +01:00
Michael Vogel 1fb79a1a59 Merge pull request #1333 from tobiasd/20150131_ptbr
PT-BR: update to the strings
2015-02-01 16:40:24 +01:00
Silke Meyer c90e47556a added setting for server's sender email address 2015-01-31 15:54:12 +01:00
Tobias Diekershoff ac86aa5822 PT-BR: update to the strings 2015-01-31 08:42:36 +01:00
fabrixxm 147413507b Merge pull request #1320 from tobiasd/20150127adminpanel
add links to the plugin config pages for active plugins
2015-01-28 08:24:29 +01:00
Tobias Diekershoff 3df7370fa8 add links to the plugin config pages for active plugins 2015-01-27 14:34:11 +01:00
Michael Vogel 6a34210353 Merge remote-tracking branch 'upstream/develop' into 1501-better-contact-list 2015-01-27 10:20:00 +01:00
Michael Vogel 848c09935a The contact list in mails now contains not only the name but also the address. 2015-01-27 08:04:24 +01:00
fabrixxm 44df625bad Merge pull request #1305 from tobiasd/20150123-quaddro
making the ignore button in contact suggestions visible in quattro
2015-01-25 11:59:17 +01:00
fabrixxm 174d78c768 Merge pull request #1317 from tobiasd/20150125cs
CS update to the strings
2015-01-25 11:55:22 +01:00
Tobias Diekershoff fc62c329c5 Merge pull request #1316 from annando/issue-1197
Issue 1197: New hook for "oembed_fetch_url"
2015-01-25 08:23:52 +01:00
Tobias Diekershoff 5cb3a0fced CS update to the strings 2015-01-25 08:21:55 +01:00
Michael Vogel cb9196f6d6 Issue 1197: New hook for "oembed_fetch_url" 2015-01-25 00:58:51 +01:00
Tobias Diekershoff a33ca89bb7 adding missing styling to the ignore button in quattro 2015-01-24 07:22:55 +01:00
Tobias Diekershoff c5b8956730 FR update to the strings 2015-01-24 07:05:55 +01:00
Tobias Diekershoff 619f2a86f3 DE update to the strings 2015-01-24 07:05:42 +01:00
Tobias Diekershoff d3bb944700 making the ignore button in contact suggestions visible in quattro 2015-01-23 09:51:24 +01:00
Michael Vogel ed037124b3 Merge pull request #1299 from fabrixxm/optional-text-only-email
Optional text only email
2015-01-20 23:26:44 +01:00
fabrixxm b2527039b7 add text-only email option
add a checkbok to notification settings. if checked, html body is not added to email.
2015-01-20 19:19:58 +01:00
Tobias Diekershoff c5200f9327 profile edit homepage field type URL 2015-01-19 08:15:20 +01:00
Tobias Diekershoff d58bac1138 template for password now support required and autofocus 2015-01-16 19:36:09 +01:00
Tobias Diekershoff 8b20af6ef5 template for input fields now supports required, autofocus and types email, url 2015-01-16 19:31:23 +01:00
Tobias Diekershoff a21fe4059b Merge pull request #1285 from annando/1501-enhanced-poco
"location" and "about" for contacts, improved suggestions, improved contacts exchange
2015-01-09 08:37:05 +01:00
Michael Vogel b36d799044 Fetching "location" and "about" from diaspora. Displaying them on the "display" page. 2015-01-07 01:46:13 +01:00
Tobias Diekershoff b0ffe11b21 add thread un/ignore functionality to quattro theme 2015-01-05 09:05:27 +01:00
Tobias Diekershoff 882f9c83d6 FR update to the strings 2015-01-02 08:26:08 +01:00
Tobias Diekershoff 32400f5127 FR IT update to the strings 2014-12-31 12:41:00 +01:00
Tobias Diekershoff e24f97de43 FR update to the strings 2014-12-30 09:04:35 +01:00
hauke a72d60f481 Added h-card and functionality for IndieAuth/Web-sign-in 2014-12-28 15:48:24 +01:00
Rabuzarus 432cf6f2ce insert new line at the end 2014-12-25 16:31:52 +01:00
Rabuzarus 73f9d06e3e move some html code from photos.php to photo_album.tpl 2014-12-25 16:20:55 +01:00
tobiasd dcd78603d3 Merge pull request #1243 from tobiasd/20141212
RO and FR: update to the core strings
2014-12-14 07:56:18 +01:00
Michael Vogel 8b433c2d11 Vier: New style "dark" 2014-12-13 23:13:34 +01:00
Tobias Diekershoff f02435408c RO and FR: update to the core strings 2014-12-12 19:01:08 +01:00
Silke Meyer f493252ac8 Use a sans-serif font-family in breathe 2014-12-06 20:05:30 +01:00
Michael Vogel 70ba1667e1 It is now possible to define the hostname from the admin page. This should definetely end the problem that the hostname couldn't be detected unter certain conditions. 2014-11-08 00:07:21 +01:00
Carsten Pfeiffer 00c16b387a Make TinyMCE editors resizable 2014-11-01 22:18:42 +01:00
Michael Vogel 691aa17025 fetch further information: it is now possible to define a blacklist for keywords for "fetch further information" 2014-10-30 00:24:23 +01:00
Michael Vogel 2b5372aebe Forcing all non-SSL requests to SSL requests is now an option. 2014-10-26 22:15:12 +01:00
Michael Vogel c77a63fb27 remote self: There is now an option if the keyswords should be used as tags or not. 2014-10-24 01:37:33 +02:00
Fabrixxm 295b4d7f61 Update develop from 'master' 2014-10-16 10:47:40 +02:00
Tobias Diekershoff 56cd536652 use noscrape by default, add opt-out option to disable it 2014-10-13 19:19:54 +02:00
fabrixxm 6f92dd00d3 Merge pull request #1182 from tobiasd/20141009
RO: update to the strings
2014-10-13 15:01:42 +02:00
Tobias Diekershoff 5c316fa541 RO: update to the strings 2014-10-09 17:59:27 +02:00
Tobias Diekershoff 75f6f3d68b PT-BR: updating the strings 2014-10-07 18:34:43 +02:00
Fabrixxm e2dc4f922c Friendica 'Ginger' 3.3 2014-10-06 08:56:55 +02:00
Tobias Diekershoff 74be3ac543 updating core translations from transifex 2014-09-28 15:04:54 +02:00
fabrixxm bd0b93e630 Merge pull request #1165 from annando/1409-issue-1157
Issue 1157: Unused javascript function is removed.
2014-09-27 19:03:20 +02:00
Michael Vogel 2bbd7ab67f Issue 1157: Unused javascript function is removed. 2014-09-27 14:17:50 +02:00
hauke 2743514791 bug fix #1135, show more is usable again 2014-09-22 13:53:16 +02:00
fabrixxm f6cebf607f remove unneeded htconfig templates 2014-09-20 12:14:59 +02:00
fabrixxm f6cfdf4af1 remove uneeded email templates 2014-09-20 12:10:24 +02:00
fabrixxm d2afb263ae Set internal PuSH server as default 2014-09-20 12:08:10 +02:00
fabrixxm 6da5cf8037 fix residual curCSS, should fix #1153 2014-09-20 11:24:06 +02:00
Fabrixxm 133b5bca59 fix oembed video template 2014-09-17 11:02:58 +02:00
Fabrixxm d1029e1fb2 tweak quattro theme 2014-09-17 10:59:19 +02:00
hauke 76535578ba bug fix: live function is deprecated 2014-09-15 19:48:17 +02:00
Michael Vogel f9bec79a2c In the profiles the remote connect field was missing 2014-09-11 23:38:24 +02:00
fabrixxm fd97f3013d fix quattro scroll and flash and vier flash on display page 2014-09-11 18:56:33 +02:00
fabrixxm df1f9d5eb7 Update IT strings 2014-09-10 19:05:43 +02:00
Tobias Diekershoff 2234f257b6 missed the settings template for duepunto 2014-09-07 18:02:58 +02:00
Beanow 948c52f13e Added styling to show settings headers can be clicked. 2014-09-07 16:24:40 +02:00
fabrixxm a7302daf96 Merge pull request #1123 from fabrixxm/mail_notification_cleanup
Mail notification cleanup
2014-09-07 15:05:06 +02:00
fabrixxm b7bd29c347 Merge pull request #1124 from tobiasd/duepuntoderivs
added variations of duepuntozero to the theme as options to be selected
2014-09-07 15:04:26 +02:00
hauke baabb5ba8b removed fancybox as it is not used anywhere 2014-09-07 14:54:10 +02:00
Tobias Diekershoff 6415cc1a2c remove screenshot for greenzero 2014-09-07 14:31:46 +02:00
fabrixxm 21b1e09fad Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup 2014-09-07 14:28:03 +02:00
Tobias Diekershoff 2c8ca3ec36 deleted some editicon.png copies 2014-09-07 14:23:24 +02:00
fabrixxm a8c90155f8 db update mail via notification()
remove last template
2014-09-07 14:23:03 +02:00
Tobias Diekershoff a9782251e5 updating config files for duepuntozero 2014-09-07 14:00:09 +02:00
Tobias Diekershoff c72d850113 added slackr to duepuntoderivates 2014-09-07 13:57:51 +02:00
fabrixxm 5861bdd6e9 registration request as system notification
kill the template
send email to all admins
2014-09-07 13:55:02 +02:00
Tobias Diekershoff 0989ad335f added purplezero to duepunto as variation 2014-09-07 13:41:02 +02:00
Tobias Diekershoff 22d0190041 revive easterbunny from the dead 2014-09-07 13:29:56 +02:00
Tobias Diekershoff bbf22938ae added Comix as a colorset of duepuntozero 2014-09-07 13:09:02 +02:00
Tobias Diekershoff 2802402e57 added darkzero as colorset of duepuntozero 2014-09-07 13:01:23 +02:00
Tobias Diekershoff f0aaafa7aa added Greenzero as colorset of duepuntozero 2014-09-07 12:48:23 +02:00
fabrixxm 735e6bbcb4 Merge pull request #1121 from Beanow/hotfix/bug-1105
Fix illegal offset error for vier and quattro.
2014-09-07 12:48:13 +02:00
fabrixxm a5df9b8b5d Somebody stop me! (not really..) 2014-09-07 12:35:08 +02:00
fabrixxm 5997fb19ee More template gore! 2014-09-07 12:29:13 +02:00
fabrixxm 803854738b another massacre of templates 2014-09-07 11:48:23 +02:00
Beanow 8345ac7313 Fix illegal offset error for vier and quattro.
Fixes #1105
2014-09-07 11:47:08 +02:00
fabrixxm cab46e2772 Merge pull request #1120 from silke/deprecated-themes
Deprecated themes
2014-09-07 11:42:04 +02:00
fabrixxm a58e990cfc Merge pull request #1118 from tugelbend/master
bug fix #1115: settings were hidden on "social network" and "plugin" page
2014-09-07 11:37:55 +02:00
fabrixxm 9368c7e510 html mail template add img tag only if source_photo is defined 2014-09-07 11:20:56 +02:00
fabrixxm 9a0c37eb47 new password mail via notification()
new include/text.php::deindent() function
remove unused templates
2014-09-07 11:20:06 +02:00
Silke Meyer 12012be79d marked four more themes as unsupported 2014-09-07 11:00:58 +02:00
fabrixxm d85bdd8fb0 lost password verification mail via notification() 2014-09-07 10:27:39 +02:00
Silke Meyer d001ee5c65 Marked several themes from the zero theme as deprecated (all but
duepunto).
2014-09-07 10:26:45 +02:00
hauke a162ea7251 bug fix #1115 2014-09-07 10:26:38 +02:00
Silke Meyer a9b69b063c Marked several old themes as unsupported 2014-09-07 08:17:22 +02:00
hauke 2947be66b6 bug fix, wrong js lib included 2014-09-06 19:14:58 +02:00
fabrixxm 0e628f840f send ostatus follow/share notifications via notification()
remove unused templates
2014-09-06 18:15:18 +02:00
hauke 392b53dbf9 minified js files where out of date and inconsistently used. Removed until decision on minifying strategy 2014-09-06 17:46:31 +02:00
fabrixxm 1bdddebd44 connection confirm notification mail via notification()
remove unused email templates
add a check for unexpected reponse from server
2014-09-06 17:28:46 +02:00
hauke 5205756898 Merge branch 'release/ui-improvements' 2014-09-06 17:02:25 +02:00
hauke 7dcf37f053 changed cursor style on settings page globally 2014-09-06 17:01:05 +02:00
hauke 25d7087d9e Merge branch 'feature/2014-09-hackathon-ui-improvements' into develop 2014-09-06 16:55:07 +02:00
tobiasd 0e9c8f6f1a Merge pull request #1108 from tugelbend/master
jquery update to version 1.11
2014-09-06 16:35:24 +02:00
hauke 87fa2ee2af updated jquery to version 1.11, updated themes frost and diabook where necessary 2014-09-06 16:21:03 +02:00
fabrixxm 83df1f4583 fix italian smarty3 email templates 2014-09-06 16:12:05 +02:00
tobiasd 267927d2dd Merge pull request #1106 from silke/frost-mobile-modifications
Frost mobile modifications
2014-09-06 14:52:12 +02:00
Silke Meyer 6369399b9f Shrink user icons in timeline to 48x48 2014-09-06 14:38:43 +02:00
Silke Meyer b9b490057a different minor modifications 2014-09-06 14:25:36 +02:00
hauke ec68e33c6b make items on settings pages fold/unfold on click 2014-09-06 13:53:23 +02:00
Silke Meyer 3290f6b360 Reduced height of navbar 2014-09-06 12:20:55 +02:00
tobiasd 4aa2ae488b Merge pull request #1102 from tobiasd/newstrings20140906a
updating message.po and string.php
2014-09-06 12:20:42 +02:00
Tobias Diekershoff 97a8a7b362 ZH-CN: update to the strings 2014-09-06 12:13:04 +02:00
Tobias Diekershoff d0b1f0f5ba RO: update to the strings 2014-09-06 12:12:38 +02:00
Tobias Diekershoff dd65b06ecf PT-BR: update to the strings 2014-09-06 12:12:19 +02:00
Tobias Diekershoff 4571670e4f PL: update to the strings 2014-09-06 12:11:59 +02:00
Tobias Diekershoff b948dca729 NL: update to the strings 2014-09-06 12:11:44 +02:00
Tobias Diekershoff c0e9e1849a NB-NO: update to the strings 2014-09-06 12:11:00 +02:00
Tobias Diekershoff 70031d8d3e IT: update to the strings 2014-09-06 12:10:36 +02:00
Tobias Diekershoff 414451cdad IS: update to the strings 2014-09-06 12:09:08 +02:00
Tobias Diekershoff 57f3ccc967 RU: update to the strings 2014-09-06 12:08:48 +02:00
Tobias Diekershoff cb0a2b3d35 FR: update to the strings 2014-09-06 12:08:20 +02:00
Tobias Diekershoff ebbaedb97d ES: update to the strings 2014-09-06 12:08:02 +02:00
Tobias Diekershoff d283ed4f51 EO: update to the strings 2014-09-06 12:07:45 +02:00
Tobias Diekershoff 6ddfaaae82 DE: update to the strings 2014-09-06 12:07:13 +02:00
Tobias Diekershoff e982697e17 CA: update to the strings 2014-09-06 12:05:44 +02:00
Tobias Diekershoff 582b90613b CS: update to the strings 2014-09-06 12:05:25 +02:00
Tobias Diekershoff fe8a5a93b4 BG: update to the strings 2014-09-06 12:04:23 +02:00
hauke 9a8d106414 fixed contact action button bar, typo correction 2014-09-06 11:49:31 +02:00
hauke 191595766d removed old comment that is no longer true 2014-09-06 00:14:25 +02:00
Michael Vogel e21bcb82d2 Enhance the database structure checks when they failed. 2014-09-04 09:26:56 +02:00
Michael Vogel 0e2376b457 Updated font awesome to new version 2014-09-04 01:01:39 +02:00
Michael Vogel 7eeb320085 It is now possible to ignore threads. 2014-09-04 00:58:52 +02:00
Michael Vogel 73904bfa03 Added an alternate link to the profile in the atom feeds (feature request #925) 2014-09-03 09:52:31 +02:00
Michael Vogel e35c55dd3b Remote-self: It is now possible to chose between two different modes of mirroring. 2014-09-01 14:00:21 +02:00
Michael Vogel ea0f75a315 Bugfix: It was impossible to add groups. 2014-08-30 02:08:33 +02:00
Michael Vogel 4d3e3eb4d1 Bugfix: connecting with other users now works again. 2014-08-28 01:15:40 +02:00
Michael Vogel 316f0a75cd Showing the network name on the display page. 2014-08-25 16:17:49 +02:00
Michael Vogel dd511ac70a The "display" page now shows the current author profile with a "connect" link (if there is no current connection) 2014-08-25 14:09:56 +02:00
Michael Vogel c5cc99c716 BBCode: Depending upon the image size of the preview picture for a link, the image is displayed differently 2014-08-25 14:08:26 +02:00
Michael Vogel 33b612a920 Bugfix: There was a JS error that prevented the work of the comment buttons 2014-08-25 14:07:11 +02:00
Michael Vogel 94d2557077 Vier: Some more design changes to "plus" style. 2014-08-21 01:00:56 +02:00
Michael Vogel d23d26f44d Reduced options when adding a friendica contact and an address was provided via URL parameter. 2014-08-21 00:56:21 +02:00
Michael Vogel 271a184e1e proxy: Added support for long addresses. "vier": New style "Plus" 2014-08-16 01:40:38 +02:00
Michael Vogel de75d8ca7f Merge remote-tracking branch 'upstream/master'
Conflicts:
	mod/admin.php
2014-08-13 00:18:05 +02:00
Michael Vogel d4b2d3bf8a Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in the page settings. 2014-08-13 00:13:13 +02:00
tobiasd 016b6428a0 Merge pull request #1067 from Beanow/feature/noscrape
Added noscrape feature.
2014-08-10 13:24:21 +02:00
Beanow 9026810496 Added noscrape feature. 2014-08-10 12:45:34 +02:00
Michael Vogel 1a865bf400 New description for the option to reload the page only when on top. 2014-08-01 20:11:56 +02:00
tobiasd 1940905454 Merge pull request #1055 from annando/master
Working with GUID and Object-Type - bugfix for API
2014-07-24 08:40:29 +02:00
Michael Vogel ed1dce93d6 Usage of /display/(guid) as path instead of /display/(user)/(id)
Bugfix for adding tags to photos
2014-07-22 00:36:20 +02:00
Tobias Diekershoff e3ac4b2746 removing commented out stuff 2014-07-12 12:29:58 +02:00
Tobias Diekershoff b1d9483bef allow scaling on mobile themes 2014-07-11 07:40:34 +02:00
Michael Vogel c980e6d20d Possibility to disable the automatic reload of the network page 2014-07-09 21:32:32 +02:00
Michael Vogel 38fb43702f Vier: Preview picture in admin settings is now smaller 2014-06-20 00:01:20 +02:00
Michael Vogel 7eea5fc212 Merge remote-tracking branch 'upstream/master' 2014-06-19 23:01:33 +02:00
Michael Vogel 297d8a6cc6 The icon for the website is now changeable in the config 2014-06-17 20:11:35 +02:00
AlfredSK 75dd860292 Fixed two typos in strings.php and BBCode.md 2014-06-17 14:20:23 +02:00
Michael Vogel 8bce8b0bd2 Vier: The setting for defining the default style is now working 2014-06-16 00:00:05 +02:00
Michael Vogel 2747c19bdd Vier: Border between side menu and content in "flat" style 2014-06-15 19:37:14 +02:00
Michael Vogel e1c7c2b092 Merge remote-tracking branch 'upstream/master' 2014-06-15 18:26:59 +02:00
Michael Vogel 029633c16d Merge pull request #1020 from silke/vier-border-radius
Vier border radius
2014-06-15 18:26:23 +02:00
Silke Meyer f70bdb984f A few more changes for breathe style in vier. 2014-06-15 18:16:02 +02:00
Silke Meyer 7fdcc15182 same drop-down menu for contact details as for user menu 2014-06-15 14:57:52 +02:00
Silke Meyer 321c711a3d top bar icons stay dark upon hover 2014-06-15 13:35:34 +02:00
Silke Meyer dd1b28314e space between logo and sitename 2014-06-15 13:25:27 +02:00
tobiasd f23f6ca9c6 Merge pull request #1017 from silke/vier-border-radius
Vier border radius
2014-06-15 08:33:43 +02:00
Silke Meyer d738395b0f active tab 2014-06-15 02:00:25 +02:00
Michael Vogel 82c4e3fe50 The page info function can now be called with a picture link, support for big and preview images for attachments in global.css 2014-06-15 01:59:19 +02:00
Silke Meyer 564ec8053a top nav bar colors 2014-06-15 01:58:18 +02:00
Silke Meyer 44dacd1d82 Just kept the differences for "breathe" style 2014-06-15 01:35:41 +02:00
Silke Meyer f15dec16d1 bg color and selected tab brighter 2014-06-15 00:56:05 +02:00
Silke Meyer cb1f52ad93 added style to theme.php 2014-06-15 00:26:49 +02:00
Silke Meyer db1ef0bfcf Transformed changes into its own Vier style 2014-06-15 00:19:38 +02:00
Silke Meyer 31730ec75b white text / icons in upper nav 2014-06-14 23:58:46 +02:00
Silke Meyer e961681f63 comment field 2014-06-14 23:31:27 +02:00
Silke Meyer 583207b5c3 edit field 2014-06-14 23:28:28 +02:00
Silke Meyer 39604c37d8 round corners for vevent 2014-06-14 23:25:00 +02:00
Silke Meyer e7171bb89a softer look for code fragments in postings 2014-06-14 23:22:41 +02:00
Silke Meyer 36c55f047b border-radius for messages 2014-06-14 23:20:08 +02:00
fabrixxm adefb06ff7 Merge pull request #1008 from annando/master
Expire, "attachment" element and database structure
2014-06-14 20:05:10 +02:00
Silke Meyer 911777a737 border-radius for tabs again, they seems to have got lost earlier 2014-06-14 19:12:55 +02:00
Silke Meyer 6e9ed089cf removed border at bottom of #live-network 2014-06-14 19:07:42 +02:00
Silke Meyer f5c7b47788 made drop-down menu on user icon a bit more "softer" 2014-06-14 18:48:31 +02:00
Silke Meyer e1b9783338 border-radius for search box 2014-06-14 18:39:23 +02:00
Silke Meyer c324e2c9f9 Small border-radius for tabs 2014-06-14 18:37:15 +02:00
Silke Meyer 17a78e7186 added small border-radius for event notice 2014-06-14 18:29:36 +02:00
Silke Meyer f533332ad5 added border-radius for #profile-jot-form 2014-06-14 18:25:34 +02:00
Silke Meyer 29fbedcaf4 added border-radius for tread-wrapper 2014-06-14 18:23:56 +02:00
Tobias Diekershoff 5d58badee2 NL: update to the strings 2014-06-10 21:38:27 +02:00
Michael Vogel ce29f55536 Vier: Some small color changes 2014-06-10 20:22:53 +02:00
Michael Vogel bb641dec62 Vier: pager content is now centered 2014-06-06 00:38:27 +02:00
Michael Vogel c83aae2f1f Vier: Making the pager look better 2014-06-05 23:59:38 +02:00
Michael Vogel 4984a3703f Vier: Redesigned tabs 2014-06-05 21:36:55 +02:00
Michael Vogel e729d2e216 Show title for the reply button. 2014-06-04 00:43:43 +02:00
Tobias Diekershoff 56a9dec41a NL: update to the strings 2014-06-02 08:04:54 +02:00
Michael Vogel 13fea42d8c Merge remote-tracking branch 'upstream/master' 2014-05-29 23:04:57 +02:00
Michael Vogel 1fdfd614f0 Vier: Make the smiley button look better integrated into the theme. 2014-05-29 22:56:04 +02:00
Michael Vogel 00b8355ad5 The number of comments per post are now editable. 2014-05-29 22:26:03 +02:00
Michael Vogel b0df06dd72 Vier: When clicking on the reply button, the focus now automatically changes to the textarea. 2014-05-29 20:27:06 +02:00
fabrixxm f58104e357 Merge pull request #1000 from fabrixxm/master
update IT strings
2014-05-29 15:04:39 +02:00
Fabrixxm 46dd72643f update IT 2014-05-29 14:55:15 +02:00
fabrixxm 77a54c66be Merge pull request #998 from annando/master
"Vier": New font version, fallback for oembed, more tracking variables removed
2014-05-29 14:04:04 +02:00
Michael Vogel 0eafed3353 Vier: New "font awesome" version, changed "reply" button, comment area is now hidden until the first reply came. (Saves space) 2014-05-29 11:51:13 +02:00
Tobias Diekershoff a6f89ef8bb RO: added smarty3 template translations 2014-05-29 07:12:10 +02:00
Tobias Diekershoff 5fbdc60333 RO: added strings 2014-05-29 07:06:09 +02:00
Tobias Diekershoff e3122c4bf3 NB NO: update to the strings 2014-05-29 07:03:42 +02:00
Tobias Diekershoff e908d88e47 PT BR: update to the strings 2014-05-19 08:09:49 +02:00
Tobias Diekershoff a0b9665a38 NL: update to the strings 2014-05-19 08:09:10 +02:00
tobiasd 1388b7ac27 Merge pull request #984 from annando/master
Better look for embedded videos, removing tracking parameters, new shortening function
2014-05-19 08:05:16 +02:00
Michael Vogel d964e7e08f New function for shortening of text (is used by the buffer export)/Vier: comment bubble is now grey. 2014-05-18 23:39:34 +02:00
Michael Vogel 665139660a Make embedded videos look better. (better margin data) 2014-05-18 20:30:27 +02:00
Tobias Diekershoff 13d578234d small update to the CS and DE strings 2014-05-17 14:49:05 +02:00
Tobias Diekershoff b1b6fa21fa FR + CS: register_adminadd template from transifex 2014-05-17 08:50:39 +02:00
Tobias Diekershoff 801d0a85f9 CS: update to the strings 2014-05-17 08:48:29 +02:00
Tobias Diekershoff 5cbcf79e27 FR: update to the strings 2014-05-17 08:46:51 +02:00
Tobias Diekershoff 5c941ad978 FR: update to the strings 2014-05-17 08:44:45 +02:00
Tobias Diekershoff bcafa23292 DE: update for the strings 2014-05-16 12:08:41 +02:00
Tobias Diekershoff e275494090 FR: update to the strings 2014-05-15 07:54:55 +02:00
fabrixxm 0774a5c5fd Merge pull request #970 from annando/master
Deleted the duplicate file "wall_attach.php"
2014-05-12 22:07:41 +02:00
Michael Vogel 0f16672176 Deleted the duplicate file "wall_attach.php" 2014-05-12 21:30:53 +02:00
tobiasd 31312ab1d2 Merge pull request #956 from annando/master
New database system that uses PDO if present/Test script for doing database upgrades.
2014-05-09 21:55:01 +02:00
Sven Anders 0dac5bf804 Make uimport URL work for Sites with subfolder
BUGFIX: If you have a site like http://exmaple.com/friendica you will get a wrong url
2014-05-06 14:15:15 +02:00
Michael Vogel 6b38968f80 The template "register_adminadd_eml.tpl" was missing for all languages except german. That lead to an empty page when adding users. 2014-05-04 21:11:25 +02:00
Michael Vogel c27bd7d0b4 The pagetypes are rearrange to make the differences better understandable. 2014-05-03 12:10:38 +02:00
Michael Vogel 059b88b7a0 The CSS code for shared messages is moved from "vier" to the global.css, so that it is usable for all themes. 2014-05-03 12:08:42 +02:00
Tobias Diekershoff 27ff19a92c FR: update to some templates 2014-04-30 17:05:01 +02:00
Tobias Diekershoff 1741dd2a1d NB-NO: update to the strings 2014-04-30 17:02:45 +02:00
Tobias Diekershoff 1469407777 ZH-CN: update to the strings 2014-04-30 17:02:06 +02:00
Tobias Diekershoff c732cefcfd CS: update to the strings 2014-04-30 17:01:27 +02:00
Tobias Diekershoff 92035cdca4 FR: update to the strings 2014-04-30 17:00:56 +02:00
Michael Vogel 4ca857e110 Empty template to avoid errors when installing themes. 2014-04-29 13:33:39 +02:00
fabrixxm b69f6b6ade Merge pull request #953 from tugelbend/master
Vier: Fix for the display of long text event entries
2014-04-29 09:07:32 +02:00
Fabrixxm cae89749d7 vier: remove unused .less files, fix photo comments 2014-04-28 09:42:41 -04:00
Fabrixxm 42a9d0af09 quattro: fix photo comments, small fix to search_item template 2014-04-28 09:31:48 -04:00
Fabrixxm aba27ad404 fix photo comments: use $drop array as in wall_thread and search_item 2014-04-28 09:29:48 -04:00
Fabrixxm 2904b7d354 quattro: remove 'do not edit' comments from templates 2014-04-28 08:47:10 -04:00
hauke b8bf26ec1f code cleanup, replaced tabs with spaces 2014-04-27 14:53:45 +02:00
hauke f14835ce4a re-added missing styles for event 2014-04-27 14:50:39 +02:00
hauke cd1a726d87 code cleanup 2014-04-27 14:44:42 +02:00
hauke c111cec560 event entry: added some padding for a nicer look 2014-04-27 14:41:31 +02:00
hauke 21f5004821 bug fix: event entry. long text doesn't wrap in colorbox popup 2014-04-27 14:35:32 +02:00
Tobias Diekershoff 05dc93de7c DE: update to the strings 2014-04-26 12:27:44 +02:00
Tobias Diekershoff 4503680a8f fix for the DE strings 2014-04-26 09:18:43 +02:00
tobiasd a9c8aed9b1 Merge pull request #942 from davidmoerike/master
Line: 68 f.
2014-04-26 09:16:03 +02:00
tobiasd c1d14bcc98 Merge pull request #944 from annando/master
Some more frontend stuff/Native Diaspora reshare
2014-04-26 09:13:17 +02:00
David ecc8ccebba File messages.po changed.
Utility executed: po2php.php view/de/messages.po

Friendica no longer works; gives blank page.

When changing to English by disabling the german language package of the browser, it still works.

David
2014-04-26 08:05:07 +02:00
Michael Vogel 2846dfeb05 Ther eis now a user setting to disabled notices. The Diaspora reshare now checks for empty values. 2014-04-26 02:22:30 +02:00
Michael Vogel 79da821c75 Added template for Diaspora reshare 2014-04-26 01:33:33 +02:00
Michael Vogel e0c5934a28 Global CSS changed for opacity of disabled networks. 2014-04-24 16:41:22 +02:00
Michael Vogel 1227d071d1 The preview button is now a button. This is more consistent 2014-04-24 13:27:08 +02:00
Michael Vogel 97d8c03f33 Vier: removed the gray line under the user menu when it was selected 2014-04-24 13:02:50 +02:00
Michael Vogel ec1f07d5b7 Only show the preview button when it is activated/Menü arrangement changed for settings menu. 2014-04-24 12:39:27 +02:00
Michael Vogel 59c9a9adae OAuth-settings: The "cancel" button generated an error message (and is superfluous), so it is removed 2014-04-24 12:18:51 +02:00
Michael Vogel 2e7549c945 Show preview of the correct theme, not the mobile theme. 2014-04-24 12:14:45 +02:00
fabrixxm 807fc60d3e Merge pull request #941 from annando/master
Moved and renamed menu entries to improve the usability, global css, icons for social networks
2014-04-24 10:48:07 +02:00
Michael Vogel a50eefe292 New file "global.css" for stylesheet stuff that is valid for all themes 2014-04-24 10:26:02 +02:00
Michael Vogel c1988d7e08 Vier: Removed the delegations from the nav menu, renamed the hardcoded "impressum" to use the translations. 2014-04-24 10:19:13 +02:00
Michael Vogel b005423ebf New layout for connector settings. New global CSS for things that seems to be identical in most themes. 2014-04-24 10:17:19 +02:00
fabrixxm 22c45b9bf1 Merge pull request #938 from annando/master
API: Don't show own posts in mentions, some "vier" changes and provider name for diaspora
2014-04-22 16:15:42 +02:00
Michael Vogel b6384ec5be The postal code wasn't displayed correctly. 2014-04-22 15:53:26 +02:00
Michael Vogel 6e7d8b87bb Vier: attached link descriptions (type-link, ...) are redesigned to make it look more modern. 2014-04-22 01:03:08 +02:00
Michael Vogel 9185321c8b Diaspora-XML-Templates: Added provider name and some rearrangements to fit the exact order of the elements in diaspora (only for the beauty) 2014-04-22 01:01:21 +02:00
fabrixxm 84189ac775 Merge pull request #932 from annando/master
Preparation for bidirectional statusnet sync, functions moved from addons into the core and some converting stuff
2014-04-07 09:53:47 +02:00
Tobias Diekershoff 0d46dca4c1 ES: update to the strings 2014-04-06 08:01:23 +02:00
Tobias Diekershoff 90661a3cdc RU: update to the strings 2014-04-06 07:58:32 +02:00
Tobias Diekershoff dd0f35d443 NL: update to the strings 2014-04-06 07:57:06 +02:00
Michael Vogel 73f0496127 Vier: Added treatment of videos like links. (See the changes in the "parse url" section) 2014-04-04 11:03:34 +02:00
fabrixxm 29092ace44 Merge pull request #927 from annando/master
Massive SQL stuff
2014-04-04 07:28:06 +00:00
Michael Vogel a50484c27d Vier: Larger font for content. 2014-03-18 22:52:19 +01:00
Michael Vogel 49e16b0612 Vier: Fading effects for tags, borders for links 2014-03-16 17:24:10 +01:00
Michael Vogel 51bf7f7d17 Vier: The shadows are reduced a little bit. 2014-03-09 09:22:44 +01:00
tobiasd d29c981aa2 Merge pull request #919 from annando/master
plink, disabling features, triming the content of parsed urls
2014-03-02 08:31:03 +01:00
Michael Vogel 2b5345323f "vier": Several design changes. New option for coloured network items. 2014-03-02 01:29:20 +01:00
Tobias Diekershoff dd70b28144 RU: update to the strings 2014-02-25 08:22:22 +01:00
tobiasd 0eec22f656 Merge pull request #914 from annando/master
Vier, API and Twitter cards
2014-02-24 07:21:15 +01:00
Michael Vogel 7792c5f5f0 Vier: forgot to add template ... 2014-02-23 15:58:22 +01:00
Michael Vogel a4ecf74a5d Vier: Added config.php 2014-02-23 15:57:27 +01:00
Michael Vogel f663676cca Vier: Option to switch between shadow style and flat style. 2014-02-22 15:48:57 +01:00
tobiasd 5762ed2cdc Merge pull request #913 from friendica/20140222
RU: update to the strings
2014-02-22 12:46:55 +01:00
Tobias Diekershoff b8aa366496 RU: Update to the strings 2014-02-22 12:40:45 +01:00
tobiasd 623bf1c4d1 Merge pull request #912 from annando/master
More compatible "Vier", more speed and problems with some parsed characters
2014-02-17 08:00:21 +01:00
Michael Vogel 83c89bf17c Vier should now work better on some older browsers 2014-02-16 17:37:56 +01:00
tobiasd 3bbe7a75ec Merge pull request #911 from annando/master
target="_blank" and api improvements
2014-02-16 14:15:44 +01:00
Michael Vogel 01971428aa target="_blank" instead of target="external-link" 2014-02-11 23:42:06 +01:00
fabrixxm 99380bc60d quattro: css for reshare moved to LESS file 2014-02-05 20:48:40 +01:00
tobiasd f94728a13e Merge pull request #909 from annando/master
CSS-improvements: shared items and shared links
2014-02-04 23:11:24 -08:00
Michael Vogel 4591790ea7 shared items and shared links for duepuntozero, quattro and smoothly 2014-02-05 01:15:08 +01:00
Michael Vogel 81f216f347 Diabook: Support for shared messages and shared links 2014-02-05 00:41:19 +01:00
tobiasd ebc04e8506 Merge pull request #906 from annando/master
API now supports entities/Design changes to "vier"
2014-02-02 01:48:47 -08:00
Michael Vogel 6c46c8333d Vier: Adding some shadows. In the thread view showing the application when hovering over the network name (less information is sometimes more) 2014-02-02 09:57:31 +01:00
tobiasd af32740c04 Merge pull request #904 from annando/master
vier: Quick fix for a missing file (taken from quattro at the moment)
2014-01-28 21:08:01 -08:00
Michael Vogel 2be9e2f246 vier: Quick fix for a missing file (taken from quattro at the moment) 2014-01-28 22:55:19 +01:00
tobiasd d473cd9bc9 Merge pull request #902 from annando/master
schema.org and oembed
2014-01-28 09:28:43 -08:00
pixelroot c0eada4f03 new file: view/theme/smoothly/unsupported 2014-01-27 14:37:07 +01:00
pixelroot c3be0e9295 modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2014-01-27 14:36:38 +01:00
Michael Vogel a7079d4327 Adding metadata in the schema.org format. 2014-01-26 09:58:41 +01:00
Tobias Diekershoff dd356c3d81 NB NO: update to the strings 2014-01-23 07:51:07 +01:00
tobiasd aa22598b80 Merge pull request #900 from annando/master
Beautifiying export of shared posts to other networks
2014-01-18 22:23:59 -08:00
Michael Vogel de4d0765cb Beautifiying export of shared posts to other networks 2014-01-18 21:32:14 +01:00
fabrixxm d1befd9069 Merge pull request #890 from tobiasd/bbcode_in_registertext
add bbcode support for the page register textfield (close #871)
2014-01-18 01:02:02 -08:00
Tobias Diekershoff efbd20310a IS: update to the update_fail_eml template 2014-01-16 10:55:31 +01:00
Tobias Diekershoff 2cc72a1bc7 removed copy and paste leftover 2014-01-13 14:49:49 +01:00
Tobias Diekershoff 1e87780f5d removed copy and paste leftover 2014-01-13 14:45:37 +01:00
Tobias Diekershoff b84502c4e6 move <div> to the register.tpl 2014-01-13 14:40:26 +01:00
tobiasd 7c8e2e46d8 Merge pull request #894 from tobiasd/diabook_rememberme
added remember me checkbox to diabook login template
2014-01-12 23:49:43 -08:00
Tobias Diekershoff d4d3fa90e7 added remember me checkbox to diabook login template 2014-01-13 08:48:19 +01:00
Oliver e433dfad71 Quick fix: star and lock position on starred posts 2014-01-12 12:42:56 +01:00
Tobias Diekershoff 964f2bc4b1 FR: update to the strings 2014-01-09 08:37:10 +01:00
Tobias Diekershoff 6e59cc809e ZH_CN: update to the strings 2014-01-07 08:36:41 +01:00
Tobias Diekershoff fb0c522b50 CS: update to the strings 2014-01-07 08:32:26 +01:00
Michael Vogel 8eedebfee3 Cleaning up some changes from the merge 2014-01-05 16:28:42 +01:00
Michael Vogel aed28a24f1 Merge remote-tracking branch 'upstream/master'
Conflicts:
	mod/crepair.php
2014-01-05 16:22:42 +01:00
Michael Vogel 28df35052a Send notifications for each new post of a contact, option for creating a summary for a feed post 2014-01-05 16:10:02 +01:00
fabrixxm b0e8dbc4da Merge pull request #864 from fabrixxm/acl_automention
Acl automention
2014-01-03 06:09:12 -08:00
fabrixxm ad5a47aecf add fetaure switch for acl-automention 2014-01-03 14:40:43 +01:00
Tobias Diekershoff a5aa4bfbde DE: update to the strings 2014-01-01 11:31:05 +01:00
fabrixxm 7b5018fb76 Merge pull request #872 from annando/master
API: Supporting twidere, better supporting of the network field in the item table
2013-12-27 00:15:44 -08:00
Michael Vogel 4b0e370c4c Better handling of the network field in the item table. 2013-12-27 01:58:21 +01:00
Tobias Diekershoff 25d83f780d only show the remote_self option if admin allows it 2013-12-22 19:30:09 +01:00
Tobias Diekershoff f515def280 added remote_self as option to the contact repair dislog 2013-12-22 17:05:49 +01:00
Tobias Diekershoff 22a6c72b31 added option to the admin panel to allow users to set the remote_self flag 2013-12-22 16:14:34 +01:00
Tobias Diekershoff f93a4e13b8 PL: update to the strings 2013-12-21 16:32:06 +01:00
Fabrixxm 9a94c35120 acl selector add and remove mentions when a forum is selected. 2013-12-18 10:18:26 -05:00
Fabrixxm 06e8f31695 change action container div class to id. fix bug in quattro theme 2013-12-18 06:38:57 -05:00
Fabrixxm 9febcedf93 user contacts: fix #797 , add searching in url and nickname, add batch actions 2013-12-17 05:19:06 -05:00
tobiasd 68e0324c1b Merge pull request #853 from annando/master
Bugfix of the previous bugfix :)
2013-12-11 23:23:30 -08:00
Fabrixxm 9474a0deed Add better support to small screen to duepuntozero theme.
This close #823. It also add some styles for screens less than 960px.
It's not a mobile theme, but should be better to see in case.
2013-12-11 05:25:41 -05:00
Michael Vogel d487cb2078 vier: Screenshot updated 2013-12-10 20:56:50 +01:00
Michael Vogel bae844e367 New style for shared links. Preparation for changes in some addons 2013-12-08 16:49:07 +01:00
Michael Vogel 3e5b9e97e7 New "minimal" mode for displaying the network content. Preparation for e.g. a multicolumn layout. 2013-12-04 23:46:51 +01:00
tobiasd acd29f22a0 Merge pull request #842 from annando/master
mail settings: inflate/deflate settings
2013-12-01 02:26:36 -08:00
Michael Vogel 9c2b1d39ea mail settings: inflate/deflate settings 2013-11-30 21:32:44 +01:00
tobiasd bd2f1f8cb0 Merge pull request #833 from tobiasd/adduserhint
add the hint also as a placeholder in the add contact form (issue #786)
2013-11-19 02:34:54 -08:00
Tobias Diekershoff 32633d1534 PT-BR: update to the strings 2013-11-19 09:40:16 +01:00
Tobias Diekershoff dfc09f4ba1 DE: update to the strings 2013-11-19 09:39:54 +01:00
Tobias Diekershoff d4c56b227d add the hint also as a placeholder in the add contact form (issue #786) 2013-11-17 16:09:44 +01:00
Fabrixxm 0414e0a316 More "relocate":
button in user's setting to resend relocate message to contacts
option in admin's site setting to relocate a server
2013-11-13 06:07:49 -05:00
fabrixxm 15bb34caf0 Merge pull request #820 from maase2/patch-13
Update style.css
2013-11-11 01:49:37 -08:00
Tobias Diekershoff 825ecad89d CS: update to the strings 2013-11-08 19:43:03 +01:00
maase2 e010eb480e Update style.css
Add warning-message class
2013-11-08 14:34:12 +01:00
Tobias Diekershoff c53b483293 DE: update to the strings 2013-11-07 10:53:47 +01:00
tobiasd 7d1a6cc1d6 Merge pull request #803 from annando/master
SQL performance and reduction of database warnings
2013-11-07 01:03:31 -08:00
tobiasd d1a0206cdd Merge pull request #806 from maase2/patch-6
Update style.css
2013-11-03 23:37:05 -08:00
maase2 50f69ff23e Update style.css
This is for responsive Webdesign.
2013-11-03 11:27:49 +01:00
maase2 e6a81b47e0 Update style.css
This will fix the profile selector. It will be bring it on the left side.
2013-11-03 10:57:58 +01:00
Michael Vogel 711972a166 Merge remote-tracking branch 'upstream/master' 2013-10-25 23:35:03 +02:00
Michael Vogel 0ffeb4cf92 New field "network" in item table to speed up the system. 2013-10-25 23:33:53 +02:00
Michael Vogel 0cfeee2e47 Merge pull request #789 from tobiasd/20131020
added options to admin panel
2013-10-22 14:02:27 -07:00
Fabrixxm 0ccad6d7d2 quattro theme: version bump 2013-10-22 13:55:36 -04:00
Fabrixxm 900b90ad85 quattro theme update:
icon and notification for introductions
icon and notification for private messages
correct link to edit profile with single profile enabled
2013-10-22 13:53:12 -04:00
Tobias Diekershoff 8faeee9965 added config->info and system-suppress_language options to the admin panel 2013-10-20 16:17:39 +02:00
tobiasd c308bb9042 Merge pull request #788 from annando/master
Infinite scroll, "new share" is now standard
2013-10-20 06:04:25 -07:00
Michael Vogel 2e64802866 Merge remote-tracking branch 'upstream/master' 2013-10-20 13:01:24 +02:00
Michael Vogel e70b110984 Switching from "new share" to "old share" 2013-10-15 00:49:49 +02:00
Michael Vogel 693b6d0fd4 Infinite scroll: At the end of the network page new content is loaded automatically 2013-10-15 00:43:11 +02:00
Tobias Diekershoff a2a12a429f FR: update to the strings 2013-10-07 08:15:00 +02:00
Tobias Diekershoff 8bd6858bfa Merge branch 'master' of git://github.com/friendica/friendica 2013-10-07 07:46:39 +02:00
Michael Vogel 8adc1bd703 Vier: Improved scrollbar when the "aside" area is to short. 2013-10-04 11:12:29 +02:00
Oliver 53040c0814 Update style.css
no opacity for remote-link icon
2013-09-24 09:18:29 +02:00
tobiasd b178317cbb Merge pull request #774 from silke/frost-mobile-share-link
Transferred link link from Neptune theme (by 23n) to frost-mobile
2013-09-23 21:36:47 -07:00
Silke Meyer 5075770654 Transferred link link from Neptune theme (by 23n) to frost-mobile 2013-09-24 00:28:35 +02:00
Tobias Diekershoff a4d51c9195 FR: update to the strings 2013-09-20 14:48:38 +02:00
tomtom84 ca39c2acb4 - diabook update
-- adjust nav-bar, depending to userstatus
2013-09-11 19:14:41 +02:00
tomtom84 9ddca9425d update diabook-theme
-- fixed contact-edit-page
-- some css-fixes
2013-09-08 04:30:55 +02:00
tomtom84 06994b94b2 - update diabook-theme:
-- removed twitter-box from right col, because api is outdated
-- some css-fixes
2013-09-07 03:28:52 +02:00
tomtom84 4747145ca9 add a readme to diabook-folder and update my fork 2013-09-06 20:51:33 +02:00
tomtom84 8c0c807a59 add a readme to diabook-folder 2013-09-06 20:51:33 +02:00
Silke Meyer 9152198927 Added link to import a profile im register tpl 2013-09-04 20:51:04 +02:00
Tobias Diekershoff d21496454b NL: update to the strings 2013-08-30 14:42:40 +02:00
Tobias Diekershoff b0886d2d85 NL: update to the strings 2013-08-20 09:56:47 +02:00
Fabrixxm e8171a03d1 move register_adminadd_eml.tpl to view/en/ 2013-08-08 11:35:12 -04:00
Tobias Diekershoff 1b3961286d PT BR: update to the strings 2013-08-06 20:12:37 +02:00
fabrixxm 3e4c4f53f7 Merge pull request #750 from zered/deleted_user_disp
Deleted user display in admin page
2013-08-05 04:24:54 -07:00
Zered 82972be85e Adding a "User waiting for permanent deletion" table in admin page 2013-08-05 06:08:33 +02:00
Tobias Diekershoff 14474f965f NL: update to the strings 2013-08-04 08:40:55 +02:00
Tobias Diekershoff 7169906a3a NL: update to the strings 2013-07-31 06:41:11 +02:00
Tobias Diekershoff 7f36a6fcbd PL: update to the strings 2013-07-22 07:53:02 +02:00
Tobias Diekershoff 0972189372 allow admins to add a new user from the admin panel (eventually fixing oldbug #383) 2013-07-21 08:46:57 +02:00
Tobias Diekershoff d23e934d21 BG: update for the strings 2013-07-12 09:37:51 +02:00
Tobias Diekershoff 497cee4311 BG: update for the strings 2013-07-12 09:37:26 +02:00
Tobias Diekershoff c6ac24ba00 IT: update for the strings 2013-07-12 09:37:09 +02:00
Tobias Diekershoff 1f68ffe3d1 NL: update to the strings 2013-07-08 14:42:56 +02:00
fabrixxm 8b9ae53242 Merge pull request #713 from annando/master
ejabberd and friendica
2013-07-05 12:40:30 -07:00
Tobias Diekershoff 49785130c2 NL: update of the strings 2013-07-05 12:14:34 +02:00
Tobias Diekershoff b9093c300f FR: update of the strings 2013-07-05 12:14:20 +02:00
Tobias Diekershoff 3185e49042 PT_BR: update of the strings 2013-07-05 12:13:43 +02:00
Tobias Diekershoff 93dfdf85e8 NL: translation added from transifex 2013-06-29 10:45:25 +02:00
Tobias Diekershoff 790257c6c2 CS: update to the strings 2013-06-28 14:36:21 +02:00
Tobias Diekershoff 2f6d0dee7b DE: update to the strings 2013-06-28 14:35:53 +02:00
Tobias Diekershoff f87631b3f7 ZH_CN: update to the strings 2013-06-28 14:33:33 +02:00
Tobias Diekershoff 95ee7a3bdc PL: update to the strings 2013-06-28 14:31:57 +02:00
Tobias Diekershoff bb59c9c32a CA: update to the strings 2013-06-27 07:29:18 +02:00
Tobias Diekershoff 42644f6011 DE: update to the strings 2013-06-26 10:42:08 +02:00
Tobias Diekershoff dbc44f2b56 BG: added translation of the strings from transifex 2013-06-24 19:04:46 +02:00
Tobias Diekershoff 10b8ab5e89 BG: added translation of the strings from transifex 2013-06-24 19:04:25 +02:00
Michael Vogel 9bbf60ac9b Vier: A little rearrangement of the menu order. 2013-06-23 00:26:04 +02:00
Michael Vogel bd7abe210c Vier: Introductions are now shown. The popup menu when editing a profile is visible again. 2013-06-23 00:07:21 +02:00
Tobias Diekershoff 7e23221f95 FR: update to the strings 2013-06-22 07:13:44 +02:00
Tobias Diekershoff 756a1c9c52 IT: update to the strings 2013-06-21 09:00:16 +02:00
Tobias Diekershoff 6d58a5888a NB_NO: update to the strings 2013-06-21 08:56:16 +02:00
Tobias Diekershoff 443d170016 NB_NO: update to the strings 2013-06-20 07:50:19 +02:00
Tobias Diekershoff ecf3c2c9ce NB_NO: update to the strings 2013-06-19 10:57:59 +02:00
fabrixxm 5ac4d06036 Merge pull request #703 from fabrixxm/master
fix pagination template
2013-06-17 01:30:00 -07:00
Fabrixxm c82e5fde0a pagination: fix template 2013-06-17 04:28:34 -04:00
fabrixxm 7f2d396e6f Merge pull request #695 from fabrixxm/master
move html from paginate functions to template
2013-06-17 00:52:30 -07:00
Tobias Diekershoff f80567ce53 ZH-CN: update to the strings 2013-06-16 14:51:59 +02:00
Tobias Diekershoff 176cb241c2 IT: update to the strings 2013-06-16 14:51:17 +02:00
Tobias Diekershoff 49f33c8841 NB_NO: update to the strings 2013-06-16 14:50:22 +02:00
Tobias Diekershoff 4b02e11eeb CS: update to the strings 2013-06-16 14:49:04 +02:00
Fabrixxm faa510befc move html from paginate functions to template 2013-06-13 08:12:15 -04:00
Zach Prezkuta b4aa018d7b forgot to update Frost autocomplete JS location 2013-06-04 20:29:33 -06:00
Zach Prezkuta cc4d091db0 remove some now-unnecessary templates 2013-06-01 10:45:32 -06:00
Zach Prezkuta 127b7a589e eliminate Cropper conflicts with jQuery 2013-06-01 10:42:51 -06:00
Fabrixxm 2111f750fb quattro: show notification number in favicon 2013-05-31 06:18:59 -04:00
Tobias Diekershoff f153a4c9a1 PT-BR: update to the strings 2013-05-30 06:22:47 +02:00
Tobias Diekershoff 57b80923cf PT-BR: update to the strings 2013-05-29 21:49:36 +02:00
Tobias Diekershoff 5b1561334b DE: update to the strings 2013-05-29 21:48:59 +02:00
Tobias Diekershoff 5113885427 fix 540 in vier 2013-05-29 17:10:49 +02:00
Tobias Diekershoff c82ab9e1b5 fix bug #540 for quattro themes 2013-05-29 10:44:09 +02:00
Tobias Diekershoff ca623641ca CS: update to the strings 2013-05-25 07:29:24 +02:00
Tobias Diekershoff 1732de5c64 PL: update to the strings 2013-05-23 06:30:34 +02:00
root 8e9852dcba Missing smarty3 directory prevents installation 2013-05-18 11:10:22 +01:00
Tobias Diekershoff f840d72885 DE: update to the strings 2013-05-17 06:42:28 +02:00
Tobias Diekershoff 4d105f06e8 CA: update to the strings 2013-05-16 06:42:13 +02:00
Tobias Diekershoff 636fef1ffa DE: update to the strings 2013-05-14 19:17:44 +02:00
Zach Prezkuta db0a891a97 fix preloading 2013-05-11 12:40:09 -06:00
Zach Prezkuta 35358baac9 update to v4.0.0; point to local host of SWF 2013-05-11 10:55:09 -06:00
Zach Prezkuta 5d30008ab3 don't set img src in notifications to blank 2013-05-11 09:43:21 -06:00
fermionic 3a13aba62e Merge pull request #674 from fermionic/20130503-basic-video-support
basic video playback support using VideoJS
2013-05-11 08:33:36 -07:00
Tobias Diekershoff 06ab3eb44f DE: update to the strings 2013-05-09 19:07:20 +02:00
Tobias Diekershoff 218be8a3c0 DE: Update to the strings 2013-05-09 18:40:11 +02:00
Tobias Diekershoff ba6b2718cf DE: update to the strings 2013-05-09 18:38:57 +02:00
pixelroot b06dab97ba modified: view/theme/smoothly/default.php
modified:   view/theme/smoothly/style.css
	new file:   view/theme/smoothly/templates/tools.tpl
	modified:   view/theme/smoothly/theme.php
2013-05-08 14:46:42 +02:00
pixelroot e90c89f3fc new file: view/theme/smoothly/images/power.png
new file:   view/theme/smoothly/images/up.png
2013-05-08 11:09:08 +02:00
pixelroot 523548ff22 modified: view/theme/smoothly/default.php
modified:   view/theme/smoothly/images/down.png
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	view/theme/smoothly/images/power.png
	view/theme/smoothly/images/up.png
2013-05-08 11:08:21 +02:00
Zach Prezkuta bc57d7f64e bug in main.js for VideoJS on initial page load 2013-05-07 22:06:40 -06:00
pixelroot 258604f036 modified: view/theme/smoothly/css/typography.css 2013-05-07 14:30:04 +02:00
pixelroot 8c8d3913cc modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2013-05-07 14:01:54 +02:00
pixelroot 5ac6e82e7d modified: view/theme/smoothly/default.php
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
2013-05-07 09:39:14 +02:00
Zach Prezkuta bd20f6ed9a add some styling for the video player 2013-05-03 19:09:12 -06:00
Zach Prezkuta fec4581f34 basic video playback support using VideoJS 2013-05-03 18:17:56 -06:00
Tobias Diekershoff 0bbd0939e4 ZH-CN: update to the strings 2013-04-28 15:35:34 +02:00
friendica 2883c8bbc4 Merge https://github.com/friendica/friendica into pull 2013-04-28 04:31:11 -07:00
friendica 61a0f9c196 bug #540 and hush up a couple of log messages that are way too verbose 2013-04-28 04:30:20 -07:00
Tobias Diekershoff f84c57e7f2 DE: update to the strings 2013-04-27 10:57:06 +02:00
pixelroot f41c5dd1e5 modified: view/theme/smoothly/css/typography.css
modified:   view/theme/smoothly/default.php
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/templates/nav.tpl
	modified:   view/theme/smoothly/theme.php
2013-04-24 14:09:24 +02:00
friendica 115c8a53bf issue546 via Tobias 2013-04-23 18:58:52 -07:00
Fabrixxm 4dc72742ae remove unneeded files 2013-04-23 07:52:36 -04:00
Fabrixxm 379c761c3f missing "templates" folders 2013-04-23 07:47:57 -04:00
Fabrixxm 6fddd1cbbf template: remove old 'internal' template files, move smarty3 templates into 'templates' subdir 2013-04-23 03:35:31 -04:00
Zach Prezkuta 78e747016f update mobile theme settings pages 2013-04-18 19:47:27 -06:00
fermionic 7b342d7297 Merge pull request #664 from tobiasd/issue_554
Issue 554
2013-04-18 18:37:11 -07:00
Tobias Diekershoff 7be1040a63 DE: update to the strings 2013-04-14 17:26:23 +02:00
Tobias Diekershoff 5827db0ea3 check current password before changing the password 2013-04-14 17:22:42 +02:00
Tobias Diekershoff 17ca6290f5 DE: update to the strings 2013-04-06 08:25:33 +02:00
Zach Prezkuta 2316e0d731 update admin options for frost, frost mobile, and decaf mobile 2013-04-04 16:42:39 -06:00
Tobias Diekershoff bee80004db DE: update to the strings 2013-04-04 17:27:49 +02:00
Tobias Diekershoff e77521c42f PL: update to the strings 2013-04-03 09:28:37 +02:00
pixelroot ee07251d38 modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2013-04-01 19:36:22 +02:00
tobiasd cda327a368 Merge pull request #658 from annando/master
Mail importing problems, a small "vier" change
2013-03-30 01:46:13 -07:00
Michael Vogel eabefb2f04 vier: The background color of the right area is now white. 2013-03-29 11:18:20 +01:00
Tobias Diekershoff ad48ab2928 DE: update to the strings 2013-03-28 07:49:58 +01:00
pixelroot d685181101 modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2013-03-27 20:08:06 +01:00
pixelroot 2b7dd2f72b modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2013-03-26 17:10:58 +01:00
pixelroot 296c49f4a1 modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2013-03-26 15:47:17 +01:00
pixelroot 0a446da659 modified: view/theme/smoothly/css/typography.css
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
2013-03-26 11:28:22 +01:00
Tobias Diekershoff 48ba0619c5 PL: update to the strings 2013-03-26 07:27:09 +01:00
Tobias Diekershoff 8666673175 template additions for the options 2013-03-25 11:01:54 +01:00
Tobias Diekershoff 4986e0b3cd PL: update to the strings 2013-03-24 07:26:28 +01:00
Tobias Diekershoff d921ca26d0 RU: update to the strings 2013-03-23 08:49:40 +01:00
Tobias Diekershoff 6f382f016d RU: update to the strings 2013-03-22 07:25:08 +01:00
Tobias Diekershoff 869baa763f PL: update to the strings 2013-03-21 16:01:02 +01:00
Tobias Diekershoff 7d4f312345 DE: update to the strings 2013-03-21 15:57:52 +01:00
Michael Vogel 111495423c Imported mails were deleted the second time the poller ran - when moving or deleting of mails was activated. 2013-03-14 23:15:15 +01:00
pixelroot bb3e8ad785 modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2013-03-12 10:06:19 +01:00
pixelroot a65ae04bcc modified: view/theme/smoothly/style.css 2013-03-11 19:59:49 +01:00
pixelroot a2adc03636 deleted: view/theme/smoothly/login.tpl
deleted:    view/theme/smoothly/smarty3/login.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
2013-03-11 19:19:33 +01:00
Michael Vogel 5d3613c8bc Vier: The change from blue to black in links is now faded as well. 2013-03-07 19:34:54 +01:00
Michael Vogel c40c61c106 OStatus conversations: Fixed a bug when a message hadn't got an id.
vier: Some more changes to make the side menu static.
In the index.php I did a small change to make friendica compatible with the android client for diaspora.
2013-03-06 23:23:04 +01:00
Michael Vogel 86e19dda22 Vier: Some more changes to the theme.
Added a switch to suppress displaying of the tags.
2013-03-05 00:46:11 +01:00
Michael Vogel 8bb6b51967 Vier: Some more transition effects 2013-03-04 21:11:31 +01:00
Michael Vogel 421d484839 Merge remote-tracking branch 'upstream/master' 2013-03-04 00:05:17 +01:00
Michael Vogel 478a079665 Vier: Further changes: profile border is rounded. 2013-03-04 00:04:06 +01:00
Michael Vogel 8e1d253568 OStatus conversation: now the creation date of the item is store with the conversation
vier: The link color and the color of the top bar is changed.
2013-03-03 23:44:50 +01:00
friendica 1c55b0b359 Merge pull request #639 from annando/master
Community/Open Graph
2013-03-03 12:07:52 -08:00
Zach Prezkuta 0187283709 allow admin to prevent private image embedding on hub 2013-03-03 09:44:41 -07:00
Michael Vogel 05597b564d Merge remote-tracking branch 'upstream/master' 2013-03-03 16:30:18 +01:00
friendica f07df4f667 merge 2013-03-02 15:46:54 -08:00
Michael Vogel 2866f62c88 Suppoorting Open Graph and Dublin Core when displaying single item
Following link shorteners in parse_url
2013-03-02 14:46:06 +01:00
Tobias Diekershoff f97c81c178 kill some newlines 2013-02-25 13:05:30 +01:00
Tobias Diekershoff 7186331a89 Admin panel: show if an account has expired 2013-02-25 13:02:17 +01:00
tobiasd 69776fc54e Merge pull request #627 from fermionic/20130223-quattro-vier-smarty-updates
some smarty templates needed updating
2013-02-23 23:26:48 -08:00
tobiasd c83b82ee2b Merge pull request #626 from fermionic/20130223-disable-content-in-notifications
admin option to disable content in email notifications
2013-02-23 23:25:49 -08:00
Tobias Diekershoff 023752ae46 DE: update to the strings 2013-02-23 19:56:21 +01:00
Zach Prezkuta 047cf0d342 some smarty templates needed updating 2013-02-23 09:36:00 -07:00
Zach Prezkuta 4db50a3ecb admin option to disable post content in email notifications for the site 2013-02-23 09:31:34 -07:00
fabrixxm 45de0fa21b Merge pull request #624 from fabrixxm/quattrofixs
Some fixs to Quattro theme
2013-02-22 08:29:29 -08:00
Fabrixxm 7ac30330c6 update IT strings.php 2013-02-22 11:21:34 -05:00
Fabrixxm 7a6d63a1b3 quattro: autocomplete private message To field 2013-02-22 11:02:01 -05:00
Fabrixxm cc210bae3d quattro: fix item max-width, fix contact serarch autocomplete popup style 2013-02-22 10:45:40 -05:00
fermionic dbf51229d9 Merge pull request #621 from annando/master
Using "term" table to improve performance, OStatus autocomplete, some more performance stuff
2013-02-21 10:16:50 -08:00
pixelroot 5c6562a996 modified: view/theme/smoothly/style.css 2013-02-21 08:46:30 +01:00
Michael Vogel 0d4d15c73d Merge remote-tracking branch 'upstream/master'
Conflicts:
	mod/admin.php
2013-02-20 21:57:26 +01:00
pixelroot 7a1947b88a modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2013-02-20 21:03:02 +01:00
tobiasd e0e82afe18 Merge pull request #620 from tobiasd/master
CC mails
2013-02-18 22:26:09 -08:00
Tobias Diekershoff bd1c86ed49 PL: update to the strings 2013-02-18 09:18:45 +01:00