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

6628 Commits

Author SHA1 Message Date
rabuzarus c3b975e516 change fbrowser image margin and box-shadow 2017-04-05 12:46:09 +02:00
rabuzarus 190b03e706 add aria attributes for filebrowser 2017-04-05 12:34:00 +02:00
rabuzarus 0542cd6a14 add aria attributes + restructure some js to change the aria attributes 2017-04-05 11:46:42 +02:00
rabuzarus dd919b7f80 small css fix 2017-04-03 15:04:54 +02:00
rabuzarus 0bb1466723 use buttons for mobile jot nav 2017-04-03 14:32:54 +02:00
rabuzarus 0b280219c6 use box-shadow instead of border 2017-04-03 14:20:34 +02:00
rabuzarus 9f37acc6d4 add href attribute to jot links 2017-04-03 14:00:27 +02:00
rabuzarus 036c18be7b use height: 0 instead of display: none to hide jot sections 2017-04-03 13:38:07 +02:00
rabuzarus 68659c7740 add missing overflow to css 2017-04-03 12:55:06 +02:00
rabuzarus 4dfdbeba54 fix max-height for screens bigger than 768px 2017-04-03 12:46:31 +02:00
Hypolite Petovan 9237b2611a Merge branch 'develop' into rewrites/coding-convention-split2 2017-04-03 06:35:27 -04:00
rabuzarus 80f5a026be re-enabel browser for small screens 2017-04-03 02:04:13 +02:00
rabuzarus ee293f2ce2 Merge develop into 20170321_-_frio-fbbrowser 
Conflicts:
	view/theme/frio/js/filebrowser.js
	view/theme/frio/js/theme.js
	view/theme/frio/templates/filebrowser.tpl
	view/theme/frio/templates/jot.tpl
 2017-04-03 00:51:34 +02:00
rabuzarus 1ce5cc1b49 Merge pull request #3204 from Hypolite/improvement/frio-action-links-to-buttons 
Frio: Turn action links into buttons
 2017-04-02 23:15:57 +02:00
Michael Vogel d9451ef969 Merge pull request #3279 from Hypolite/improvement/add-composer 
Add Composer
 2017-04-02 14:57:37 +02:00
Hypolite Petovan 7606ac5e32 frio: Fix help pages inline code display 2017-04-01 17:58:35 -04:00
Roland Häder 49527b70d3 Merge branch 'develop' into rewrites/coding-convention-split2 2017-04-01 22:16:08 +02:00
Michael f6d7ee2781 Issue 3142: mcrypt is no more (as well as phpseclib) 2017-04-01 08:28:42 +00:00
Roland Haeder 60552260e1
Continued with CR: 
- added spaces as requested
- removed parentheses from include/require calls as they are no functions

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-31 21:04:39 +02:00
Roland Haeder 5bc2ebb267
Please use x() correctly: 
<?php
if (x($someArray, 'element')) {
	// Do something
}
?>

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-30 21:37:08 +02:00
Hypolite Petovan 109f851795 Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons 2017-03-28 03:14:03 -04:00
Tobias Diekershoff 4720778edc ES translation THX Albert 2017-03-27 22:06:56 +02:00
Hypolite Petovan 909439e59f Fix contacts "View" link color 
- Fixed whitespaces in `event.tpl`
 2017-03-26 19:22:19 -04:00
rabuzarus 5e54fb3a5f css: border for images, min-with for folders list 2017-03-26 14:00:00 +02:00
Hypolite Petovan 9375438216 Restore separator margins 2017-03-25 22:58:17 -04:00
Hypolite Petovan 8db4437ed7 Restores bold text for text dropdown button 2017-03-25 21:33:34 -04:00
Hypolite Petovan fa9ce4721a Fix superfluous comment box top margin 2017-03-25 21:29:13 -04:00
Hypolite Petovan c01c7ad746 Fix .btn-link hover/focus color 2017-03-25 21:28:53 -04:00
Hypolite Petovan 5b7c8d8631 Fix indent in search_item.tpl 2017-03-25 20:45:03 -04:00
Hypolite Petovan 359c246ef9 Various fixes 
- Removed superfluous CSS rule
- Fixed whitespace
- Restored separators in search_item.tpl
 2017-03-25 20:43:33 -04:00
Hypolite Petovan d7f80bf7e7 Merge branch 'develop' into improvement/frio-action-links-to-buttons 
# Conflicts:
#	view/theme/frio/js/filebrowser.js
#	view/theme/frio/templates/filebrowser.tpl
 2017-03-25 20:27:26 -04:00
rabuzarus aeb999c4d9 enable fbrowser for mobile view 2017-03-25 23:33:53 +01:00
Hypolite Petovan 632d77cfb1 Merge pull request #3251 from rabuzarus/20170320_-_fix_fbrowser 
Bugfix: fbrowser did insert 2 Pictures instead of only 1
 2017-03-25 16:13:31 -04:00
rabuzarus 8bbf43b9dd Remove the AjaxUpload element when jot modal is closed 2017-03-25 21:10:57 +01:00
Hypolite Petovan d78acd5408 Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons 2017-03-25 16:09:46 -04:00
Michael 18a2b48d1d Remove unneeded linefeeds 2017-03-25 19:31:32 +00:00
rabuzarus a2ad013830 some work on code standards compliance 2017-03-25 19:12:16 +01:00
Michael 0d49143a63 "no_utf" wasn't in use anymore - it is now removed completely 2017-03-25 10:51:00 +00:00
Hypolite Petovan 29fb28de43 Remove Embedly integration 
- Remove admin setting input
 2017-03-25 01:57:19 -04:00
Hypolite Petovan b9f4a6e4f0 Code cleanup + standards 2017-03-25 01:54:16 -04:00
Hypolite Petovan 85144908fa Improve display feedback on like actions 
- Move rotator in sight
- Preventively change display class before next item update
 2017-03-23 22:47:56 -04:00
Hypolite Petovan 87bf6d39dd More display fixes 
See
https://github.com/friendica/friendica/pull/3204#issuecomment-288908490
 2017-03-23 22:45:40 -04:00
Hypolite Petovan 991b62784a Remove spaces confusing jSmart in contact_template 
- Fix two missing button closing tags
 2017-03-21 22:39:29 -04:00
rabuzarus 835e54dfc3 upload images to the selected album 2017-03-21 23:08:37 +01:00
rabuzarus 2633e820ab remove upload file from jot because it's now in the browser included 2017-03-21 21:18:27 +01:00
rabuzarus 9acfbae6ea add justified-gallery to fbrowser 2017-03-21 20:39:31 +01:00
Hypolite Petovan 7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
rabuzarus af8bd4b45f frio: gui work for fbrowser + switch between image and file mode 2017-03-21 03:35:25 +01:00
rabuzarus c8a427804e Bugfix: fbrowser did insert 2 Pictures instead of only 1 2017-03-20 22:45:24 +01:00
Roland Haeder 09851331a9
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-20 20:51:32 +01:00
Hypolite Petovan 8a0b057dc7 Merge branch 'develop' into improvement/frio-action-links-to-buttons 2017-03-20 14:43:37 -04:00
rabuzarus 0060e2449e Merge develop into 20170316_-_fix_event_edit 
Conflicts:
	mod/events.php
 2017-03-20 16:46:36 +01:00
Hypolite Petovan 46c5b3b419 Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons 2017-03-19 21:12:20 -04:00
Michael 8dd732a896 Issue 3242: Define a maintenance reason 2017-03-19 13:24:07 +00:00
Roland Häder fef61a28cc
fixed chmod 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:02 +01:00
Roland Häder d9c22c7f3e
Continued a bit: 
- converted some else if to elseif (only PHP)
- converted some space -> tab (intending)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:02 +01:00
Roland Häder c2d8738285
added spaces (coding convention) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:51:54 +01:00
Hypolite Petovan 8d6d008d28 Fix frio style.css indentation 2017-03-17 20:46:31 -04:00
Hypolite Petovan 20406aacec All-around CSS display fixes 2017-03-17 20:28:31 -04:00
Hypolite Petovan 2e17885eb3 Fix jot display 2017-03-17 20:28:09 -04:00
Hypolite Petovan 80510ef4ca Fix group_side display 2017-03-17 20:28:00 -04:00
Hypolite Petovan d1a1dfe879 Fix profile display 2017-03-17 20:27:43 -04:00
Hypolite Petovan 03700d4ae5 Fix contact display 2017-03-17 20:27:31 -04:00
Hypolite Petovan 92a755f688 Fix event display 2017-03-17 20:27:17 -04:00
Hypolite Petovan 29936060cf Fix filebrowser display 2017-03-17 20:26:40 -04:00
rabuzarus 3cef98caf6 Merge pull request #3226 from annando/1702-only-worker 
The worker is now the only background processing system
 2017-03-17 13:22:23 +01:00
Hypolite Petovan 8ac8d779f6 Fix bulk drop button 2017-03-16 22:19:45 -04:00
Hypolite Petovan 67c40bf030 Fix "Mark all as seen" button display 2017-03-16 22:19:27 -04:00
rabuzarus 8ae8465d48 add dop event & fix event edit 2017-03-16 20:15:25 +01:00
Hypolite Petovan 802897c0ab Restored tabs display until a more complete CSS solution is worked out 2017-03-15 22:00:37 -04:00
Hypolite Petovan 214c76fec7 Reverted original display for item action links + jot bbcode buttons 
- Cleaned useless CSS
 2017-03-15 22:00:07 -04:00
Hypolite Petovan 077c4cadf1 Merge branch 'develop' into improvement/frio-action-links-to-buttons 2017-03-15 21:10:11 -04:00
rabuzarus b4bad92657 Merge pull request #3239 from Hypolite/issue/#3194-2 
Fix wrong deferred function name
 2017-03-15 19:53:16 +01:00
Hypolite Petovan 35ba3cce70 Fix wrong deferred function name 2017-03-15 14:42:34 -04:00
Hypolite Petovan 82ce1a449b Revert jot tabs to links due to Bootstrap not supporting button styling 2017-03-15 07:24:14 -04:00
Hypolite Petovan 30049d862c Fix comment double-posting 2017-03-15 07:07:06 -04:00
Hypolite Petovan 7cb44ae25a Turn all the action <a> tags into buttons 
- Add CSS changes to support both <a> and <button class="btn btn-link">
- Removed unnecessary "return false" in onclick attributes
- Simplified tabs in profile page to native Bootstrap behavior
 2017-03-14 23:47:02 -04:00
Hypolite Petovan fcea2e8504 Merge branch 'develop' into improvement/frio-action-links-to-buttons 2017-03-14 23:12:21 -04:00
rabuzarus 0143369e54 limit pagination page buttons to max 10 2017-03-14 18:31:03 +01:00
Hypolite Petovan 79f14749df Merge branch 'develop' into improvement/frio-action-links-to-buttons 
# Conflicts:
#	view/theme/frio/templates/search_item.tpl
#	view/theme/frio/templates/wall_thread.tpl
 2017-03-14 10:45:17 -04:00
rabuzarus 3061a37b4f Merge pull request #3232 from Hypolite/issue/#3194-2 
frio: Revert guid truncation for scrollToItem() and improve dropItem()
 2017-03-14 13:04:47 +01:00
fabrixxm fa3490ba5b Merge pull request #3224 from annando/1702-no-old_pager 
The old pager is now removed
 2017-03-14 10:29:03 +01:00
Michael Vogel 199bba20d9 Merge pull request #3200 from Hypolite/issue/#3195 
Improve pagination on frio
 2017-03-14 06:05:42 +01:00
Hypolite Petovan 327b00117d Improve dropItem() functionality 
- Drop the obsolete `#` char
- Add error case when deleting item
- Add item drop support to search items
- Add doc
 2017-03-13 12:12:13 -04:00
Hypolite Petovan f2a0c9fad1 Fix scrollToItem breaking dropItem functionality 
- Add doc
- Refactor function by removing double jQuery wrapping
 2017-03-13 12:10:03 -04:00
rabuzarus e1eb9231f4 Merge pull request #3202 from Hypolite/issue/#3107 
Delete frio obsolete Colors.php library
 2017-03-13 14:17:37 +01:00
Tobias Diekershoff dfc5dc2e9e Merge pull request #3223 from annando/1702-no-language 
The language string isn't displayed anymore
 2017-03-13 08:26:43 +01:00
Michael 77e8c44016 Merge remote-tracking branch 'upstream/develop' into 1702-only-worker 
Conflicts:
	include/onepoll.php
	include/queue.php
 2017-03-12 21:03:44 +00:00
Michael 259598e569 Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share 2017-03-12 20:52:48 +00:00
Michael 044e9a6603 Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager 
Conflicts:
	mod/profile.php
 2017-03-12 20:52:14 +00:00
Michael b6a4a2ec7f Merge remote-tracking branch 'upstream/develop' into 1702-no-language 2017-03-12 20:50:20 +00:00
Tobias Diekershoff 4cddb74f27 Merge branch 'master' into develop 2017-03-12 14:39:09 +01:00
Tobias Diekershoff 5097c74d21 DE translations 2017-03-05 12:40:31 +01:00
Hypolite Petovan 3ea830e221 Strip @hubzilla.server part from guid for autoscrolling purpuses 2017-03-03 21:45:36 -05:00
Tobias Diekershoff 1d667d7a45 tag change 2017-03-03 17:18:09 +01:00
Tobias Diekershoff 2fa9f76e67 better wording and placeholder for name 2017-03-03 10:28:29 +01:00
Hypolite Petovan cb49bcdb04 Turn actions links into buttons (nav, search) 
- Mirrored the changes from wall_thread to search_item
- Replaced a navbar link with a button with according CSS
 2017-03-03 01:19:49 -05:00
Hypolite Petovan 71f00eaf5f Turn action links into buttons 
- Turns <a role="button"> into <button type="button"> for responses and
dropdown menu in wall_thread.tpl
- Removes extraneous decorations
- Updates dropdown style to prevent hover shenanigans
- Add theme color to active "btn-default" buttons
- Add margin top to comment box that was stuck to the action buttons
 2017-03-03 01:00:52 -05:00
Hypolite Petovan 024908a3ec Delete frio obsolete Colors.php library 2017-03-02 19:00:22 -05:00
Hypolite Petovan ebdc9667f7 Improve readability 
- Move CSS block above the temporary block
- Add template description
 2017-03-02 11:30:41 -05:00
Hypolite Petovan 57ce6cf5da Improve pagination on frio theme 
- Add pager class discrimination
- Change links order to first / prev / 1 / ... / 10 / next / last
- Enable dynamic pagination coloring
- Prevent click on disabled links
 2017-03-01 23:41:54 -05:00
Hypolite Petovan 21cad46d19 Backward compatibility for theme other than frio 
- Add .pager .disabled CSS rule
 2017-03-01 23:40:34 -05:00
Hypolite Petovan a3cd804ff1 Fix default paginate.tpl 
Adding missing curly braces
 2017-03-01 23:23:14 -05:00
Michael cc86d8ea14 Language data won't be displayed anymore (it was experimental stuff) 2017-02-27 23:59:05 +00:00
Michael 997e94555b The old pager is removed 2017-02-27 21:46:37 +00:00
Michael 39386ded36 "old_share" is removed 2017-02-27 21:26:37 +00:00
Michael 99fb15037b Removed some more unneeded stuff 2017-02-27 06:27:22 +00:00
Michael 48209f0ecd Now there is only the worker. 2017-02-26 23:16:49 +00:00
Tobias Diekershoff 7442ce3d6d change Fan/Admirer to Subscriber 2017-02-26 16:47:11 +01:00
Michael cec79ddf2b See issue 3157: Fulltext is now disabled 2017-02-21 05:23:37 +00:00
rabuzarus 4264518859 Merge pull request #3170 from tobiasd/20170217-de 
DE translations
 2017-02-18 15:20:14 +01:00
rabuzarus d27b342f7d Merge pull request #3167 from Hypolite/bug/comment-box-undefined 
Bug comment box undefined
 2017-02-18 13:29:39 +01:00
Tobias Diekershoff 5e46b8315a DE translations 2017-02-17 10:14:38 +01:00
Hypolite Petovan 3cdfaa4fad [frio] Fix comment box not opening on focus, undefined on blur 
- Remove the callback system for commentOpenUI
- Remove comments

Fixes #3062
 2017-02-16 07:06:11 -05:00
Michael Vogel 043449c24b Merge pull request #3164 from tobiasd/20170215-quattro 
fix for less file of quattro, regen CSS
 2017-02-16 06:26:54 +01:00
Tobias Diekershoff 7e1f51b0f9 SV update to the strings 2017-02-15 08:13:06 +01:00
Tobias Diekershoff 51a6903b4c fix for less file of quattro, regen CSS 2017-02-15 07:55:30 +01:00
Tobias Diekershoff 8d2c74eb3c Merge pull request #3154 from rabuzarus/20170208_-_frio_fix_form_group_search_buttons 
Bugfix: frio - fix text of input elements disappears behind the button
 2017-02-09 10:20:52 +01:00
rabuzarus ad6ba9203e fix typo 2017-02-08 18:05:23 +01:00
rabuzarus dd752189f1 frio - fix text of input elements disappears behind the button 2017-02-08 17:50:59 +01:00
Tobias Diekershoff e223fee40d remove float left to fix issue 2987 in quattro theme 2017-02-08 07:21:19 +01:00
Tobias Diekershoff c574bc5538 Merge pull request #3151 from rabuzarus/20170203_-_frio_fix_tabbar_glitch 
Bugfix: frio - fix tabbar on mobile view
 2017-02-08 06:35:15 +01:00
rabuzarus d27c8f4932 fix oembeded video floating 2017-02-08 02:18:42 +01:00
rabuzarus 60ef105a14 frio - fix tabbar on mobile view 2017-02-08 01:34:36 +01:00
Tobias Diekershoff 2092fa03b2 Merge pull request #3147 from rebeka-catalina/vier_dark_item_links 
Vier dark item links
 2017-02-03 20:28:39 +01:00
rabuzarus 7f1acdb8e9 frio - append tabbar to nav only if it's a direct child of section 2017-02-03 19:37:47 +01:00
rabuzarus c12850250d Bugfix: frio - move tabs to the top of the contacts-template 2017-02-03 19:18:10 +01:00
rebeka-catalina 39da1f1d03 Update dark.css 2017-02-03 19:07:39 +01:00
rabuzarus a71f7aefbb Bugfix: frio - the tabbar should be hidden if it is in the section element 2017-02-03 19:00:55 +01:00
rebeka-catalina 2483e7cda7 Make links visually different from normal text 2017-02-03 19:00:04 +01:00
Tobias Diekershoff 94694aae86 RInO is not true / false anymore 2017-02-01 08:45:13 +01:00
rabuzarus ec4e60ce3a style the photo album page of the vier theme 2017-01-30 15:00:26 +01:00
Tobias Diekershoff 4b2f6138a4 smoothly is also allowed 2017-01-28 11:08:05 +01:00
Tobias Diekershoff d6e81117f9 system -> allowed_themes was not set in htconfig template 2017-01-28 08:26:40 +01:00
Hypolite Petovan c38a5e443d Merge branch 'develop' into issue/#3062 
* develop: (68 commits)
  Added documentation
  update to the translation
  update to the translations
  translation docs now contain basic usage of the Transifex client
  - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
  - Remove misc TinyMCE mentions in docs and minifyjs
  - Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter
  - Remove TinyMCE mentions in themes
  - Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value
  Remove tinyMCE libraries
  limit the description of the meta tag to 160 characters in /mod/display
  Improved handling of non string values in the config
  Bugfix: Caching of non string cache values now works.
  Reformatted stuff, improved query
  Auto-focus first input field of modal when shown
  Use cache instead of config for storing last proc_run time
  Some added logging
  Bugfix for masses of php warnings
  Rearranged the logging
  Some changed logging
  ...

# Conflicts:
#	view/theme/frost-mobile/js/theme.js
#	view/theme/frost/js/theme.js
 2017-01-27 15:30:21 -05:00
Michael Vogel d61a4a67db Merge pull request #3109 from Hypolite/issue/scrap-tinymce 
Scrap TinyMCE
 2017-01-27 21:08:33 +01:00
Tobias Diekershoff e5f0ba3407 update to the translation 2017-01-27 13:31:51 +01:00
Tobias Diekershoff 4523753455 update to the translations 2017-01-27 13:31:04 +01:00
Hypolite Petovan bf6d235b26 - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content 2017-01-26 23:04:38 -05:00
Hypolite Petovan 66482c1d9c - Remove $theme_richtext_editor boot var 
- Remove "richtext" feature
- Remove fix_mce_lf() function
- Remove nomce parameter
 2017-01-26 22:57:53 -05:00
Hypolite Petovan 4ad6a7f073 - Remove TinyMCE mentions in themes 2017-01-26 22:54:32 -05:00
Hypolite Petovan 9d5384f107 - Remove tinyMCE mentions or convert to addeditortext() 
- Remove $editselect template value
 2017-01-26 22:50:27 -05:00
Hypolite Petovan 73f182069e Auto-focus first input field of modal when shown 
Fixes #3101
 2017-01-22 11:01:10 -05:00
rabuzarus 5ab6843f38 Bugfix: fix typo in event variable 2017-01-20 13:24:53 +01:00
Fabio 81529a43ad Update IT strings 2017-01-18 12:38:09 +01:00
Hypolite Petovan b61479ba6e Merge remote-tracking branch 'friendica/develop' into issue/#3062 
# Conflicts:
#	view/theme/duepuntozero/theme.php
#	view/theme/smoothly/theme.php
 2017-01-12 09:19:59 +11:00
Hypolite Petovan 30a77cc10a Merge branch 'develop' of https://github.com/friendica/friendica into issue/#3039-theme 
# Conflicts:
#	view/theme/frio/theme.php
 2017-01-11 09:39:38 +11:00
Hypolite Petovan 623479a346 Normalize App parameter declaration (view folder) 2017-01-09 23:06:08 +11:00
Michael 16f0221e4c DBClean now has a smaller limit/Query improvements 2017-01-09 09:37:37 +00:00
Hypolite Petovan af4e6a36d4 Fix overzealous quote replace 2017-01-09 12:25:52 +11:00
Hypolite Petovan ecd86ec296 Check for existing element in openMenu() 
- Removed useless val() call in the various insertFormatting()
declarations
 2017-01-09 11:34:41 +11:00
Hypolite Petovan 479180ca8e Merge branch 'develop' into issue/#3062 2017-01-08 11:44:45 +11:00
Hypolite Petovan 05e68de695 Removing extraneous line feeds in conditions 2017-01-08 11:02:30 +11:00
Hypolite Petovan d7c9b293d3 Update insertFormatting() definition 
- Remove now useless comment parameter
- Formatting all around
- Update data-role=“insert-formatting” links
- Update onclick=“insertFormatting()” links
 2017-01-08 02:16:03 +11:00
Hypolite Petovan b50f1f970f Use placeholder attribute for Comment message 
- Remove global aStr.comment
- Remove global window.commentEmptyText
- Remove head.tpl $comment parameter
 2017-01-08 02:13:55 +11:00
Hypolite Petovan b6ce646d71 Use placeholder attribute for Share message 2017-01-08 02:06:03 +11:00
Hypolite Petovan daa8e4f901 Cleaning up, actual changes are in the next commits 
- Formatting
- Trailing spaces
- Extraneous blank lines
- Large comments
 2017-01-08 02:03:11 +11:00
Roland Häder 4f25396fae Merge remote-tracking branch 'upstream/develop' into develop 2017-01-07 09:23:58 +01:00
rabuzarus 898761b4a0 Show mobile theme selection only if mobile themes are available (default template) 2017-01-07 00:22:22 +01:00
Roland Häder cbc32143d7 Merge remote-tracking branch 'upstream/develop' into develop 2017-01-05 08:56:05 +01:00
rabuzarus 0994a0ced5 Frio: Show mobile theme selection only if mobile themes are available 2017-01-05 02:52:39 +01:00
Tobias Diekershoff 0c65dbb8db Merge pull request #3064 from rabuzarus/20170102_-_add_switch_element_to_frio 
Frio: implement On/Off switcher element
 2017-01-04 13:54:48 +01:00
Tobias Diekershoff 8f0ca51a55 Merge pull request #3065 from rabuzarus/20170103_-_frio_fix_nav_help_string 
Bugfix: Frio - use "Help" instead of "Help And Documentation" as label in the nav user menu
 2017-01-04 13:52:51 +01:00
Roland Häder 42c2e09382 Merge remote-tracking branch 'upstream/develop' into develop 2017-01-04 09:03:00 +01:00
rabuzarus 995e1fe690 Bugfix: Frio - use "Help" instead of "Help And Documentation" as label in the nav user menu 2017-01-03 17:49:40 +01:00
rabuzarus 860d6d51b9 Frio: add "aria-describedby" to the field templates 2017-01-03 17:38:08 +01:00
rabuzarus 96dfd22d9d Frio: implent switcher element 2017-01-03 17:33:01 +01:00
Tobias Diekershoff b783a98a9f DE translations THX Rabuzarus 2017-01-03 10:42:11 +01:00
rabuzarus 5bef39189b Bugfix: Frio css - add z-index to badges 2017-01-02 13:38:10 +01:00
Tobias Diekershoff e301dc7607 ES translation of the core 2017-01-02 08:22:52 +01:00
Tobias Diekershoff e74cee1e42 DE translation of the core 2017-01-02 08:22:39 +01:00
rabuzarus 885bd09598 Bugfix: fix the frio poke template 2017-01-01 22:05:24 +01:00
Roland Haeder d2df464d8c
added curly braces + fixed indenting according to code review by Hypolite 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-30 21:49:08 +01:00
Roland Haeder d2280d4120
Merge remote-tracking branch 'upstream/develop' into develop 
dbm::is_result() calls needed merge

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-30 21:33:41 +01:00
rabuzarus a6d7ad0755 Update cache on photo edit only when album name has changed 2016-12-26 02:41:00 +01:00
rabuzarus 3677467cef update perfect-scrollbar to version 0.6.15 2016-12-24 02:27:17 +01:00
Roland Häder 820ef8e4c7
changed to this: 
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-23 19:50:51 +01:00
Roland Häder f8a213e23b
*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-23 19:49:36 +01:00
Roland Häder 20e71d21a6 Merge branch 'rewrites/app_get_baseurl_static' into develop 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/editpost.php
	mod/events.php
	mod/install.php
	mod/lostpass.php
	mod/network.php
	mod/notify.php
	mod/suggest.php
	mod/uexport.php
	mod/videos.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
 2016-12-22 11:37:23 +01:00
Roland Häder 8b7d5d0efc Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 09:06:00 +01:00
Roland Häder 4c04a78d1b Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 09:03:44 +01:00
Michael Vogel 584cf75af3 Merge pull request #3041 from rabuzarus/20161221_-_frio_notifications 
frio notifications templates + local date & profile link for the notifications page
 2016-12-22 07:31:07 +01:00
rabuzarus 747e97a7b2 frio: revert img.intro-photo to 80pxx80px 2016-12-22 01:54:41 +01:00
rabuzarus 2fcbba9410 provide local time for notifications 2016-12-22 00:28:52 +01:00
rabuzarus 125d2f24dd frio: add profile link to the notifications url 2016-12-21 23:17:55 +01:00
rabuzarus 51c9a66fc3 frio: add notifications templates to frio 2016-12-21 20:39:07 +01:00
Roland Haeder 0436782e70
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 20:01:51 +01:00
Roland Haeder 2178feab30
Merge remote-tracking branch 'upstream/develop' into develop 2016-12-21 19:59:38 +01:00
rabuzarus 8a9143023d frio: append hovercard to body element 2016-12-21 16:22:20 +01:00
rabuzarus 24a58ab2e6 frio: append bs tooltip to body element 2016-12-21 16:12:13 +01:00
Roland Haeder bb06d9ce32
Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:17:19 +01:00
Roland Haeder 54615be22e
Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:16:01 +01:00
Roland Häder a883514604 Opps, forgot this ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 12:38:23 +01:00
Roland Häder c22878643b Opps, forgot this ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 12:38:11 +01:00
Roland Häder ace8f753ac added much more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/events.php
	mod/network.php
	mod/suggest.php
	mod/uexport.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
 2016-12-20 11:59:13 +01:00
Roland Häder e24c3a5b82 added much more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:56:34 +01:00
Roland Häder fb817b18ad changed to this: 
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:59:06 +01:00
Roland Häder 884f44ce94 *much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-19 14:27:16 +01:00
Michael Vogel 52f12ee28d Merge pull request #3010 from Quix0r/rewrites/mixed-static-object-reference-calls 
Rewrites: mixed static object reference calls (and very sadly more ...)
 2016-12-19 14:12:50 +01:00
Tobias Diekershoff 85dec3cf30 DE translation of the core 2016-12-19 12:22:47 +01:00
Roland Häder ff569756ee Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object-reference-calls 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/follow.php
 2016-12-19 09:40:34 +01:00
Michael bc323b0bfa OStatus: Follow/Unfollow should now work again. 2016-12-18 17:10:38 +00:00
Roland Häder 448c5aa694 Cleanup for #3010 - added spaces, thanks to @annando . 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-14 09:42:28 +01:00
Roland Häder dd8d797d9f Fixes for #3010 - removed baseurl as this is no longer done, still there are 89 
left in templates.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-14 09:34:13 +01:00
Roland Häder 63610c7b73 Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/Photo.php
	include/api.php
	include/cache.php
	include/dbstructure.php
	include/enotify.php
	include/items.php
	include/onepoll.php
	include/queue_fn.php
	include/session.php
	include/text.php
	mod/contacts.php
	mod/dfrn_request.php
	mod/display.php
	mod/events.php
	mod/item.php
	mod/message.php
	mod/msearch.php
	mod/photos.php
	mod/poco.php
	mod/profile.php
	mod/proxy.php
	mod/videos.php
	update.php
	view/theme/diabook/theme.php
	view/theme/vier/theme.php
 2016-12-13 11:00:44 +01:00
Roland Häder 6a8a36f12d More usage of dbm::is_result($r) instead of count($r): 
- count() returns very different results and never a boolean (not even false on
  error condition).
- therefore you should NOT use it in boolean expressions. This still *can* be
  done in PHP because of its lazyness. But it is discouraged if it comes to
  more clean code.

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

This PR adds quote escaping to the i18n strings.
 2016-10-21 11:29:23 -04:00
Hypolite Petovan b0a0cf94e4 Fix Issue #2865 - reshared posts and additional text 
😉
 2016-10-20 21:41:17 -04:00
Michael Vogel 1218e2f885 Merge pull request #2863 from rabuzarus/0510-update_fullcalendar 
frio: some improvements for displaying events
 2016-10-18 00:37:45 +02:00
rabuzarus b317f811e7 frio: better handling of event location in event hover cards 2016-10-17 22:58:30 +02:00
rabuzarus 967c3b3deb frio: events - don't show author name if there is no author name 2016-10-17 22:51:51 +02:00
rabuzarus 430ffb792e frio: stop the custom cal rendering (if no author-name exist) only for the modes agendaWeek and agendaDay 2016-10-17 22:14:12 +02:00
fabrixxm b50769b6d0 Merge pull request #2859 from rabuzarus/0510-update_fullcalendar 
quattro: fix events_reminder
 2016-10-17 20:14:01 +02:00
rabuzarus 88f1affb2f quattro: fix events_reminder 2016-10-17 18:57:21 +02:00
Hypolite Petovan 5efab810f5 [frio] Fix code block display 2016-10-16 23:57:34 -04:00
rabuzarus 8064ff6ecb update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover 2016-10-16 16:04:53 +02:00
Hypolite Petovan a843858654 Merge from develop 2016-10-08 13:45:14 -04:00
rabuzarus 88cef50aa2 frio: provide a edit profile button for the advanced profile page 2016-10-05 18:07:58 +02:00
rabuzarus 2a3e235f9a show/hide page-flags according to the account-type 2016-10-05 14:45:19 +02:00
Tobias Diekershoff aab6ec0ede DE update to the translation 2016-10-04 07:59:35 +02:00
Hypolite Petovan d9a5554543 Fix Issue #2822 - Add new setting to user settings page 
- Convert formatting to PSR-2
- Add new bandwitdh saver setting
 2016-10-02 15:25:10 -04:00
Hypolite Petovan 4021109696 Improve field_checkbox.tpl 
- Adds a hidden field to ensure the checkbox item will have a value
during save.
- Fix quotes for HTML attribute values
 2016-10-02 15:21:20 -04:00
rabuzarus b59f8fe9e0 Merge pull request #2834 from Hypolite/Issue-#2800 
Fix Issue #2800 - Prevent internal link from switching to Safari in standalone mode
 2016-10-02 05:50:10 +02:00
Hypolite Petovan 0094dd8240 Remove repeated comment in frio notification template 2016-10-01 19:03:32 -04:00
Hypolite Petovan 4242c3f749 Fix Issue #2800 - Prevent internal link from switching to Safari in standalone mode 
- Add link switch prevention to frio theme
- Add reference to the script page
 2016-10-01 18:53:25 -04:00
Hypolite Petovan f302f66dcd Fix Issue #2800 - Prevent internal links to switch to Safari in standalone mode 
Add a event delegation to keep internal links inside the standalone
window.

Fixes 1. of #2800
 2016-10-01 18:19:43 -04:00
rabuzarus 21b3037342 frio: improve readabillity for code blocks 2016-10-01 21:16:23 +02:00
Tobias Diekershoff 82dcc3fe79 Merge pull request #2821 from Hypolite/Issue-#2817 
Fix #2817 - Move translation language folder in a subfolder of view
 2016-10-01 10:58:32 +02:00
Hypolite Petovan 76b1b109e5 Fix Issue #2823 - Ugly scrollbars in oembed iframes and broken resizing 
- Fix _resizeIframe function, shorten the timeout between calls
- Simplify the oembed iframe generation code and reduce the minimum
iframe height to 200px
- Add smooth CSS transition for iframe resizing
 2016-09-30 23:26:22 -04:00
Hypolite Petovan 5a5284b94e Fix #2817 
- Move translation folders under `view/lang`
 2016-09-30 10:45:47 -04:00
Hypolite Petovan f4c2e2244d Fix #2814 
- [frio] Add a wrapping `a` tag around the notification text
- Add an event listener preventing popup menus to close when they are
themselves clicked
 2016-09-29 23:46:43 -04:00
Hypolite Petovan a05a425448 [frio] Capitalize Jot tabs title 
- Revert translation term change for "permissions"
 2016-09-28 21:09:03 -04:00
Hypolite Petovan 24969d79d8 [frio] Capitalize dropdown menu links 2016-09-28 20:59:54 -04:00
Hypolite Petovan b99b0ad931 [frio] Capitalize a few terms for consistency 
- Changed the translation term "permissions" because only frio is using
it
- Changed the vote links style because it is shared with other themes
 2016-09-28 20:53:25 -04:00
Hypolite Petovan 34acfa1706 [frio] Fix whitespace style.css 2016-09-28 20:51:56 -04:00
rabuzarus af3a672570 Merge pull request #2807 from Hypolite/frio-larger-view-develop 
[frio] Changes to shared post display (width, base font size)
 2016-09-28 20:32:11 +02:00
Hypolite Petovan ed5e46892d Set block quote size to current text-size 2016-09-28 14:25:41 -04:00
Hypolite Petovan 7de64afc45 Fix abnormal font size for shared posts 
- Use normal font size for shared content
 2016-09-28 14:01:12 -04:00
Hypolite Petovan f64bd451ca [frio] Increase available width for shared content 
- Added a bottom margin to the shared header
- Removed padding and horizontal margins for the shared content
 2016-09-28 13:08:58 -04:00
Hypolite Petovan 01a8671b66 Revert "[frio] Increase center column width" 
This reverts commit 0c383ad9ff.
 2016-09-28 12:58:44 -04:00
Hypolite Petovan 37b4b0205d [frio] Remove shared content horizontal margins 2016-09-28 11:59:54 -04:00
Hypolite Petovan 0c383ad9ff [frio] Increase center column width 
- Added two Bootstrap divisions to the center column
 2016-09-28 11:59:05 -04:00
Tobias Diekershoff 4aa834564a Merge pull request #2802 from annando/xmpp-profile 
New fields for the DFRN protocol (XMPP and Account Type)
 2016-09-27 20:57:56 +02:00
Michael Vogel 2f06e9360f "Company" is now "Organisation" and there is an auto update 2016-09-26 19:35:01 +00:00
Michael Vogel d632d282cd We are now having an account type and are publishing it 2016-09-25 20:37:27 +00:00
Michael Vogel 196eb6009f The XMPP address is now in the profile and will be transmitted 2016-09-25 15:28:00 +00:00
Tobias Diekershoff 89b5c9276b DE update to the translation 2016-09-24 14:16:58 +02:00
Tobias Diekershoff 076475383b FR update to the strings, THX Hypolite Petovan 2016-09-24 09:35:23 +02:00
Michael Vogel 3f35fed35a Special characters should be escaped 2016-09-23 06:29:02 +00:00
Tobias Diekershoff 529d2fc74b DE update to the translation 2016-09-22 12:37:39 +02:00
Tobias Diekershoff 754dc02753 PT BR update to the strings 2016-09-21 11:44:01 +02:00
Tobias Diekershoff e5c2c66487 Show the worker queue count if the workers are active 2016-09-20 15:45:55 +02:00
Roland Haeder c825cc8d0d
This merge brings back dbm::is_result() where I could find it. 
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-09-18 23:21:18 +02:00
Tobias Diekershoff 88285b4cbf The info is not that important 2016-09-14 06:45:05 +02:00
Tobias Diekershoff f85821839b display current state of PHP logging in admin panel logging informations 2016-09-13 22:52:21 +02:00
fabrixxm 3d6e3cbb78 Merge branch 'master' into develop 2016-09-13 17:19:57 +02:00
Tobias Diekershoff 4eec289522 FR update to the strings, THX Damien Goutte-Gattat 2016-09-13 15:41:38 +02:00
Michael Vogel 4d959f2f9d Merge pull request #2771 from rabuzarus/0709-frio-dropItem-fix 
frio: fix dropItem() didn't work for hubzila posts
 2016-09-07 06:53:53 +02:00
rabuzarus d506b0906c frio: fix dropItem() didn't work for hubzila posts 2016-09-07 03:22:02 +02:00
rabuzarus ced8923323 frio: show attachment icons in posts 2016-09-06 16:21:14 +02:00
Michael Vogel 9209d88c4a Set the charset for the SQL connection for new installations 2016-09-01 03:50:41 +00:00
rabuzarus 9653ae98ae frio: resize textareas on typing. 2016-08-23 16:48:13 +02:00
rabuzarus 37ae63e120 fix contact dropping on contact edit page also for other themes 2016-08-17 16:51:04 +02:00
rabuzarus 212aa99f28 frio: fix contact dropping on contact edit page 2016-08-17 14:32:43 +02:00
rabuzarus efdb98de6d frio: fix - add string to template 2016-08-13 18:59:59 +02:00
Tobias Diekershoff dbab4db754 Merge pull request #2727 from rabuzarus/1008-item-highlight 
frio: highlight - test if the item is available in the dom
 2016-08-10 14:49:27 +02:00
rabuzarus 83e95a5841 frio: highlight - test if the item is available in the dom 2016-08-10 14:42:57 +02:00
Tobias Diekershoff 2a79b8c235 Merge pull request #2726 from rabuzarus/1008-item-highlight 
Frio: fix auto jump to the item position in /display
 2016-08-10 14:42:11 +02:00
rabuzarus 5e440e5359 frio: highlight - wait until the whole page is loaded 2016-08-10 14:26:16 +02:00
rabuzarus cf23a81c33 frio: highlight - use offset() instead of postion() 2016-08-10 14:14:58 +02:00
rabuzarus 531cba5ce5 frio: fix - I used the wrong variable 2016-08-10 13:33:49 +02:00
rabuzarus 7e65d84577 frio: fix for display auto position scroll + some cleanup 2016-08-10 13:07:13 +02:00
Tobias Diekershoff 42b7c9cd74 DE translation 2016-08-10 12:31:54 +02:00
rabuzarus 40b0a8e30c frio: Remote is now called Guest 2016-08-09 14:39:18 +02:00
rabuzarus f52a06d013 frio: correct spelling 2016-08-08 22:25:54 +02:00
rabuzarus 4adc758adb frio: add some missing page background 2016-08-08 22:16:32 +02:00
rabuzarus 62b23b0631 frio: background for people search 2016-08-08 21:54:34 +02:00
Michael Vogel fe5e775b00 Merge pull request #2718 from rabuzarus/0808-frio_notifications_css 
frio: unify size of notif-images + background color for unseen notifs
 2016-08-08 21:31:00 +02:00
rabuzarus 6b979e5ad8 frio: fix duplicated ID's in aside section 2016-08-08 17:15:35 +02:00
rabuzarus 27f04100c8 frio: unify size of notif-images + background color for unseen notifs 2016-08-08 14:05:33 +02:00
Michael Vogel 61e3a8ca3a Merge pull request #2702 from rabuzarus/0308-Notifications-restructure 
notifications restructure
 2016-08-08 07:41:48 +02:00
Tobias Diekershoff 991914d563 vier 2016-08-06 10:54:54 +02:00
Tobias Diekershoff a9196dc0f8 Merge pull request #2712 from rabuzarus/0508-frio_mobile_login 
frio - provide mobile login/register buttons for mobile view
 2016-08-06 06:52:42 +02:00
rabuzarus f9ccdce4d4 Raise frio version number to 0.7 
Since I never raised the version number since starting this theme I raise the version of frio to 0.7 and removed the alpha. It is still much stuff to do for a 1.0 version but frio has done the last half year big steps forward.
 2016-08-05 20:37:51 +02:00
rabuzarus 8cc4d7a128 Update README.md 2016-08-05 20:31:14 +02:00
rabuzarus a5a28d11fc frio - provide mobile login/register buttons for mobile view 2016-08-05 20:17:06 +02:00
Michael Vogel 6abeff10c0 Merge pull request #2711 from rabuzarus/0408-frio-photo-tpl-fix 
photos - include paginate into the templates - provide a photo_album.…
 2016-08-04 23:59:43 +02:00
rabuzarus 3921113e5c photos - include paginate into the templates - provide a photo_album.tpl for frio 2016-08-04 21:53:22 +02:00
rabuzarus 94d297155c frio:implement comment highlighting with jquery.color 2016-08-04 19:59:45 +02:00
Michael Vogel d698534027 Merge pull request #2707 from tobiasd/20160804-de 
DE translations THX Andreas
 2016-08-04 14:58:24 +02:00
Tobias Diekershoff 3432268e80 Merge pull request #2708 from rabuzarus/0407-frio-picture-wall-fix 
frio:fix jot - posts with images were not available on wall
 2016-08-04 14:57:15 +02:00
rabuzarus e374ec2bc8 frio:fix jot - posts with images were not available on wall 2016-08-04 14:33:08 +02:00
Tobias Diekershoff c46a7ddd4a DE translations THX Andreas 2016-08-04 12:12:52 +02:00
Tobias Diekershoff 30b93b74db Merge pull request #2706 from rabuzarus/0308-frio_accept_requests_mobile 
frio: add intro action buttons for mobile devices
 2016-08-04 12:08:40 +02:00
rabuzarus e34e1f7c2b frio: add intro action buttons for mobile devices 2016-08-04 11:36:31 +02:00
Michael Vogel 2d63f9deb6 Worker fastlane can now be activated from the admin interface 2016-08-04 08:51:34 +02:00
rabuzarus ae905cbd1b Merge develop into 0308-Notifications-restructure 
Conflicts:
	mod/notifications.php
 2016-08-03 12:53:38 +02:00
Tobias Diekershoff 35bbc3948f DE update to the strings 2016-08-02 12:30:04 +02:00
rabuzarus 6d3c15fe91 notifications - add attendance notifications 2016-08-02 00:01:43 +02:00
rabuzarus bcee356f66 notifications - add docu & pagination 2016-08-01 23:04:41 +02:00
rabuzarus 7a4be1cead notifications.php: move more code to NotificationsManager 2016-08-01 18:18:11 +02:00
Tobias Diekershoff 75be187216 Merge pull request #2682 from annando/1607-api-generic-xml 
API: XML is now generated without templates
 2016-08-01 07:25:24 +02:00
Tobias Diekershoff a684a1c519 Merge pull request #2691 from rabuzarus/2607-contact_confirm 
frio: intro templates + some restructure of core notifications.php
 2016-08-01 07:15:24 +02:00
rabuzarus f7fa5f166b notifications.php: unify label strings 2016-07-30 11:03:21 +02:00
Michael Vogel 313bc5b0d2 Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-30 10:02:39 +02:00
Tobias Diekershoff 3034edca70 Merge pull request #2693 from rabuzarus/2107-contact_edit 
frio: contact_edit.tpl was missing a bracket
 2016-07-28 15:34:34 +02:00
rabuzarus e74da01276 frio: contac_edit.tpl was missing a bracket 2016-07-28 11:45:41 +02:00
rabuzarus 320751660d frio: intro notifications + some restructuring in core for notifications 2016-07-27 19:53:22 +02:00
Michael Vogel 287c9cfbdd Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-26 22:15:49 +02:00
Tobias Diekershoff 3e8da763ba IS update to the translations THX Sveinn í Felli 2016-07-26 11:18:38 +02:00
Tobias Diekershoff 18a35e9ceb Merge pull request #2688 from rabuzarus/2607-drop 
frio: provide confirm modal
 2016-07-26 10:45:52 +02:00
rabuzarus 694637f9c3 frio: provide confirm modal 2016-07-26 10:36:34 +02:00
rabuzarus 768d10536f frio: templates for contact_edit and crepair 2016-07-26 09:09:40 +02:00
Tobias Diekershoff 0cbc102c93 DE update to the strings 2016-07-21 09:20:21 +02:00
Michael Vogel 0e7ff6b4db Removed (now) unused templates 2016-07-19 08:46:41 +02:00
Michael Vogel 838f976715 Some more improvements to xml.php, code cleanup 2016-07-17 23:59:35 +02:00
fabrixxm ce2f765d28 API: rework share as retweet 
new shared status xml template.
<retweeted_status> element in xml.
parent status keeps his body and author, 'retweeted_status'
get body, author and plink from share bbcode.
 2016-07-13 22:29:07 +02:00
fabrixxm d98ab84d76 API: update template for friendica:owner data 
api_user_xml.tpl lost his root element.
Includer templates must provide it.
This allow to use same data structure under different root tag.
 2016-07-13 20:11:18 +02:00
rabuzarus 15471f3835 add possibility to load custom page templates + none.php pagetemplate is part of core now 2016-07-11 10:33:39 +02:00
rabuzarus 1cf4924e20 frio: fix url variable for textcomplete in contact_template 2016-07-03 09:50:34 +02:00
Michael Vogel 2ef50cb7e6 Site settings: some settings are disabled when the worker is active 2016-07-02 23:08:33 +02:00
rabuzarus 9170955f80 frio: fix textcomplete for jot 2016-07-01 17:03:40 +02:00
rabuzarus 571a4fed99 frio: restructure jot modal and make jot modal work on mobile 2016-06-27 10:33:20 +02:00
rabuzarus 75f838c53b frio: move some more headings to the navbar 2016-06-26 11:02:12 +02:00
rabuzarus aec885b963 frio: fix - jot default was not removed in every case while inserting content 2016-06-26 03:49:21 +02:00
Tobias Diekershoff 6c22cb917a Merge pull request #2639 from rabuzarus/2506_viewcontact_tabs 
viewcontacts - make the tabbar available even if hide-friends is active
 2016-06-25 19:48:35 +02:00
rabuzarus fd72f36ffe move html from function micropro() to own templates 2016-06-25 18:46:47 +02:00
rabuzarus 06959d745e viewcontacts - make the tabbar available even if hide-friends is active 2016-06-25 16:20:44 +02:00
Michael Vogel 9f99f37975 Merge pull request #2637 from rabuzarus/2506_wallmessage_js 
frio: Wallmessage - distinguish between own and foreign host
 2016-06-25 14:09:44 +02:00
rabuzarus 84263ee8de frio: Wallmessage - distinguish between own and foreign host 2016-06-25 13:02:53 +02:00
rabuzarus 073f520cee add missing strings for frio 2016-06-25 12:21:13 +02:00
Michael Vogel 49c19a3c00 Merge pull request #2628 from rabuzarus/1906-event-test 
move the cal addon (exporting calendars) to core
 2016-06-21 22:48:31 +02:00
Ben Roberts 864cf0f70d update MF2 and vcard data for issue #2629 2016-06-21 10:23:43 -04:00
rabuzarus 71c9f562ae move the cal addon (exporting calendars) to core 2016-06-20 23:31:49 +02:00
Michael Vogel b411380c4c Merge pull request #2625 from rabuzarus/1906-event-test 
frio: disable the events module link in the profile tab
 2016-06-20 14:26:27 +02:00
rabuzarus 80f5065eb0 frio: disable the events module link in the profile tab 2016-06-20 13:44:11 +02:00
Michael Vogel 9aa5c2f821 Merge pull request #2623 from rabuzarus/1906-event-test 
implement a public calendar for vistors of someones profile page
 2016-06-20 06:23:25 +02:00
Tobias Diekershoff 9ea9494a9e Merge pull request #2620 from dissolve/2617 
recreate fix for #2617 on correct branch
 2016-06-20 00:06:52 +02:00
rabuzarus 7495a34b32 implement a public calendar for vistors of someones profile page 2016-06-19 22:04:34 +02:00
Michael Vogel d0033ca5cf Merge pull request #2621 from rabuzarus/1206-events-template 
frio - events - fix double click on date
 2016-06-18 21:32:07 +02:00
rabuzarus ee0942b96d frio - events - fix double click on date 2016-06-18 15:23:35 +02:00
Michael Vogel bf2e23c205 Merge pull request #2616 from rabuzarus/1206-events-template 
use standard templates in events + frio templates for events
 2016-06-18 15:01:00 +02:00
Ben Roberts 22de27327c recreate fix for #2617 on correct branch 2016-06-18 08:16:09 -04:00
rabuzarus 48a77af49d frio - events - delete unneeded css 2016-06-17 14:52:42 +02:00
rabuzarus 134d5949d5 frio - events - restore lost css bracket after merging develop branch 2016-06-17 14:39:59 +02:00
rabuzarus 7dc5fc8b9f Merge develop into 1206-events-template 
Conflicts:
	view/theme/frio/css/style.css
 2016-06-17 14:33:08 +02:00
rabuzarus 4313982e02 frio - event - code clean up + docu 2016-06-17 14:27:33 +02:00
rabuzarus 606f42701c frio - event - some js and template refactoring + event view css styling 2016-06-17 14:09:18 +02:00
rabuzarus 0148d0e5d2 frio - event - correct some js 2016-06-17 11:18:54 +02:00
rabuzarus c99da380cf frio: events - adapt changes to the templates of the other themes 2016-06-17 10:33:12 +02:00
rabuzarus 8b4c416713 frio: events - split event form in different sections 2016-06-16 20:16:16 +02:00
rabuzarus 0167a2bd61 port of Hubzillas code highlight feature 2016-06-16 11:38:12 +02:00
rabuzarus 7b602a20e6 frio - bookmarklet - open jot only if it is available 2016-06-16 00:27:45 +02:00
rabuzarus dfce0f5b64 frio: open jot modal automatically on bookmarklet page 2016-06-16 00:20:00 +02:00
Tobias Diekershoff 5ec7626b12 Merge pull request #2610 from rabuzarus/1406-frio-search-fix 
frio: fix searchbox - comment tag wasn't closed
 2016-06-14 13:44:14 +02:00
rabuzarus 7ec13d4534 frio: fix searchbox - comment tag wasn't closed 2016-06-14 10:41:14 +02:00
Michael Vogel 365101066a Merge pull request #2605 from rabuzarus/1306-aside-group-fix 
frio: fix an css issue with sidebar-group checkbox alignment
 2016-06-13 14:34:08 +02:00
rabuzarus 06792d6b37 frio: fix an css issue with sidebar-group checkbox alignment 2016-06-13 12:17:33 +02:00
rabuzarus 82b6917c5f frio: settings_display.tpl + rise frio to 0.2 Alpha 2016-06-13 10:57:42 +02:00
rabuzarus 5e98f27fcd frio: events - work on event_form.tpl + datetime.php 2016-06-13 10:19:38 +02:00
Michael Vogel 9354d86f38 Merge pull request #2601 from rabuzarus/1206-short-info-fix 
frio: bind short-info scrollspy on class fn (insteadof p-addr)
 2016-06-12 21:59:46 +02:00
rabuzarus 468f2d001e frio: scrollspy info - forgot to change all classes 2016-06-12 20:34:41 +02:00
rabuzarus 605399032d frio: bind short-info scrollspy on class fn (insteadof p-addr) 2016-06-12 20:25:30 +02:00
rabuzarus 85efa93898 frio: little css fix 2016-06-12 20:20:17 +02:00
rabuzarus 9db614de64 frio: some template clean up 2016-06-12 20:09:02 +02:00
rabuzarus b19af8f0b7 frio: add css for settings templates 2016-06-12 19:59:27 +02:00
rabuzarus 0aa15f74ff Merge develop into 1106-frio-settings 2016-06-12 19:34:06 +02:00
rabuzarus 0af572ffba frio: first part for event template work 2016-06-12 18:23:10 +02:00
Michael Vogel 6d50d18242 Merge pull request #2584 from rabuzarus/0906-profiles 
some restructure in profiles.php + frio template for profiles settings
 2016-06-12 14:20:42 +02:00
Michael Vogel 0eb69b963e Merge pull request #2587 from rabuzarus/1006-short-info 
frio: a short contact informations will be provided at the second nav…
 2016-06-12 12:12:43 +02:00
rabuzarus 5fc5ef5461 frio: provide login.tpl 2016-06-12 11:51:43 +02:00
rabuzarus 3264efb238 Merge pull request #2583 from fabrixxm/frio-login-modal 
Frio: login button opens a modal
 2016-06-12 10:50:56 +02:00
rabuzarus 56b600381e frio: add some more settings templates 2016-06-12 00:15:48 +02:00
rabuzarus f2ad8dd1d4 frio: add settings.tpl 2016-06-11 22:35:08 +02:00
rabuzarus 8ac7575d5b frio: closed profile setting sections on page load 2016-06-11 18:51:20 +02:00
rabuzarus c2f116f8fd frio short contact informations - some optical polishing 2016-06-11 17:43:02 +02:00
rabuzarus d39f679230 Merge develop into 1006-short-info 
Conflicts:
	view/theme/frio/js/theme.js
 2016-06-11 10:52:26 +02:00
fabrixxm 2ec06c1a38 use js/modal.js to show Login page in modal 2016-06-11 09:58:26 +02:00
fabrixxm f8c62f0407 Frio: make jslint more happy 2016-06-11 09:40:50 +02:00
rabuzarus 70f97a3536 frio: a short contact informations - better fadeOut handling 2016-06-11 01:40:28 +02:00
rabuzarus 3c49a410e5 frio: a short contact informations - add border-radius to profile picture (this fits better to the rest of the profile pictures) 2016-06-11 01:32:29 +02:00
rabuzarus 53fb8b1181 frio: a short contact informations will be provided at the second nav bar by scrolling down (on pages where vcard is available) 2016-06-11 01:28:25 +02:00
rabuzarus db5438ab1a frio: improvements in search behavior 
- search value woll be added to nav search input
- focus on nav search input as main search
- save search button appears in the second navbar if search is available
- search heading appears in the second navbar
- provide a mobile search by pressing the search icon
- dirfind: heading distinguish between people and form search
- some js fixes in theme.js
 2016-06-10 20:34:25 +02:00
rabuzarus 3a9a9e6a1c frio + core: some restructure in profiles.php + frio template for profiles settings 2016-06-10 11:24:38 +02:00
Fabrixxm 8c1422103e Frio: login button opens a modal 2016-06-10 10:40:13 +02:00
Tobias Diekershoff e8d39b290a show the workerqueue in the admin panel summary 2016-06-09 18:08:40 +02:00
rabuzarus f79a7bc455 frio: improvements it js jot behavior 
- cache the original jot everytime (to restore it after modal close)
- possibility to edit event items
 2016-06-08 20:53:01 +02:00
Michael Vogel aad00ddc04 Renamed template 2016-06-08 07:11:16 +02:00
Michael Vogel f59b21d4a8 Merge remote-tracking branch 'upstream/develop' into 1606-shared-template 2016-06-07 22:40:29 +02:00
Michael Vogel d034822f07 Merge pull request #2574 from rabuzarus/0607-saved-search 
provide a general content wrapper + frio saved searches
 2016-06-07 22:38:50 +02:00
Michael Vogel e2e32eecac New template for shared content instead of hardcoded stuff in source 2016-06-07 22:29:50 +02:00
rabuzarus 26336a60e9 content_wrapper.tpl respects content with no title 2016-06-07 16:38:22 +02:00
rabuzarus 71b30e0651 profice a general content wrapper template. 2016-06-07 16:32:02 +02:00
rabuzarus 3a368214c0 frio: saved_searches_aside & searchbox template 2016-06-07 15:29:38 +02:00
Tobias Diekershoff 03c09e4c3f Merge pull request #2573 from rabuzarus/0606-more-hovercard 
frio: some hover-card css fixes
 2016-06-07 11:32:56 +02:00
rabuzarus 60ca6b7f07 frio: some hover card css fixes (enable on mouseleave again - forgot it) 2016-06-07 10:16:31 +02:00
rabuzarus d570a90c05 frio: some hover card css fixes 2016-06-07 10:13:08 +02:00
Michael Vogel bd01a1c63a Merge pull request #2572 from rabuzarus/0606-more-hovercard 
frio: fix close hovercard on mousleave
 2016-06-07 06:10:46 +02:00
rabuzarus d752ea9abc frio: fix close hovercard on mousleave 2016-06-07 01:42:01 +02:00
rabuzarus 615db43736 frio: add group_side widget template 2016-06-07 01:28:38 +02:00
rabuzarus c87d426d5f frio: follow & peoplefind widget template 2016-06-07 00:38:39 +02:00
Michael Vogel db44ea0482 Merge pull request #2567 from rabuzarus/0606-photo-menu 
photo_menu: now the photo_menu does have at all places the same struc…
 2016-06-06 21:28:25 +02:00
rabuzarus 5c52736221 photo_menu: now the photo_menu does have at all places the same structure 2016-06-06 16:54:29 +02:00
rabuzarus 33ad8bdc53 frio: extend hovercard to wall-item-responses (likes, attendend) and wall-item-bottom mentions 2016-06-06 11:05:29 +02:00
Tobias Diekershoff ec89274cd8 Merge pull request #2563 from rabuzarus/0506-contact-transition 
frio: give the contact actions a little transition effect
 2016-06-06 06:07:09 +02:00
Michael Vogel 4b640dbd97 Fetching of profile data improved 2016-06-05 21:17:55 +02:00
rabuzarus 43b0550094 frio: remove legacy transition css 2016-06-05 17:12:13 +02:00
rabuzarus 84e5276a3a frio: give the contact actions a little transition effect 2016-06-05 09:56:53 +02:00
rabuzarus b53391a975 frio: fix bulk deletion doesn't appear if post item was inserted by js 2016-06-03 18:55:57 +02:00
rabuzarus 030f44b2fe frio: give images in the networstream a little border-radius 2016-06-02 22:11:41 +02:00
rabuzarus cd0d5d6a18 frio: remove js part for shared-content div because it's now done by core 2016-06-02 20:59:31 +02:00
Michael Vogel d7c0e664f7 Merge pull request #2555 from rabuzarus/0106-contact_actions 
frio: adding contact actions on hover for contacts in contact view
 2016-06-01 22:05:09 +02:00
Michael Vogel 51f6e09e68 Merge pull request #2556 from tobiasd/shashapes 
ShaShape font updated
 2016-06-01 21:21:48 +02:00
Tobias Diekershoff b23a253151 ShaShape font updated 2016-06-01 20:03:56 +02:00
rabuzarus 300591560e frio: adding contact actions on hover for contacts in contact view 2016-06-01 17:21:57 +02:00
rabuzarus 64c871bf4c frio: give the heading "messages" a class "heading" - This is needed for pm modal where class heading becomes the modal title) 2016-06-01 14:04:39 +02:00
rabuzarus d3369aeca1 frio: provide a tooltip for nav search 2016-06-01 11:59:35 +02:00
rabuzarus d663447e3c frio: show tooltip only on hover (and not on focus) 2016-06-01 09:39:20 +02:00
Michael Vogel e2c0f04eeb Added short description to "mark as seen" 2016-06-01 07:05:44 +02:00
Michael Vogel ef566ecbc3 Changed option description 2016-06-01 07:03:03 +02:00
Michael Vogel 9dd6fec0e0 The user name moved to the central. 2016-05-31 22:27:36 +02:00
Michael Vogel 9a442da852 Removed todo 2016-05-31 22:09:35 +02:00
Michael Vogel de3eb5a1b7 Frio: Removed github link, changed notification description 2016-05-31 22:07:29 +02:00
Michael Vogel 060b7193e6 Indention of the html code 2016-05-30 21:43:49 +02:00
Michael Vogel 58ef15c6c1 The file widget looks now better as well 2016-05-30 21:17:28 +02:00
Michael Vogel b798288a5b Frio: The network widget now shows the selected network 2016-05-30 21:00:00 +02:00
Michael Vogel 7bfa9b5650 Merge pull request #2547 from rabuzarus/3005-frio_display_fix 
frio: commented out some js for the color highlight in /display/ beca…
 2016-05-30 15:06:16 +02:00
rabuzarus 3948e2923a frio: commented out some js for the color highlight in /display/ because it causes some errors in ff 2016-05-30 15:01:30 +02:00
Tobias Diekershoff 2d280f55ac Merge pull request #2544 from annando/issue-1769 
Issue 1769: Some enhancements for sending wall mails
 2016-05-30 14:35:04 +02:00
Michael Vogel 5218667196 Merge remote-tracking branch 'upstream/develop' into 1605-frio-template-clean 2016-05-30 07:24:06 +02:00
Michael Vogel 7e6598f2c0 Adopted the changes to the other themes as well. 2016-05-30 07:18:25 +02:00
Tobias Diekershoff b2c6bf0078 Merge pull request #2543 from annando/frio-hovercard 
Frio: Hovercard is now a core function
 2016-05-30 06:25:29 +02:00
Michael Vogel ecb67feca1 Adapting the changes to search_item.tpl as well 2016-05-30 05:21:57 +02:00
Michael Vogel 09931b7124 frio: Some small template clean up 2016-05-29 23:42:22 +02:00
Michael Vogel 47efc6df63 Frio: The separator dots are enabled again 2016-05-29 23:02:48 +02:00
Michael Vogel 0a617da044 Wall message can now redirect to your own page if you are connected. 2016-05-29 21:29:26 +02:00
rabuzarus d40f32cc55 Merge pull request #2542 from annando/1605-more-frio2 
Frio: Bugfix for linebreaks in location
 2016-05-29 15:59:28 +02:00
Michael Vogel 3d3498af1b And some more 2016-05-29 15:40:24 +02:00
Michael Vogel c0ea789786 Some location changes 2016-05-29 15:33:36 +02:00
Michael Vogel 98f7c73d10 Frio: Hovercard is now a core function 2016-05-29 15:28:31 +02:00
Michael Vogel 036ca6a6e1 frio: Bugfix for linebreak of locations in comments 2016-05-29 10:56:49 +02:00
Michael Vogel db99ce9512 Merge pull request #2538 from rabuzarus/2805_frio_mobile 
frio: open hovercard on click if device is a mobile device
 2016-05-28 13:49:05 +02:00
Michael Vogel 05a13a99b2 Frio: Location should look now similar everywhere 2016-05-28 13:47:41 +02:00
rabuzarus 9285ba8178 Merge pull request #2536 from annando/1605-more-frio 
Frio: Like, Dislike and comment are having icons, links are underlined
 2016-05-28 13:38:55 +02:00
Michael Vogel 4a388e84af Frio: Adopt changes to search_item.tpl as well. 2016-05-28 13:08:43 +02:00
rabuzarus 9dc4420561 frio: open hovercard on click if device is a mobile device 2016-05-28 13:07:24 +02:00
Michael Vogel 79517cb7d2 Merge pull request #2534 from fabrixxm/frio-smallfixes 
Small fixes to Frio theme
 2016-05-28 10:08:25 +02:00
Michael Vogel add258ac08 Frio: Like, Dislike and comment are having icons, links are underlined 2016-05-28 09:57:19 +02:00
Michael Vogel d91052f73a Frio: When hovering over the notification entries the cursor is now a pointer 2016-05-27 20:33:29 +02:00
fabrixxm e568020718 Frio: remove header(location) in default.php 
The call to header() is too late in code (output was already sent)
 2016-05-27 15:53:11 +02:00
fabrixxm 6fcad290a4 Frio: Fix warnings in config page 2016-05-27 15:50:51 +02:00
Michael Vogel 2d6740c340 Frio: Added a link to the thread on the same server 2016-05-26 23:23:24 +02:00
rabuzarus 8ec4243253 Merge branch 'master' of ../save/merge/frio into frio_merge 2016-05-25 15:14:09 +02:00
rabuzarus b67378ac69 restructuring for PR for friendica main repo 2016-05-25 15:12:29 +02:00
Tobias Diekershoff cf5ca15711 DE translation THX Abrax 2016-05-19 12:01:38 +02:00
Fabrixxm 6734aa5c28 Make user table in admin sortable via table headers 
new GET param for /admin/user: 'o'
value is db table to order by. values are limited by script.
invalid values are discarded.
preped with '-' to order descending.
show unicode arrows in table headers to visually indicate sorting.
 2016-05-16 14:38:00 +02:00
Tobias Diekershoff d6a124ee2b Merge pull request #2511 from rabuzarus/1205_photo_live_update 
1205 photo live update
 2016-05-13 07:57:13 +02:00
rabuzarus 6944d67dbc photos view: fix js error with undefined variable 2016-05-13 01:26:07 +02:00
rabuzarus d454905d3c infinite_scroll: move js from index.php to main.js 2016-05-11 01:52:05 +02:00
Tobias Diekershoff 3a819e3630 Merge pull request #2500 from fabrixxm/feature_mobile_notification_menu 
style notification menu to be more mobile-friendly
 2016-05-02 15:20:56 +02:00
Fabrixxm 343c7faba4 style notification menu to be more mobile-friendly 2016-05-02 14:55:57 +02:00
Fabrixxm 9a6cfcfd88 small fix to embed iframes on mobile 2016-05-02 14:17:55 +02:00
Roland Haeder 3e701b90ac
Continued rewriting: 
- use dba::is_result() everywhere (where I found the old, bad way)
- converted some spaces -> tabs for code
- converted some CRLF -> LF as mixures of both is not good

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-05-01 14:24:44 +02:00
rabuzarus c1c71732bd
login: use ARIA instead of <fieldset> tag 2016-05-01 13:48:52 +02:00
rabuzarus f695c918fd
vier-mobile: expand embedded video on play 2016-05-01 13:48:52 +02:00
rabuzarus aef332aad0
vier-mobile: little css fix 2016-05-01 13:48:52 +02:00
rabuzarus 10ac4a4475
vier-mobile: fix embedded video for tablets and bigger 2016-05-01 13:48:52 +02:00
rabuzarus 08abb4ae79
vier-mobile: fix embedded video and embedded link images for tablets and bigger 2016-05-01 13:48:52 +02:00
rabuzarus d049c8d5c5
vier-mobile: fix threaded view for tablets and bigger 2016-05-01 13:48:52 +02:00
Michael Vogel 829e7ace06
Vier: No visible login border/no search and events without login 2016-05-01 13:48:52 +02:00
Tobias Diekershoff aab5442b50
ES translations thx TupambaeNet 2016-05-01 13:48:52 +02:00
Tobias Diekershoff 7931555b64
make doxygen a bit more happy 2016-05-01 13:48:52 +02:00
Tobias Diekershoff 01ef271901
make doxygen a bit more happy 2016-05-01 13:48:52 +02:00
rabuzarus 0056403b15
fix: contact edit poll_interval wasn't submitted 2016-05-01 13:48:52 +02:00
Tobias Diekershoff ccb0875c57
reorganize the htconfig template 2016-05-01 13:48:52 +02:00
Tobias Diekershoff cc0b4ff0f9
during installation choose the highest RINO version possible 2016-05-01 13:48:52 +02:00
rabuzarus 856f54da62
rework autocompletion: Update mobile.css 2016-05-01 13:48:52 +02:00
rabuzarus d32c0e8eb4
vier: colorbox fix (img max-width: 100%) 2016-05-01 13:48:52 +02:00
rabuzarus 5bc17e0b91
rework autocomplete: use minified version + delete old fk.autocomplete.js 2016-05-01 13:48:52 +02:00
rabuzarus cc7d1d453b
rework autocomplete: seperate bbcode completion 2016-05-01 13:47:24 +02:00
rabuzarus bc720c0918
quattro fix for #2385 - respect acl on event edit 2016-05-01 13:47:24 +02:00
Tobias Diekershoff fe97315acb
Issue 2241: added language selector to the admin wizard 2016-05-01 13:47:24 +02:00
Tobias Diekershoff bf3f31f701
added aria describedby elements refering to field help to the input templates 2016-05-01 13:47:24 +02:00
Tobias Diekershoff 5ce6d2c5bd
added lang info to frost themes 2016-05-01 13:47:24 +02:00
Tobias Diekershoff 9a6afaa307
set language in HTML header to selected UI language 2016-05-01 13:47:24 +02:00
Michael Vogel 887f2e92a5
Unused files are removed 2016-05-01 13:46:08 +02:00
Michael Vogel cd57c49600
Retraction could work now as well. 2016-05-01 13:46:08 +02:00
rabuzarus 2bd60075ae
rework autocomplete: some styling if contact is forum 2016-05-01 13:46:08 +02:00
rabuzarus 341a22800d
rework autocomplete: add class dir and static function 2016-05-01 13:46:08 +02:00
rabuzarus 586b251539
rework autocomplete: some cleanup and docu 2016-05-01 13:46:08 +02:00
rabuzarus 7ee0bca2bb
rework autocomplete: new ac for poke, contacts, prv_messages 2016-05-01 13:45:38 +02:00
rabuzarus 52896d64c2
rework autocomplete: css work 2016-05-01 13:45:38 +02:00
rabuzarus 35bd5792bc
rework autocomplete: initial commit 2016-05-01 13:45:17 +02:00
Tobias Diekershoff 9ec9ea3844 Merge pull request #2484 from rabuzarus/25.04_login_template 
login: use ARIA instead of <fieldset> tag
 2016-04-26 06:43:48 +02:00
rabuzarus 7e199c72ac login: use ARIA instead of <fieldset> tag 2016-04-25 23:40:07 +02:00
rabuzarus 9943d4a60a vier-mobile: expand embedded video on play 2016-04-25 22:12:53 +02:00
Michael Vogel 1f4f60a82d Merge pull request #2480 from rabuzarus/2504_vier_mobile_fix 
vier mobile fixes
 2016-04-25 21:41:43 +02:00
rabuzarus 4daa9a50f5 vier-mobile: little css fix 2016-04-25 20:30:02 +02:00
rabuzarus fa66fa9b28 vier-mobile: fix embedded video for tablets and bigger 2016-04-25 20:24:36 +02:00
rabuzarus 7b48ef23d5 vier-mobile: fix embedded video and embedded link images for tablets and bigger 2016-04-25 20:04:10 +02:00
rabuzarus c553ab9b46 vier-mobile: fix threaded view for tablets and bigger 2016-04-25 19:54:03 +02:00
Michael Vogel 0c5f315294 Vier: No visible login border/no search and events without login 2016-04-24 21:45:06 +02:00
Tobias Diekershoff 031f6cbf64 ES translations thx TupambaeNet 2016-04-22 17:33:39 +02:00
Michael Vogel ee72f1e4bd Merge pull request #2468 from tobiasd/2242-and-htconfig 
stuff for the installer and htconfig template
 2016-04-21 06:41:02 +02:00
Tobias Diekershoff caa541f939 make doxygen a bit more happy 2016-04-20 16:08:17 +02:00
Tobias Diekershoff 6601582a12 make doxygen a bit more happy 2016-04-20 16:06:39 +02:00
rabuzarus 7ee9c536ee fix: contact edit poll_interval wasn't submitted 2016-04-20 15:37:34 +02:00
Tobias Diekershoff 7c6ebae5c0 reorganize the htconfig template 2016-04-20 14:30:22 +02:00
Tobias Diekershoff d3293dfcf2 during installation choose the highest RINO version possible 2016-04-20 14:17:48 +02:00
rabuzarus 9190380dec rework autocompletion: Update mobile.css 2016-04-17 22:27:49 +02:00
rabuzarus 84238e1b89 vier: colorbox fix (img max-width: 100%) 2016-04-17 15:34:15 +02:00
Tobias Diekershoff bbd5878734 Merge pull request #2449 from rabuzarus/1404_reworked_autocomplete 
new autocompletion
 2016-04-16 08:16:21 +02:00
rabuzarus ed6ada0da5 rework autocomplete: use minified version + delete old fk.autocomplete.js 2016-04-15 02:25:58 +02:00
rabuzarus 98b62b80f3 rework autocomplete: seperate bbcode completion 2016-04-14 23:59:29 +02:00
rabuzarus 01b02dbcaa Merge develop into 1404_reworked_autocomplete 
Conflicts:
	include/text.php
	view/templates/head.tpl
	view/theme/duepuntozero/style.css
	view/theme/vier/style.css
 2016-04-14 16:23:51 +02:00
rabuzarus c73e93b19b quattro fix for #2385 - respect acl on event edit 2016-04-13 17:43:46 +02:00
Tobias Diekershoff 5df20fda11 Issue 2241: added language selector to the admin wizard 2016-04-06 20:13:34 +02:00
fabrixxm 295489e9a5 Merge pull request #2434 from tobiasd/20160403-lng 
lang info in HTML header
 2016-04-06 09:04:13 +02:00
Tobias Diekershoff 1ee405c9c3 added aria describedby elements refering to field help to the input templates 2016-04-04 08:10:27 +02:00
Tobias Diekershoff d9b6355bb8 added lang info to frost themes 2016-04-03 21:00:18 +02:00
Tobias Diekershoff a88d950c33 set language in HTML header to selected UI language 2016-04-03 20:55:39 +02:00
Michael Vogel 3f2a23d48c Unused files are removed 2016-03-15 07:05:10 +01:00
Michael Vogel a0aeea4a89 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-12 07:38:25 +01:00
Michael Vogel bc21fca345 Remove the setting description from the documentation since it isn't a hidden one anymore. 2016-03-11 23:44:46 +01:00
Michael Vogel b12dbe8831 The worker settings are now available in the admin settings 2016-03-11 23:28:11 +01:00
Michael Vogel 918efbafac Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-06 21:20:00 +01:00
fabrixxm d30d13959b Merge pull request #2328 from rabuzarus/0602_contact_profile 
polishing of the contact-edit page
 2016-03-06 19:56:59 +01:00
Michael Vogel bb06026147 Settings for only importing threads from our ostatus contacts 2016-03-06 14:09:04 +01:00
Michael Vogel 305f6f9a7b Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-06 08:41:24 +01:00
Michael Vogel 6468fbb905 Retraction could work now as well. 2016-03-06 01:37:47 +01:00
Michael Vogel 996cd8c24e The Font Awesome library is now updated, the replxy button is changed 2016-03-05 13:29:01 +01:00
fabrixxm 11310aa93b Merge pull request #2389 from Quix0r/rewrites/theme_info_array_init 
$a->theme_info = array() should be avoided
 2016-03-01 15:32:34 +01:00
Roland Haeder 08abdfda68
<form> and <html> or <head> are not self-closing tags. 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 14:49:56 +01:00
Roland Haeder 04a7d6384e
No need to set $a->theme_info = array() everywhere if you can define it in App 
itself.

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 14:27:38 +01:00
Tobias Diekershoff 09060c0ed3 adding some colors to the Federation Statistics page of the admin panel 2016-02-29 17:24:34 +01:00
rabuzarus 0db83b9586 contactedit-actions-button: move repair back to tabbar 2016-02-23 19:19:45 +01:00
Michael Vogel 2eb461ed2c Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content 2016-02-18 08:15:58 +01:00
Michael Vogel 7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +01:00
Tobias Diekershoff e22d980e91 IT update to the strings 2016-02-17 15:13:45 +01:00
Michael Vogel c770b00d6d Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content 2016-02-17 12:18:46 +01:00
Michael Vogel c5b724828a Just some more removed baseurls ... 2016-02-17 08:08:28 +01:00
Michael Vogel f7537c9e90 Remove the baseurl where possible to avoid mixed content 2016-02-17 00:01:24 +01:00
Sakałoŭ Alaksiej a9f80d435b Complemented and improved russian translation 2016-02-16 20:57:15 +03:00
Michael Vogel 307f90cdfe Vier: Pictures in the side bar shouldn't be larger than the side bar 2016-02-13 14:21:53 +01:00
Tobias Diekershoff c5f2157eb2 Merge pull request #2336 from stieben/move-div-pause 
Move div#pause to view/default.php
 2016-02-11 07:36:37 +01:00
Andrej Stieben e104c58191 Added div#pause to themes' default.php 
As requested by @tobiasd and @rabuzarus.
 2016-02-09 16:41:19 +01:00
Andrej Stieben 4d7a6aaed2 Moved div#pause from index.php to view/default.php 
This closes #2320.
 2016-02-09 15:54:35 +01:00
rabuzarus 2e04a00d30 contactedit-actions-button: some adjustment for vier dark scheme 2016-02-08 23:25:48 +01:00
rabuzarus 0c764684bb Merge develop into 0602_contact_profile 2016-02-08 23:16:02 +01:00
rabuzarus 0b5d7b300e contactedit-actions-button: adjust the themes and template polishing 2016-02-08 23:15:20 +01:00
rabuzarus 991cbd604a contact-edit-actions-button: initial commit 2016-02-08 01:56:15 +01:00
fabrixxm 102c06a41f fix error in template in notifications page 2016-02-07 14:29:07 +01:00
fabrixxm d6cf791677 Merge pull request #2324 from rabuzarus/0502_vier_dark 
vier: some consistency fixes for the dark scheme
 2016-02-07 09:53:24 +01:00
fabrixxm ecfb6ec924 Merge pull request #2313 from rabuzarus/0302_forum_class 
forums.php is now ForumManager.php and providing class ForumManager
 2016-02-07 09:28:50 +01:00
rabuzarus 95819684c2 Merge develop into 0502_vier_dark 
Conflicts:
	view/theme/vier/dark.css
 2016-02-06 13:09:41 +01:00
rabuzarus 0bccfea596 vier: some consistency fixes for the dark scheme 2016-02-06 00:54:50 +01:00
rabuzarus bcf1020635 vier smileybutton: dark.css insert new line at the end of the file 2016-02-05 21:38:55 +01:00
rabuzarus 9fd3d8116b vier smileybutton: little polish in dark.css 2016-02-05 21:30:31 +01:00
rabuzarus 41405ed0f2 vier: display smiley-preview as inline-block - needs addons update 2016-02-05 21:24:01 +01:00
Tobias Diekershoff 8bca68c77c Merge pull request #2317 from rabuzarus/0402_vier_mobile_textarea 
vier: remove some hardcoded css to be more mobile friendly
 2016-02-05 06:57:07 +01:00
Tobias Diekershoff 437784b7bb Merge pull request #2318 from annando/1602-vier-font 
Vier: The font "system" can make the system look ugly
 2016-02-05 06:56:26 +01:00
Michael Vogel b85369a03b Vier: The font "system" can make the system look ugly 2016-02-04 18:58:33 +01:00
rabuzarus a75be65860 vier: little float fix 2016-02-04 16:45:39 +01:00
rabuzarus 12c6ba9081 vier: remove some hardcoded css to be more mobile friendly 2016-02-04 16:21:40 +01:00
rabuzarus 52dbb0b4a2 Forum class - rename Class CamelCase and rename some methods 2016-02-04 14:51:54 +01:00
rabuzarus 9a54afa629 Forum class - rename Class CamelCase and rename some methods 2016-02-04 14:47:20 +01:00
fabrixxm e11ff25de2 fix empty ACL window on desktop 2016-02-03 23:22:45 +01:00
rabuzarus c1070e4655 forums.php is now forum.php and providing class forum 2016-02-03 18:05:26 +01:00
Fabrixxm f21e3e46c7 Vier mobile: better jot buttons on small screens 2016-02-03 15:01:24 +01:00
Fabrixxm 1ddae21cff Vier mobile: fix content width, events style, oembed 2016-02-03 14:48:46 +01:00
Fabrixxm 3c6ebfa5a9 Vier - mobile friendly ACL window and form fields 2016-02-03 14:03:00 +01:00
Tobias Diekershoff f0912d6219 Merge pull request #2310 from rabuzarus/0302_vier_photo 
vier: use object-fit: cover for recent photos view
 2016-02-03 07:07:38 +01:00
rabuzarus 58c1f9a60f vier: use object-fit: cover for recent photos view 2016-02-03 03:59:42 +01:00
rabuzarus ad5be2901e rework autocomplete: some styling if contact is forum 2016-02-03 00:25:33 +01:00
rabuzarus aee94b38c1 rework autocomplete: add class dir and static function 2016-02-01 18:21:29 +01:00
Tobias Diekershoff 447ed7af53 IT update to the strings 2016-01-31 12:02:05 +01:00
rabuzarus 162f754e2d Merge develop into 1901_autocomplete 2016-01-30 16:57:54 +01:00
rabuzarus 8e0f04026c vier: some fixes for mobile view 2016-01-30 01:53:21 +01:00
Michael Vogel 4208acf4b6 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn 2016-01-25 23:51:11 +01:00
Tobias Diekershoff d395959e41 DE update to the strings 2016-01-25 07:13:29 +01:00
rabuzarus d0ade828c0 rework autocomplete: some cleanup and docu 2016-01-24 19:56:23 +01:00
Michael Vogel f38f1806c1 We don't need these templates anymore 2016-01-24 08:22:09 +01:00
rabuzarus 39a849c113 rework autocomplete: new ac for poke, contacts, prv_messages 2016-01-22 17:47:48 +01:00
Tobias Diekershoff 6174017048 Merge pull request #2275 from rabuzarus/2101_event_reminder 
fix events_reminder popup
 2016-01-21 16:18:36 +01:00
rabuzarus 03bef2c8f8 fix events_reminder popup 2016-01-21 13:44:38 +01:00
rabuzarus e3475bd587 rework autocomplete: css work 2016-01-21 13:28:29 +01:00
Tobias Diekershoff c012017023 DE update to the strings 2016-01-21 11:56:19 +01:00
Tobias Diekershoff f635e81d94 NL update to the strings THX Dasrakel 2016-01-20 17:54:40 +01:00
rabuzarus 16e4e94b29 rework autocomplete: initial commit 2016-01-19 18:11:40 +01:00
fabrixxm a1eb7a8791 Merge pull request #2266 from tobiasd/20160119-de 
DE update to the strings
 2016-01-19 13:47:43 +01:00
Tobias Diekershoff fe6d8ecd1c DE update to the strings 2016-01-19 10:55:55 +01:00
Tobias Diekershoff 846153d388 some beautification to the template code 2016-01-19 07:20:07 +01:00
Michael Vogel 32c7896c5d Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-18 18:49:04 +01:00
Tobias Diekershoff c6f0333026 moved some CSS stuff from the template to global.css 2016-01-18 13:22:07 +01:00
Michael Vogel 6c7cf2a766 Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-18 00:53:18 +01:00
Michael Vogel 36ba415df3 Merge pull request #2257 from rabuzarus/locked_features_united 
feature management for admins
 2016-01-18 00:51:50 +01:00
Tobias Diekershoff 98be92f48c DE update to the strings 2016-01-17 22:25:05 +01:00
rabuzarus f428635682 vier: add missing forumlist_profile 2016-01-17 15:54:58 +01:00
rabuzarus c1ed2bd975 feature management for admins: Merge branch 'devolop' 2016-01-17 03:25:17 +01:00
Michael Vogel 228ce9e27e Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-16 17:39:45 +01:00
Tobias Diekershoff 75f0053550 forgot the template 2016-01-16 13:57:40 +01:00
Tobias Diekershoff 20fe67f378 removed remote update functionality from admin panel 2016-01-16 11:52:21 +01:00
Michael Vogel 90a8d6f0f5 Several performance improvements 2016-01-15 23:27:25 +01:00
Tobias Diekershoff 629c69d9dd only show the reload link if plugins are found 2016-01-15 19:35:45 +01:00
Tobias Diekershoff 7a7ffb2299 issue 2240 when no addon are installed hint the location of sources in the admin panel 2016-01-15 18:19:22 +01:00
Tobias Diekershoff 5099f43c42 only show platforms with counts > 0 2016-01-15 18:19:22 +01:00
Tobias Diekershoff 8e7d53cd41 added Chart.js 1.0.2 to friendica library and use it instead of CDN version for graphs 2016-01-15 18:19:21 +01:00
Tobias Diekershoff 0d5fed5b3b beautification of HTML code 2016-01-15 18:19:21 +01:00
Tobias Diekershoff 0a5c9e96a8 moved viewing of friendica logs into a separate subpage, thus created a new template 2016-01-15 18:19:21 +01:00
Tobias Diekershoff ddb17d36a2 added PHP logging hint fields to the template 2016-01-15 18:19:21 +01:00
Tobias Diekershoff c1aa668fef add log viewer to the aside menu of the admin panel 2016-01-15 18:19:21 +01:00
Tobias Diekershoff 4af584cec2 small fix for the ShaShape font 2016-01-15 18:19:20 +01:00
Tobias Diekershoff a4104d7c17 1st stuff for federation stats in the admin panel 2016-01-15 18:19:19 +01:00
fabrixxm f4173d1764 Merge pull request #2244 from annando/1601-gcontact-total 
Global contacts are now playing a central role
 2016-01-14 10:14:52 +01:00
rabuzarus 556f76de01 vier: mobile view - fix word breaking 2016-01-13 19:56:21 +01:00
Michael Vogel 885dc1df81 gcontact update script, rebuilt follow page, query speedup for community and network groups 2016-01-10 09:19:00 +01:00
fabrixxm fcf7a791f1 Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget" 
This reverts commit 83e54f70d3, reversing
changes made to ecf576bdd0.
 2016-01-04 11:46:19 +01:00
fabrixxm 83e54f70d3 Merge pull request #2223 from rabuzarus/2912_photo_widget 
photo aside widget for profile page
 2016-01-04 10:06:07 +01:00
Michael Vogel 771d0c4bfa Merge pull request #2224 from rabuzarus/2812_js_scrollbars 
Since we can easily remove it, we can accept this - and change it back if we need to. I haven't check accessibility - but this can be done later.
 2016-01-03 14:09:17 +01:00
Tobias Diekershoff 680f1073cb Typo in DE translations 2016-01-03 12:57:42 +01:00
fabrixxm 907d20940a Merge pull request #2221 from rabuzarus/2812_vier_mobile_icons 
vier: make TopNavBar mobile friendly
 2015-12-31 09:38:27 +01:00
Tobias Diekershoff ab5d0aa5e6 DE update to the strings 2015-12-31 07:32:15 +01:00
Tobias Diekershoff 6961fa636a FR update to the strings 2015-12-30 08:55:59 +01:00
rabuzarus f8256fc53b make perfect scrollbars work with quattro 2015-12-30 03:12:52 +01:00
rabuzarus 89c0a8f8a8 vier: remove double available accesskeys 2015-12-30 00:48:11 +01:00
rabuzarus 3366e530cd photo aside widget: little polish 2015-12-30 00:37:24 +01:00
rabuzarus 20fbf670db photo aside widget for profile page 2015-12-30 00:26:50 +01:00
Michael Vogel b41ab85feb Merge pull request #2220 from rabuzarus/2812_notify_menu 
vier: some visual work on the notification menu
 2015-12-29 14:31:41 +01:00
rabuzarus 871fb609d4 vier: add missing clear divs to right aside 2015-12-29 02:01:17 +01:00
rabuzarus 51a8864519 vier: make TopNavBar mobile friendly 2015-12-29 00:23:59 +01:00
rabuzarus e93156427e use perfect-scrollbars for nav-notifications-menu (and in vier aside) 2015-12-28 23:16:34 +01:00
rabuzarus 43d35315db vier nav-notification-menu: further polishing 2015-12-28 22:04:54 +01:00
rabuzarus c7d2d95705 vier nav-notification-menu: small cleanup 2015-12-28 20:52:11 +01:00
rabuzarus 093a3e6742 some work on vier nav-notification-menu 2015-12-28 20:40:04 +01:00
Tobias Diekershoff 99861b9fa6 Merge pull request #2216 from fabrixxm/feature-api-like 
Works on API and a small refractor, updated docs
 2015-12-28 18:39:21 +01:00
fabrixxm 6da04d16bd get rid of unwanted <br>s in items with oembed 
fix video thumbnail in quattro, vier, duepuntozero themes
 2015-12-28 18:07:31 +01:00
Michael Vogel 9d83892151 Merge pull request #2215 from rabuzarus/2812_vier_mobile_fix 
vier: fix for 2205
 2015-12-28 10:41:39 +01:00
fabrixxm 696fe53d8f sizes links in xml output of api/frienidca/photo is an array 2015-12-28 10:23:06 +01:00
fabrixxm 6b60560ea2 Changes in api 
- Api functions can define an HTTP method to use to call them. "405 Method Not Allowed" is returned on error
- Api function that modify data accepts only POST as method.
- A list of HTTP return code related exception is added
- Api functions throw HTTP exceptions instead of return false or die()
- api_call() catches HTTP exceptions and return error message with corret HTTP response code
- api_format_items() returns also item activities count (# of like/dislike etc)
- api/friendica/photos/list return more info about photos. xml format added.
- api/friendica/photo/detail return more info, links to all sizes, no data except if 'size' parameter is passed. xml format added.
- new api api/friendica/activity/<verb> and api/friendica/activity/un<verb> to add or remove like/dislike/attend status
 2015-12-28 10:23:06 +01:00
rabuzarus e68fcc146a vier: fix for 2205 2015-12-28 04:57:49 +01:00
Michael Vogel 8b25f51116 XRD now should react more like an OStatus server 2015-12-28 01:04:14 +01:00
Fabrixxm d4dd863b4b quattro: style managed unread notification 2015-12-21 16:19:56 +01:00
Fabrixxm b79d98aea5 quattro: fix PM aside template 
errors was raised with new "show message list in aside" patch
 2015-12-21 09:43:10 +01:00
Tobias Diekershoff 719989249f FR: update to the translation 2015-12-17 08:27:02 +01:00
rabuzarus 19a72b30b4 vier: fix missing icons 2015-12-15 15:13:46 +01:00
Tobias Diekershoff 9640eb7c81 IT update to the strings 2015-12-14 16:56:40 +01:00
Tobias Diekershoff 053b69eee4 FR update to the strings 2015-12-14 16:30:28 +01:00
Tobias Diekershoff e97a6dfb77 DE update to the strings 2015-12-14 16:27:00 +01:00
fabrixxm 5b5b942325 Merge pull request #2172 from tobiasd/20151212-frosticons 
added event icons from frost-mobile to frost
 2015-12-13 09:21:03 +01:00
Tobias Diekershoff 4a7d6eb13c resized icons to 16px 2015-12-13 08:09:53 +01:00
Michael Vogel ec9b1b7afd There is now a fragmentation level for the table optimisation 2015-12-12 17:46:24 +01:00
Tobias Diekershoff a7b37faafd added event icons from frost-mobile to frost 2015-12-12 06:23:54 +01:00
fabrixxm 8d1af68f44 missing frost-mobile event icons 2015-12-11 19:38:00 +01:00
Michael Vogel 6bd23721c2 Merge pull request #2169 from tobiasd/20151211-FR 
update to the French translation
 2015-12-11 11:23:49 +01:00
Tobias Diekershoff 5f27f509cb Merge pull request #2167 from annando/1512-profile-aside 
Sometimes there wasn't a linebreak before the address in the profile
 2015-12-11 08:10:23 +01:00
Tobias Diekershoff 36769d77eb FR update to the strings THX Perig 2015-12-11 08:03:09 +01:00
Michael Vogel 138d745f5e Sometimes there wasn't a linebreak before the address in the profile 2015-12-10 21:39:44 +01:00
Michael Vogel 1e0f26da8d Merge pull request #2166 from rabuzarus/1012_vier-forum 
vier: fix little misspelling
 2015-12-10 21:19:16 +01:00
rabuzarus 776cbe4a37 vier: fix little misspelling 2015-12-10 13:30:11 +01:00
Michael Vogel 59b2bde9a7 Do a linebreak before the output of rendertime 2015-12-08 19:41:27 +01:00
Michael Vogel 1fb636ba1e Vier: The line-height seems to make problems with windows 2015-12-07 21:45:33 +01:00
Michael Vogel 01c9d13927 Issue 1871: Show an information if a group is empty 2015-12-05 23:29:42 +01:00
Tobias Diekershoff f849ff0155 SV messages.po regenerated from strings.php 2015-12-04 21:31:33 +01:00
fabrixxm 38d46b164a quattro: some love to events pages 2015-12-04 20:43:35 +01:00
fabrixxm f739fdc517 Quattro: Rss icon for atom feed link in profile 2015-12-04 19:57:19 +01:00
fabrixxm f44846555a quattro: hide acl button in edit post 
fix #1780
 2015-12-04 19:29:13 +01:00
Fabrixxm ddbba521c5 Add support for attending an event to frost themes 
fix #1953
 2015-12-04 15:01:46 +01:00
Michael Vogel 1a170c8743 Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework 
Conflicts:
	mod/contacts.php
	mod/crepair.php
 2015-12-03 14:38:04 +01:00
Michael Vogel 1f9644bded Merge pull request #2131 from rabuzarus/3011_hcard_vcard 
unify hcard and vcard
 2015-12-03 14:16:52 +01:00
rabuzarus 1d6d9d3d24 photos-albms widget: add some classes 2015-12-01 21:07:05 +01:00
rabuzarus cd7ec72b20 unify hcard and vcard: make $pdesc available in hcard&vcard 2015-12-01 19:47:23 +01:00
rabuzarus 39b37281a7 Merge develop into 3011_hcard_vcard 2015-12-01 18:34:13 +01:00
rabuzarus 89c5989cfb unify hcard and vcard 2015-12-01 18:31:08 +01:00
Michael Vogel 06a4b0dc5e Header removed in the contact area 2015-12-01 18:21:05 +01:00
Michael Vogel fe900ac576 Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework 2015-12-01 17:16:31 +01:00
Michael Vogel 6910604ffb Merge pull request #2125 from rabuzarus/2911_event_template 
vier event_form: include bb-tags for editing
 2015-12-01 17:13:46 +01:00
Tobias Diekershoff 91bac8a6e0 DE translations THX Abrax 2015-12-01 13:56:23 +01:00
Michael Vogel 1c93729c46 Tab is added to "all friends" and "common friends" 2015-12-01 08:12:05 +01:00
rabuzarus 39b85c8486 vier event_form: include bb-tags for editing 2015-11-30 16:00:41 +01:00
fabrixxm 2753e62483 Merge pull request #2119 from annando/1511-contact-evolution 
Refurbished contact settings/contact posts
 2015-11-30 14:45:23 +01:00
fabrixxm a60b702df1 Merge pull request #2113 from annando/1511-manage-notifications 
The manage page now shows the notifications
 2015-11-30 12:04:53 +01:00
Michael Vogel 4efb6c6f79 Merge pull request #2120 from rabuzarus/2911_network_header 
2911 network header
 2015-11-30 08:30:34 +01:00
rabuzarus a6aac8f950 networkheader: do css work the other supported themes 2015-11-30 01:24:22 +01:00
Michael Vogel 42d903dd68 Redesign of the contact pages, new tab for contact statuses 2015-11-29 23:22:05 +01:00
Tobias Diekershoff f45a8f1a03 Merge pull request #2106 from annando/1511-ostatus-bookmark-design 
Small OStatus changes
 2015-11-29 23:19:12 +01:00
Michael Vogel 5649e9e193 The contact page now contains more data 2015-11-29 17:04:48 +01:00
rabuzarus 70860e5836 new_event: default size of textfields 2015-11-29 16:16:18 +01:00
Tobias Diekershoff ba441789b9 followup for #2110 putting the styling in less file and recompile css 2015-11-29 11:18:32 +01:00
Michael Vogel 583a2f709b Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design 2015-11-29 10:25:44 +01:00
Tobias Diekershoff be40fb8186 Merge pull request #2110 from annando/1511-subscribe-feed 
Issue 1779: Atom feed link under the connect link on the profile page
 2015-11-29 08:40:39 +01:00
rabuzarus 1a0cb99d56 redesign the network page header when cid selected 2015-11-29 04:57:42 +01:00
rabuzarus f5597da059 forumlist - mark selected forum as selected 2015-11-28 23:52:12 +01:00
Michael Vogel 58a261a29a Other themes are now supported as well 2015-11-28 23:18:01 +01:00
Michael Vogel 3067663909 The manage page now shows the unread notifications 2015-11-28 22:56:48 +01:00
rabuzarus a3059d02d4 group_side - unify look with forumlist 2015-11-28 20:09:28 +01:00
Michael Vogel 388847e1f3 Issue 1779: There is now an atom feed link under the connect link on the profile page 2015-11-28 18:11:34 +01:00
Michael Vogel 679ce3243e Admin settings for table optimisation 2015-11-28 16:35:16 +01:00
Michael Vogel 3b6d3d1ade Merge pull request #2099 from rabuzarus/2611_new_user_addr 
generate addr for new registered users
 2015-11-27 21:35:46 +01:00
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
Tobias Diekershoff 8e65e95d17 add multi vs. single user config to the admin panel 2013-02-17 17:42:32 +01:00
Tobias Diekershoff aa2f1c38e9 add 'hide_help' to admin panel 2013-02-17 12:37:45 +01:00
Michael Vogel 93143702ed Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php
 2013-02-17 12:35:40 +01:00
Tobias Diekershoff 2e6577fb32 DE; update to the strings, fixing #476 2013-02-17 11:19:12 +01:00
Michael Vogel 3e58060b30 API: beautify the output of repeated items 
Vier: Birthday reminder looks better
 2013-02-15 20:14:45 +01:00
Fabrixxm 64ca15f7f9 update it strings 2013-02-15 11:23:49 -05:00
Tobias Diekershoff c5b8082c31 ZH-CN: update to the strings to 100% thx Matthew 2013-02-11 06:23:55 +01:00
Tobias Diekershoff 3eeee2525c CA: update to the strings 2013-02-11 06:21:10 +01:00
fermionic 8e80755a47 Merge pull request #615 from fermionic/20130210-update-frost-mobile 
add new Smarty3 templates
 2013-02-10 16:12:50 -08:00
Zach Prezkuta e377fd9d22 add new Smarty3 templates 2013-02-10 17:11:55 -07:00
fermionic 6b6f00c702 Merge pull request #613 from fermionic/20130210-update-frost 
update to Frost v0.4
 2013-02-10 14:02:53 -08:00
Zach Prezkuta 646c161506 added files for Frost Mobile v0.3 2013-02-10 15:00:20 -07:00
Zach Prezkuta 4d8678e523 update to Frost v0.4 2013-02-10 14:57:44 -07:00
Zach Prezkuta c1c83115ad Update Frost-mobile to v0.3 2013-02-10 10:21:52 -07:00
Tobias Diekershoff 5195d99216 ZH-CN: update to the strings 2013-02-08 17:26:08 +01:00
Zach Prezkuta c4e6cb916d move all commands inside the duepuntozero_init() function 2013-02-08 09:03:50 -07:00
friendica c273adf0fe Merge pull request #608 from fermionic/20130204-diabook-reduce-css 
Try to start reducing Diabook CSS
 2013-02-05 17:36:33 -08:00
friendica 2044862eb9 Merge pull request #607 from fermionic/20130204-attach-types-are-too-coarse 
add support for more file attachment types
 2013-02-05 17:19:53 -08:00
Zach Prezkuta d8f7e9be26 make the diabook-aerith -wide.css variants inherit from the non-wide css files 2013-02-04 22:34:48 -07:00
Zach Prezkuta 665af33726 have the base -wide.css variants inherit from the non-wide version 2013-02-04 22:17:55 -07:00
Zach Prezkuta 6152cbd5ac add support for more file attachment types 2013-02-04 22:15:16 -07:00
Zach Prezkuta 2b94590bbf elastic transitions 2013-02-04 18:20:47 -07:00
Zach Prezkuta 0e67ba2bd4 update minified javascripts 2013-02-04 18:16:13 -07:00
Zach Prezkuta 1033e8896f finish updating themes for colorbox 2013-02-04 18:09:56 -07:00
Zach Prezkuta 0f25455d1b starting switching to colorbox 2013-02-04 18:09:56 -07:00
Tobias Diekershoff 9dbe7efce5 ZH-CN: update to the strings 2013-02-03 15:14:57 +01:00
zottel 7db626b1b5 also reset network in mobile themes, smarty3 updates 2013-02-01 20:37:16 +01:00
zottel e2949ab913 Merge remote branch 'upstream/master' 2013-02-01 20:31:55 +01:00
Tobias Diekershoff bfe7b5e1c3 ZH-CN: update to the strings 2013-02-01 10:49:32 +01:00
zottel c0af9b2938 Reset network when showing a contact's posts 
There is similar stuff in the mobile themes, but I didn't touch
them because I wasn't sure if I should and how the smarty3 stuff
works.
 2013-02-01 09:12:37 +01:00
Zach Prezkuta 7d3a923294 script for minifying javascript files 2013-01-31 19:05:27 -07:00
Tobias Diekershoff 303e5e1b10 ZH-CN: update to the strings 2013-01-31 06:42:10 +01:00
Thomas Willingham d0d9ae3096 Dispy - remove head.tpl. It isn't actually required, and is the main cause of breakage in the theme. 2013-01-30 02:51:47 +00:00
Tobias Diekershoff 50a64a47fc ZH-CN: update to the strings 2013-01-28 15:23:09 +01:00
Tobias Diekershoff 612af04b1c DE: update to the strings 2013-01-28 15:21:57 +01:00
Tobias Diekershoff 5c3bce30d6 Merge branch 'master' of git://github.com/friendica/friendica 2013-01-28 07:00:07 +01:00
Tobias Diekershoff 28e4b8512a ZH-CN: update to the strings 2013-01-28 06:57:44 +01:00
friendica a5ac69c65e Merge pull request #591 from fermionic/20130126-javascript-free-theme 
Decaf mobile: an (almost) Javascript-free theme
 2013-01-27 19:11:36 -08:00
Zach Prezkuta 6668d22d37 try to improve TinyMCE block handling 2013-01-27 14:41:48 -07:00
Zach Prezkuta a15fff2fc6 mark experimental 2013-01-26 13:10:10 -07:00
Zach Prezkuta acc4d66cd3 update smart templates 2013-01-26 13:07:54 -07:00
Zach Prezkuta 488a38cd85 Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
friendica 37a5ff848d Merge https://github.com/friendica/friendica into pull 2013-01-25 13:50:27 -08:00
friendica 04b48688b6 add form security to invite page and set maximum per user invites 2013-01-25 13:48:57 -08:00
Tobias Diekershoff ec58e106c2 ZH-CN: update to the strings 2013-01-24 07:38:13 +01:00
Tobias Diekershoff cb4edf3928 IT: update to the strings 2013-01-24 07:37:16 +01:00
fabrixxm 9b394dbe1e Merge pull request #589 from fabrixxm/master 
Update fancybox, remove tiptip
 2013-01-23 01:19:05 -08:00
Fabrixxm a875bec75c update fancybox, remove tiptip from head.tpl 2013-01-22 08:17:23 -05:00
Tobias Diekershoff 03ec6cabda PL: update to the strings 2013-01-22 08:01:25 +01:00
Tobias Diekershoff da12177aea PL: update to the strings 2013-01-21 08:05:57 +01:00
Michael - piratica.eu cc9ce39e3f Merge branch 'master' of https://github.com/annando/friendica 
Conflicts:
	include/poller.php
 2013-01-20 14:17:09 +01:00
Michael - piratica.eu 7ab335c9d6 Diaspora: Auto-adding users as friend who already sharing with us 2013-01-20 14:08:28 +01:00
Michael Vogel 4e3d0018c6 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	include/items.php
	update.php
 2013-01-20 14:07:57 +01:00
Tobias Diekershoff 95f58426d8 DE: update to the strings 2013-01-19 15:36:09 +01:00
Tobias Diekershoff 406692c7c6 DE: update to the strings 2013-01-18 12:40:44 +01:00
Tobias Diekershoff 01875fff5b PL: update to the strings 2013-01-18 12:40:24 +01:00
Tobias Diekershoff 605f94f790 ZH-CN: update to the strings 2013-01-18 12:39:55 +01:00
friendica 30f1fb2c4d provide a date indication in reshared content 2013-01-15 14:58:50 -08:00
Zach Prezkuta 28c9123ac8 module to show system down message 2013-01-14 16:48:01 -07:00
Tobias Diekershoff e8952541af ZH-CN: update to the strings 2013-01-13 12:55:13 +01:00
friendica 8b643d4c88 Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements 
fixes and tweaks to Smarty processing
 2013-01-12 12:28:14 -08:00
Zach Prezkuta 74caf1a4a7 * Add MIME types for file attachments 
* Restore translatability to mood phrases
* Prevent casting of "false" in html2plain
* Allow attachments with a comma in the filename
* Fix/optimize ACL img data-src jQuery search
* Fix bug when uploading files with a comma in the name using Chrome/Chromium
* Babel nicer output formatting
* Remove obsolete "plaintext" check in mod/parse_url
* Restore TinyMCE live insertion of images
* Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files
 2013-01-12 06:31:32 -07:00
Zach Prezkuta 609c45e791 fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -07:00
Zach Prezkuta c43ff35fe7 newline at end of header 2013-01-11 10:00:10 -07:00
Zach Prezkuta 1656c63a55 add warning message about automatically generated templates 2013-01-11 09:57:11 -07:00
Zach Prezkuta f24d460522 automatic, command-line conversion 2013-01-11 09:41:45 -07:00
Oliver a543a1a0c2 typo correction 
we don't want to drop Hilde
 2013-01-11 14:15:17 +01:00
pixelroot 637cfdd7cb modified: view/theme/smoothly/css/typography.css 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2013-01-11 10:56:14 +01:00
Zach Prezkuta 1cfc660e6d update a few more Smarty templates 2013-01-10 22:36:44 -07:00
Zach Prezkuta cd017282e4 use Python 2.4 compatible script; update Smarty templates 2013-01-10 22:34:23 -07:00
Michael Vogel 61c78711df Preparations for a new tag structure. Tags are now stored in a dedicated table. 2013-01-11 01:20:16 +01:00
Tobias Diekershoff df9f3b3db3 ZH-CN: update to the strings 2013-01-10 06:49:35 +01:00
Tobias Diekershoff 5ad382d797 DE: update to the strings 2013-01-10 06:48:54 +01:00
Michael Vogel 82820d8e95 Now the third most likely languages are shown. 
In "vier" the tag line is now suppressed. It saves a little bit of space - and is redundant.
 2013-01-09 20:54:18 +01:00
friendica f6a63abd7d update smarty diabook templates bug 525 2013-01-08 14:45:19 -08:00
Tobias Diekershoff e09c31b627 CS: update to the strings 2013-01-05 09:29:26 +01:00
friendica 88cc414355 Merge pull request #570 from annando/master 
Vier, caches and "share" via API
 2013-01-04 15:13:09 -08:00
friendica c0fd572fec Merge pull request #574 from fermionic/20130103-always-load-theme-in-mod_init 
Finalize theme decision in a module's _init function
 2013-01-04 14:36:47 -08:00
Tobias Diekershoff 602ca63111 PL: update to the strings 2013-01-04 09:18:21 +01:00
Zach Prezkuta fdd142c42e never use profile_load outside of a module's _init() function 2013-01-03 10:47:45 -07:00
Olaf Conradi 1c81409bf8 Merge pull request #573 from oohlaf/fixes 
Don't add src attributes inside acl-template
 2013-01-02 05:32:19 -08:00
Olaf Conradi 2943550fe2 No need to remove data-src attributes 
Better comment string also
 2013-01-02 14:28:13 +01:00
Tobias Diekershoff 68d304cc0f Merge branch 'master' of git://github.com/friendica/friendica 2013-01-02 11:10:59 +01:00
Tobias Diekershoff e56c041579 DE: update to the strings 2013-01-02 11:10:24 +01:00
fermionic 3c49a1b769 Merge pull request #572 from cvogeley/master 
Fix registration form
 2013-01-01 15:12:45 -08:00
Christian Vogeley 457a3b5220 Change templates remove var modifiers 2013-01-01 23:41:26 +01:00
Christian Vogeley 5bfd4cf5c4 Move HTML part of oid to template + replace outside the tpl 2013-01-01 22:40:05 +01:00
Tobias Diekershoff 0472ab7282 DE: update to the strings 2013-01-01 22:25:55 +01:00
Christian Vogeley cde9b6370d Fix registration form 2013-01-01 21:05:24 +01:00
pixelroot 966d786982 modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2013-01-01 16:42:52 +01:00
Zach Prezkuta 1d1c8f4771 replace dashes with underscores in diabook 2012-12-30 20:46:03 -07:00
Olaf Conradi 6a2bd8b29f Don't replace data-src with src in acl-template 
On pageload an empty acl-list-item as template is created and not yet replaced.
Don't change the data-src for src attributes in those images.
 2012-12-31 00:01:15 +01:00
Michael Vogel 348f43157a Vier: Some templates were missing 2012-12-30 22:58:05 +01:00
Michael Vogel e50c0efcdf Merge remote-tracking branch 'upstream/master' 2012-12-30 21:32:18 +01:00
Michael Vogel ad287914c7 Support of "share" through the API. 2012-12-30 21:30:39 +01:00
Olaf Conradi dbf8f711cf Fix browser prefetch in notifications menu 
Fix browser prefetch by substituting data-src with src for images
 2012-12-30 00:28:48 +01:00
Olaf Conradi 94c8d7693f Keep html in template, use data attribute for img 
Revert previous changes to fix browser preloading a template variable as image.
Images use a data attribute within templates as src.
Javascript will substitute them.
 2012-12-29 23:44:26 +01:00
Olaf Conradi a41692120e Also change acl stuff in the other themes 2012-12-28 23:51:40 +01:00
Olaf Conradi 239110a2bc Change acl selection box templating 
Keep dynamic templating in javascript so browsers don't
prefetch non-existing files.
 2012-12-28 23:28:53 +01:00
Michael Vogel 6f6b1f95c8 vier: With IE there are no borders around images anymore 
bbcode: Multiple new lines are now reduced
 2012-12-28 11:31:30 +01:00
Zach Prezkuta 8066f2109e update smarty templates 2012-12-27 12:23:37 -07:00
Zach Prezkuta 659ae4ed04 incremental improvements 2012-12-27 12:20:47 -07:00
Zach Prezkuta b6981768ee remove more dashes in templates 2012-12-27 09:38:42 -07:00
Michael Vogel 763504f0d5 Vier: Now the language of a post is shown 2012-12-27 01:05:59 +01:00
friendica e189e6582a fix profile_vcard all themes 2012-12-26 13:38:08 -08:00
friendica 792b4f63e7 remove dashes from variable names in profile_vcard.tpl 2012-12-26 13:20:18 -08:00
Zach Prezkuta 263fe0f6bc revert unnecessary variable name changes 2012-12-26 10:42:01 -07:00
Zach Prezkuta 189c8ccf6f some missed templates 2012-12-25 12:28:24 -07:00
Zach Prezkuta e736abd372 small fixes; update smarty3 templates 2012-12-25 12:05:46 -07:00
Zach Prezkuta 11c06e21b7 simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
Michael Vogel 5bc6896671 The caches are now cleared only once an hour. 2012-12-25 12:52:30 +01:00
fermionic 6603758a5e Merge pull request #558 from fermionic/20121222-use-smarty-template-engine 
fix a few more templates for correct conversion to Smarty3 templates
 2012-12-24 07:47:06 -08:00
Zach Prezkuta ce445a385f fix a few more templates for correction conversion to Smarty3 templates 2012-12-24 08:44:26 -07:00
Zach Prezkuta f0bc8aa1dc change field_*.tpl to * in some missed templates 2012-12-24 07:05:42 -07:00
Michael Vogel bbec7a1ed9 Vier: added template for vcard 2012-12-24 12:41:00 +01:00
friendica 685a677bc9 Merge pull request #555 from annando/master 
Vier: Changed buttons
 2012-12-24 03:22:43 -08:00
Michael Vogel e0df845fa3 Vier: Changed the buttons to a flat style that suites more the style of "vier" 2012-12-24 11:07:51 +01:00
Tobias Diekershoff 4cae1fea81 DE: update to the strings 2012-12-24 09:34:47 +01:00
fermionic 80ea740cca Merge pull request #554 from fermionic/20121222-use-smarty-template-engine 
couple more places where file_get_contents was used
 2012-12-23 18:30:45 -08:00
Zach Prezkuta fdd9ed7e51 couple more places where file_get_contents was used 2012-12-23 19:29:19 -07:00
fermionic 1392c58377 Merge pull request #552 from annando/master 
Vier: Forgotten CSS file and some more design changes
 2012-12-23 17:16:20 -08:00
Michael Vogel 6649cb8e1a Vier: New CSS file adde that acts like a translator between font awesome and the friendica classes 2012-12-23 23:54:28 +01:00
fermionic 974f60d132 Merge pull request #551 from fermionic/20121222-use-smarty-template-engine 
20121222 use smarty template engine
 2012-12-23 05:31:11 -08:00
Zach Prezkuta 232deadfd2 missed a couple more template engine assignments 2012-12-23 06:29:58 -07:00
fermionic a0d7f7a6d3 Merge pull request #550 from fermionic/20121222-use-smarty-template-engine 
only use Smarty if the view/smarty3/ directory is writable
 2012-12-23 05:19:02 -08:00
Zach Prezkuta 53a4cf5339 only use Smarty if the view/smarty3/ directory is writable; location bug fix 2012-12-23 06:16:35 -07:00
Michael Vogel 3a32372ffa vier: Problems with firefox on small displays fixed 2012-12-23 10:58:04 +01:00
Michael Vogel ed4eaed7e0 Vier: Content is now aligned left - like before. 2012-12-23 10:47:12 +01:00
Michael Vogel 2e83034fc3 Vier: Background color of popup menus changed 2012-12-23 10:31:46 +01:00
friendica a29842e301 Merge https://github.com/annando/friendica into annando 
Conflicts:
	view/admin_site.tpl
 2012-12-22 23:02:21 -08:00
Michael Vogel 4b240c9109 vier: Changed color of sidebar links, made the content centered. 2012-12-23 03:26:29 +01:00
Zach Prezkuta 96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07:00
Michael Vogel b0759e9a9f Some more system settings are now reachable via front-end 
Bugfixing in the mail import when a reply header isn't set correctly
 2012-12-22 16:16:01 +01:00
Michael Vogel 99ca867869 The performance settings and other systems settings (lock file path, temp path) can now be set via the front end. 2012-12-21 18:23:55 +01:00
Michael Vogel 34128925dc "vier": Now the search results containing a link to the original thread 2012-12-21 15:03:22 +01:00
Michael Vogel 61b51d40e7 Vier: disabling the "community" works now 2012-12-21 13:13:22 +01:00
Tobias Diekershoff 5cedd3430f CS: update to the strings 2012-12-21 13:10:03 +01:00
Tobias Diekershoff e441f3286c DE: update to the strings 2012-12-21 13:09:33 +01:00
Michael Vogel d7073f7884 Vier: All optical glitches should be removed now. 2012-12-21 13:02:39 +01:00
Michael Vogel 293a794973 "vier": More icons replaced 2012-12-21 03:53:07 +01:00
Michael Vogel 7c7d3fe5de "share" - now the attribut value for the "author" is escaped 2012-12-21 02:10:26 +01:00
Michael Vogel f4bc5c57f3 New option to enable and disable the "share" element 
Changes to "vier" to use more "font awesome" icons
 2012-12-21 00:08:58 +01:00
Michael Vogel 8e194cb411 Vier: switching some more icons to "font awesome" 2012-12-20 12:13:37 +01:00
friendica 898f68938a Merge pull request #546 from annando/master 
Bugfix in mail import - use of the "share" element in ostatus and diaspora items
 2012-12-19 22:54:53 -08:00
Michael Vogel a8aa992102 Vier: Design issues with preview fixed 2012-12-20 04:19:02 +01:00
Michael Vogel 330960f8f7 Vier: Now there are buttons for inserting bbcode elements in the comments 2012-12-20 03:33:36 +01:00
Olaf Conradi d9d7eb89ed Fix alignment of photo menu 
Remove duplicate definitions
Align menu button to be exactly the same width as the photo
 2012-12-19 19:15:39 +01:00
Olaf Conradi ee5d2acd42 Fix alignment of location 2012-12-19 19:04:18 +01:00
Olaf Conradi 98c5b6e73b Text box alignment in Smoothly theme 
Make sure comment text boxes stay within their surrounding box.
 2012-12-19 18:27:50 +01:00
Michael Vogel a86baa372a Mailimport is now realized like a wall-to-wall-post 2012-12-19 15:58:38 +01:00
Michael Vogel cb3586a280 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	view/de/strings.php
 2012-12-19 12:24:02 +01:00
Michael Vogel c22f65bafa repeated items from ostatus and diaspora are now using the share-element. 
Some design changes to repeated items in "vier".
 2012-12-19 12:18:52 +01:00
friendica ecc55221af Merge pull request #545 from annando/master 
New bbcode: "share", caching of photos and some changes to "vier"
 2012-12-19 03:13:42 -08:00
Michael Vogel 4164257cb2 vier: The alt-pager and the birthday- and eventreminder is optically improved 2012-12-17 21:12:11 +01:00
Tobias Diekershoff a8df4cf04b PL: update to the strings 2012-12-17 11:14:26 +01:00
Tobias Diekershoff 1353e8ef4c DE: update to the strings 2012-12-17 11:11:32 +01:00
Michael Vogel a6b1275f16 Merge remote-tracking branch 'upstream/master' 2012-12-17 10:32:53 +01:00
Michael Vogel 9c0de28622 bbcode: New element "share" for shared content 
mail: Now mails connected via subject line if there isn't an appropriate header.
vier: Improvents to the theme so that shared messages are looking fine
 2012-12-17 03:01:40 +01:00
Michael Vogel d253d59668 vier: Added Delegations and optical changes. 2012-12-15 14:39:37 +01:00
Michael Vogel a61ac769a0 vier: Expanding and collapsing now works 2012-12-15 11:25:52 +01:00
friendica 6faadc9662 anybody can see the "remove category" link, though it doesn't do anything if you aren't the owner. Can't believe this has gone so long without being reported. 2012-12-13 14:15:18 -08:00
friendica 4793ebb141 change profile photo link on profile edit page 2012-12-07 16:02:40 -08:00
Tobias Diekershoff 5a634f3d9b NB_NO: update to the strings 2012-12-04 11:09:48 +01:00
Tobias Diekershoff 62d4034a5a RU: update to the strings 2012-12-04 11:06:02 +01:00
Tobias Diekershoff fc8c01750b PT-BR: update to the strings 2012-12-04 11:03:23 +01:00
Tobias Diekershoff 71054f1483 RU: update to the strings 2012-12-03 09:35:07 +01:00
tobiasd 23c873fc51 Merge pull request #542 from annando/master 
Some minor changes to "vier"
 2012-12-02 23:49:06 -08:00
Michael Vogel 5635fe250c Merge remote-tracking branch 'upstream/master' 2012-12-03 08:30:49 +01:00
Michael Vogel d548d1943f vier: maximum width of comments defined 2012-12-03 08:29:41 +01:00
Vasya Novikov 480af990ec added translations where they were empty 2012-12-03 00:14:34 +04:00
Tobias Diekershoff daa56a94d3 DE: update to the strings 2012-11-30 09:17:58 +01:00
Tobias Diekershoff af1ebc932f FR: update to the strings 2012-11-30 09:17:29 +01:00
Thomas Willingham 785fa1e070 Remove unsupported tag from Darkzero-NS since I have been supporting it. 2012-11-29 02:33:11 +00:00
Thomas Willingham 512729073b Unmark Diabook experimental 2012-11-27 17:14:13 +00:00
Thomas Willingham 8c3ea4b4d4 Add max_daily_registrations to admin panel. 2012-11-27 17:13:32 +00:00
Thomas Willingham 7de455602c Revert Diabook. 2012-11-27 16:28:12 +00:00
Thomas Willingham 95322ff5f4 Diabook - of all the things to miss...wall-item-content. 2012-11-26 05:49:13 +00:00
Thomas Willingham fa5d25ec7a Diabook - better 1024 resolution support. 2012-11-26 04:38:19 +00:00
Thomas Willingham b0b4baa331 Diabook - kill wall_thread, remove need for wide variants, fix live updates, add todo list. 2012-11-26 02:11:19 +00:00
Tobias Diekershoff 54bcfd2535 PL: update to the strings 2012-11-25 12:57:55 +01:00
Tobias Diekershoff 50aa5face7 DE: update to the strings 2012-11-25 12:57:28 +01:00
Tobias Diekershoff ae58049110 ZH-CN: Update to the strings 2012-11-25 12:52:18 +01:00
Michael Vogel 88f5865738 Vier: Maximum with for content area 2012-11-23 12:15:03 +01:00
friendica 226d1ba7c1 Merge pull request #537 from fermionic/20121121-features 
Port Features from Red
 2012-11-22 20:54:16 -08:00
Zach Prezkuta 04f5506318 forgot some slightly important files 2012-11-22 09:20:03 -07:00
Zach Prezkuta 94204d9160 implement features 2012-11-22 09:14:22 -07:00
Michael Vogel e36c30d285 Vier: Margin problems with code fixed. 2012-11-22 15:06:15 +01:00
Tobias Diekershoff c40740d19f ZH-CN: Update to the strings 2012-11-20 17:26:54 +01:00
Thomas Willingham 7139e60b94 Diabook - fix wall-to-wall posts 2012-11-19 15:58:50 +00:00
Thomas Willingham 1a5d4f91cd Diabook red. All that's left to do now is...all sorts of other things. 2012-11-18 23:30:48 +00:00
Thomas Willingham f644cbb30b Diabook pink 2012-11-18 22:52:44 +00:00
Thomas Willingham a7982caf71 Diabook - should probably add *all* the files... 2012-11-18 22:06:53 +00:00
Thomas Willingham 96633cb0e5 Diabook - kill thousands more lines. Two more to go then we can start on the bugs... 2012-11-18 22:06:02 +00:00
Thomas Willingham 589f3603ae Diabook - grep replace missed this 2012-11-18 21:27:02 +00:00
Tobias Diekershoff f9fbab948e ZH-CN: initial pieces of the Chinese (China) translation. Thx to matthew_exon 2012-11-18 20:10:05 +01:00
Michael Vogel c0376339e0 Merge remote-tracking branch 'upstream/master' 2012-11-17 14:29:09 +01:00
Michael Vogel f17377e6de New cache system with subdirectories 2012-11-17 00:50:39 +01:00
Thomas Willingham 3f9eef1ef6 Diabook - some more heavy lifting. 2012-11-16 22:29:39 +00:00
Tobias Diekershoff 94a16f23c4 DE: update to the strings 2012-11-16 09:58:00 +01:00
Thomas Willingham c12a27c73c More diabook... 2012-11-16 02:49:05 +00:00
Thomas Willingham da2aabd61d Diabook - couple of fixes. 2012-11-16 01:58:28 +00:00
Thomas Willingham bb86214698 Add the event/birthday thing from Andreas. 2012-11-16 01:44:09 +00:00
Thomas Willingham da1b4939f0 Merge branch 'master' of https://github.com/friendica/friendica 2012-11-16 00:37:53 +00:00
Thomas Willingham b19c832381 Diabook. Get the paths right. There seems to be something in the PHP putting us in unexpected directories...but it works now. 2012-11-16 00:36:52 +00:00
Thomas Willingham 09150cb5dc Diabook - some heavy lifting. Lots more still to do. 2012-11-15 23:54:13 +00:00
Michael Vogel e67062d9cf Merge remote-tracking branch 'upstream/master' 2012-11-15 21:52:35 +01:00
Michael Vogel fce18fd223 Vier: New Icon set 2012-11-15 21:47:36 +01:00
Michael Vogel ff5ab7e9c6 Vier: Further improvements. 2012-11-15 08:18:25 +01:00
pixelroot a00723fb9c modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
	modified:   view/theme/smoothly/wall_thread.tpl
 2012-11-14 20:10:08 +01:00
pixelroot 7c4e3984be new file: view/theme/smoothly/search_item.tpl 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	modified:   view/theme/smoothly/wall_thread.tpl
 2012-11-14 11:43:26 +01:00
Thomas Willingham 6fd47ba78e Even shinier Dispy. 2012-11-14 03:01:15 +00:00
Thomas Willingham 79f35d01a7 "Everything" now includes Vier 2012-11-13 16:21:03 +00:00
Thomas Willingham 4c6401cfb0 Merge branch 'master' of https://github.com/friendica/friendica 2012-11-13 15:52:16 +00:00
tobiasd 4b5dea5c89 Update view/pl/strings.php 2012-11-13 16:52:18 +01:00
Thomas Willingham 13ffe6274c Everything is shiny (except frost and smoothly). 2012-11-13 15:50:48 +00:00
pixelroot 7e16909d0e deleted: view/theme/smoothly/events_reminder.tpl 2012-11-13 16:37:53 +01:00
pixelroot 0e2fdee20e modified: view/theme/smoothly/jot-header.tpl 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-11-13 16:36:36 +01:00
fabrixxm ce12b3d2f0 Merge pull request #535 from fabrixxm/master 
fix \"" issue in util/po2php.php
 2012-11-13 07:16:22 -08:00
Fabrixxm 7093c1b9f6 update all languages strings.php 2012-11-13 10:13:28 -05:00
Tobias Diekershoff 9886139d71 PL: update to the strings 2012-11-13 15:39:07 +01:00
fabrixxm 5a2c01d572 Merge pull request #532 from fabrixxm/quattrofixs 
template: new $item.shiny; some fix to quattro
 2012-11-13 03:08:26 -08:00
Fabrixxm d40099e97c add $item.shiny to default template 2012-11-12 12:55:18 -05:00
Fabrixxm f3716d51ef quattro: fix tag item template 
add correct initial and final divs
 2012-11-12 12:45:49 -05:00
pixelroot 9f09955925 modified: view/theme/smoothly/css/typography.css 
modified:   view/theme/smoothly/style.css
 2012-11-12 15:35:16 +01:00
pixelroot 8395966cf2 modified: view/theme/smoothly/css/typography.css 
new file:   view/theme/smoothly/screenshot.png
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-11-12 15:01:19 +01:00
Michael Vogel 30e429e6ce Vier: Changed the color of links and notification counter. 2012-11-12 08:22:49 +01:00
Michael Vogel b6b85b9773 Vier: Colors of links changed 2012-11-12 00:38:45 +01:00
Thomas Willingham 4c3e9fde28 Diabook - move pause icon. 2012-11-11 18:44:13 +00:00
Thomas Willingham fccc76371f Move the language selector. 2012-11-11 18:42:35 +00:00
Thomas Willingham 1a884e4065 Diabook - an out of date buglink probably shouldn't be in the navigation. 2012-11-11 18:39:16 +00:00
Thomas Willingham 9ea96c74a2 Diabook - remove jquery that seems to do nothing except break ACL in 90% of all browsers. 2012-11-11 18:31:11 +00:00
Thomas Willingham 8b961b0a39 Diabook - yeah, we're supposed to *stop* duplicating code... 2012-11-11 17:49:41 +00:00
Thomas Willingham 4bd70c15db Merge branch 'master' of https://github.com/friendica/friendica 2012-11-11 15:46:04 +00:00
Thomas Willingham 10e84c548c Diabook threaded comments. 2012-11-11 15:44:36 +00:00
Tobias Diekershoff f28b49e6d8 PL: update to the strings 2012-11-11 10:56:07 +01:00
Tobias Diekershoff c88e7d75c0 CS: update to the strings 2012-11-11 10:55:47 +01:00
Michael Vogel 197a12adb5 Vier: Further design improvements 2012-11-11 00:39:08 +01:00
Michael Vogel b875191237 Diaspora: Avatars of repeated items weren't found 
Vier: Complete redesign of the navigation header
 2012-11-10 23:19:32 +01:00
Tobias Diekershoff 7187107034 glitch with DE, PL strings 2012-11-10 08:50:26 +01:00
Tobias Diekershoff 286578542f DE: update to the strings 2012-11-10 08:37:21 +01:00
Tobias Diekershoff 85feaa1a8d PL: update to the strings 2012-11-10 08:36:43 +01:00
Michael Vogel 71e43e68d4 Merge remote-tracking branch 'upstream/master' 2012-11-09 23:40:17 +01:00
Fabrixxm ff659a822b add apple/gnome web app tags 2012-11-09 13:23:47 -05:00
Fabrixxm b15352f650 quattro: collapse threaded comment box 2012-11-09 11:58:35 -05:00
Fabrixxm c8b4ce9cca quattro: fix shiny items with threads. fix 'tagged' template 2012-11-09 11:24:49 -05:00
Michael Vogel fb02d72a35 vier: toggle comments only with threaded comments 2012-11-09 08:01:16 +01:00
friendica f71db67a36 Merge https://github.com/friendica/friendica into pull 2012-11-08 20:47:04 -08:00
friendica 4199f49b54 remember me to base theme 2012-11-08 20:46:44 -08:00
fermionic a6c05b5186 Merge pull request #530 from fermionic/20121108-dispy-menu-fix 
fix help button position in dispy
 2012-11-08 18:16:01 -08:00
Michael Vogel b41687e209 "vier": Button for show/hide of text area for comments 2012-11-09 01:56:51 +01:00
Zach Prezkuta 36a9b2ed9a fix help button position 2012-11-08 17:50:37 -07:00
friendica 824dcb8e76 Merge pull request #529 from fermionic/20121107-remember-me 
add ability to remember logged in user after browser closes
 2012-11-08 16:29:02 -08:00
Michael Vogel b14e557575 Vier: Fixing "vier" so that it looks again like it was intended. 2012-11-09 01:19:24 +01:00
Michael Vogel 4196b6a96c Merge remote-tracking branch 'upstream/master' 2012-11-08 21:44:17 +01:00
Tobias Diekershoff 225fd777fd PL: added Polish localization. Tha to Adam Jurkiewicz and the rest of the translation team :-) 2012-11-08 18:54:42 +01:00
Tobias Diekershoff 815d48e5e4 frost-mobile: on subdirectory installs the login screen image was not found 2012-11-08 06:48:49 +01:00
Zach Prezkuta e116712bf5 add ability to remember logged in user after browser closes 2012-11-07 18:59:30 -07:00
Zach Prezkuta bff31a49eb leaked local change 2012-11-06 08:49:03 -07:00
Zach Prezkuta 999c3439e6 fix mobile photo uploads; better theme control; frost improvements 2012-11-06 08:43:19 -07:00
Fabrixxm 5b4944fe8e Merge remote-tracking branch 'remotes/friendica/master' into moveme 2012-11-05 09:37:58 +01:00
Fabrixxm aa20042bec moveme: fix contact photos 2012-11-05 09:18:55 +01:00
Tobias Diekershoff 2093fa8b3f DE: update to the strings 2012-11-05 07:29:55 +01:00
Michael ff40442768 Restoring the community pages in diabook 2012-11-05 00:20:32 +01:00
Zach Prezkuta c9248b66db display live update; don't collapse comments on live update 2012-11-01 18:31:50 -06:00
Zach Prezkuta 6effdd570c add a confirm dialog and a busy rotator for delete selected 2012-11-01 17:42:40 -06:00
Zach Prezkuta e9b26ffbb3 prevent double posting of status updates and comments 2012-11-01 17:14:42 -06:00
Tobias Diekershoff c177a5e5b2 vier: threads 2012-11-01 15:05:31 +01:00
Tobias Diekershoff 9086641fd1 ES: update to the strings 2012-11-01 13:12:54 +01:00
Tobias Diekershoff 4832bc74f5 FR: update to the strings 2012-11-01 13:03:25 +01:00
Fabrixxm 1a3a5ee8d9 moveme: first successful relocated user 2012-10-31 17:13:45 +01:00
Tobias Diekershoff 70f8a69ef3 IT: update to the strings 2012-10-31 07:42:23 +01:00
Zach Prezkuta 2bfacda2df missed quattro threaded_conversation live update field 2012-10-29 13:04:59 -06:00
Zach Prezkuta 4fa5b76167 delete template files that are identical to the defaults 2012-10-29 12:56:17 -06:00
Fabrixxm dbc6cbe024 moveme: send and receive DFRN "relocate" message (WIP) 2012-10-29 17:50:55 +01:00
Fabrixxm c51e057fe6 Merge remote branch 'friendica/master' into moveme 2012-10-29 05:57:58 -04:00
pixelroot c1299bc689 view/theme/smoothly/screenshot.png 2012-10-25 13:50:26 +02:00
pixelroot 8e9c9992b0 new file: view/theme/smoothly/images/arrow.png 
new file:   view/theme/smoothly/images/calendar.png
	new file:   view/theme/smoothly/images/connect.png
	new file:   view/theme/smoothly/images/dot.png
	new file:   view/theme/smoothly/images/down.png
	new file:   view/theme/smoothly/images/file.gif
	new file:   view/theme/smoothly/images/groups.png
	new file:   view/theme/smoothly/images/icons.png
	new file:   view/theme/smoothly/images/icons.svg
	new file:   view/theme/smoothly/images/login-bg.gif
	new file:   view/theme/smoothly/images/lrarrow.gif
	new file:   view/theme/smoothly/images/menu-user-pin.jpg
	new file:   view/theme/smoothly/images/menu-user-pin.png
	new file:   view/theme/smoothly/images/nav-bg.png
	new file:   view/theme/smoothly/images/next.png
	new file:   view/theme/smoothly/images/notifications.png
	new file:   view/theme/smoothly/images/photo-menu.jpg
	new file:   view/theme/smoothly/images/photography.png
	new file:   view/theme/smoothly/images/premium.png
	new file:   view/theme/smoothly/images/prev.png
	new file:   view/theme/smoothly/images/search.png
	new file:   view/theme/smoothly/images/shiny.png
	new file:   view/theme/smoothly/images/star.png
	new file:   view/theme/smoothly/images/tobottom.png
	new file:   view/theme/smoothly/images/totop.png
	new file:   view/theme/smoothly/images/user.png
 2012-10-25 12:27:05 +02:00
pixelroot 272cccb47f deleted: view/theme/smoothly/arrow.png 
deleted:    view/theme/smoothly/calendar.png
	deleted:    view/theme/smoothly/connect.png
	modified:   view/theme/smoothly/css/typography.css
	deleted:    view/theme/smoothly/dot.png
	deleted:    view/theme/smoothly/down.png
	deleted:    view/theme/smoothly/file.gif
	deleted:    view/theme/smoothly/groups.png
	deleted:    view/theme/smoothly/icons.png
	deleted:    view/theme/smoothly/icons.svg
	deleted:    view/theme/smoothly/login-bg.gif
	deleted:    view/theme/smoothly/lrarrow.gif
	deleted:    view/theme/smoothly/menu-user-pin.jpg
	deleted:    view/theme/smoothly/menu-user-pin.png
	deleted:    view/theme/smoothly/nav-bg.png
	modified:   view/theme/smoothly/nav.tpl
	deleted:    view/theme/smoothly/nets.tpl
	deleted:    view/theme/smoothly/next.png
	deleted:    view/theme/smoothly/notifications.png
	deleted:    view/theme/smoothly/photo-menu.jpg
	deleted:    view/theme/smoothly/photo_album.tpl
	deleted:    view/theme/smoothly/photo_top.tpl
	deleted:    view/theme/smoothly/photo_view.tpl
	deleted:    view/theme/smoothly/photography.png
	deleted:    view/theme/smoothly/premium.png
	deleted:    view/theme/smoothly/prev.png
	deleted:    view/theme/smoothly/profile_entry.tpl
	deleted:    view/theme/smoothly/profile_vcard.tpl
	deleted:    view/theme/smoothly/saved_searches_aside.tpl
	deleted:    view/theme/smoothly/screenshot.png
	deleted:    view/theme/smoothly/search.png
	deleted:    view/theme/smoothly/search_item.tpl
	deleted:    view/theme/smoothly/shiny.png
	deleted:    view/theme/smoothly/star.png
 2012-10-25 12:26:09 +02:00
Simon L'nu 00ee068b65 fix for preview post thingy blocking the posting buttons 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-10-25 02:59:49 -04:00
Simon L'nu 1d9633b0cc Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  Friendicaland - remove states no longer flying the Friendica banner.
  deleted:    view/theme/smoothly/categories_widget.tpl 	deleted:    view/theme/smoothly/contact_template.tpl 	deleted:    view/theme/smoothly/footer.tpl 	deleted:    view/theme/smoothly/generic_links_widget.tpl 	deleted:    view/theme/smoothly/group_drop.tpl 	deleted:    view/theme/smoothly/group_side.tpl 	deleted:    view/theme/smoothly/header.tpl 	deleted:    view/theme/smoothly/mail_head.tpl 	deleted:    view/theme/smoothly/message_side.tpl 	deleted:    view/theme/smoothly/peoplefind.tpl 	modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/login.tpl 	modified:   view/theme/smoothly/style.css
 2012-10-25 02:11:38 -04:00
pixelroot fa7157492a deleted: view/theme/smoothly/categories_widget.tpl 
deleted:    view/theme/smoothly/contact_template.tpl
	deleted:    view/theme/smoothly/footer.tpl
	deleted:    view/theme/smoothly/generic_links_widget.tpl
	deleted:    view/theme/smoothly/group_drop.tpl
	deleted:    view/theme/smoothly/group_side.tpl
	deleted:    view/theme/smoothly/header.tpl
	deleted:    view/theme/smoothly/mail_head.tpl
	deleted:    view/theme/smoothly/message_side.tpl
	deleted:    view/theme/smoothly/peoplefind.tpl
	modified:   view/theme/smoothly/style.css
 2012-10-24 16:41:56 +02:00
pixelroot c92e7a3521 modified: view/theme/smoothly/style.css 2012-10-24 14:04:57 +02:00
pixelroot 6d1614e8fa modified: view/theme/smoothly/login.tpl 
modified:   view/theme/smoothly/style.css
 2012-10-24 12:24:12 +02:00
Simon L'nu cf42b6f78d Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master: (23 commits)
  modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/css/typography.css 	modified:   view/theme/smoothly/style.css 	modified:   view/theme/smoothly/theme.php
  Diabook - a bit more cleanup, plus mark as experimental (there's so much heavy lifting, things are bound to break).
  Diabook - first part of clean-up to make the theme maintainable.
  modified:   view/theme/smoothly/css/typography.css 	modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/profile_vcard.tpl 	modified:   view/theme/smoothly/style.css 	modified:   view/theme/smoothly/theme.php 	new file:   view/theme/smoothly/vcard-widget.tpl
  rev update
  modified:   view/theme/smoothly/css/typography.css 	modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/default.php 	modified:   view/theme/smoothly/nav.tpl 	modified:   view/theme/smoothly/style.css 	new file:   view/theme/smoothly/tobottom.png
  modified:   view/theme/smoothly/style.css 	modified:   view/theme/smoothly/theme.php
  IT: update to the strings
  DE: update to the strings
  new file:   view/theme/smoothly/css/typography.css 	modified:   view/theme/smoothly/style.css 	modified:   view/theme/smoothly/theme.php
  DarkZero - no changes, just move things around to sort by where on a page they apply to in order to (hopefully) make a bit more sense to anyone maintaining it who isn't me.
  Friendicaland
  undefined fn: init_groups_visitor in mod_profile, rev update
  Diabook - remove redundant TPL to bring back all admin settings
  CS: update to the strings
  ES: update to the strings
  FR: update to the strings
  ...
 2012-10-24 05:41:11 -04:00
pixelroot cc59cb2755 modified: view/theme/smoothly/style.css 2012-10-24 11:13:12 +02:00
pixelroot fe4e6f05d7 modified: view/theme/smoothly/css/typography.css 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-10-24 10:33:39 +02:00
Thomas Willingham a8084fa540 Diabook - a bit more cleanup, plus mark as experimental (there's so much heavy lifting, things are bound to break). 2012-10-23 20:05:55 +01:00
Thomas Willingham 35a44d8d27 Diabook - first part of clean-up to make the theme maintainable. 2012-10-23 19:20:49 +01:00
pixelroot e43097dbc1 modified: view/theme/smoothly/css/typography.css 
modified:   view/theme/smoothly/style.css
 2012-10-23 15:47:48 +02:00
pixelroot 136175047d modified: view/theme/smoothly/profile_vcard.tpl 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	new file:   view/theme/smoothly/vcard-widget.tpl
 2012-10-23 14:23:28 +02:00
pixelroot 5f61290811 modified: view/theme/smoothly/css/typography.css 
modified:   view/theme/smoothly/style.css
 2012-10-23 10:58:50 +02:00
pixelroot f8787b6762 modified: view/theme/smoothly/default.php 
modified:   view/theme/smoothly/nav.tpl
	modified:   view/theme/smoothly/style.css
	new file:   view/theme/smoothly/tobottom.png
 2012-10-23 10:22:39 +02:00
pixelroot 215f084a2e modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2012-10-23 09:24:19 +02:00
Tobias Diekershoff 09a36fc05c IT: update to the strings 2012-10-22 17:54:17 +02:00
Tobias Diekershoff b157a00c34 DE: update to the strings 2012-10-22 17:48:30 +02:00
pixelroot e4ab5dd32f new file: view/theme/smoothly/css/typography.css 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-10-22 16:53:56 +02:00
Thomas Willingham 05bfd3bbf7 DarkZero - no changes, just move things around to sort by where on a page they apply to in order to (hopefully) make a bit more sense to anyone maintaining it who isn't me. 2012-10-22 01:49:35 +01:00
Thomas Willingham 1b9438120c Diabook - remove redundant TPL to bring back all admin settings 2012-10-21 18:44:23 +01:00
Tobias Diekershoff 298aeb5bf5 CS: update to the strings 2012-10-20 12:57:34 +02:00
Tobias Diekershoff 64a0dc1eed ES: update to the strings 2012-10-20 12:57:09 +02:00
Tobias Diekershoff 50cf6c0797 FR: update to the strings 2012-10-20 12:56:47 +02:00
Tobias Diekershoff 21ffccbe72 DE: update to the strings 2012-10-20 12:56:25 +02:00
pixelroot 5016a589fb modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2012-10-19 11:53:22 +02:00
friendica 2347a4326c get rid of 'Friendika' 2012-10-18 21:51:45 -07:00
Simon L'nu 6ee4e4a93d Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  imagick exception
  rev update
  diabook: use proper defaults in popup sidebar config
  diabook boxes: use a common hide/show form entry definition
  remove lots of duplicated code in diabook config handling
 2012-10-18 11:30:58 -04:00
Fabrixxm 65d235017c move account. first step. 
export basic account data as json
import basic account data in db (dbs must be at same schema version)
 2012-10-17 11:13:01 -04:00
Thomas Willingham 2940f25df9 Merge pull request #514 from hmeine/master 
Cleanups in diabook theme code
 2012-10-16 09:05:50 -07:00
Hans Meine ba503b9927 diabook: use proper defaults in popup sidebar config 2012-10-16 13:44:27 +02:00
Hans Meine d0775be2e2 diabook boxes: use a common hide/show form entry definition 2012-10-16 13:42:18 +02:00
Hans Meine 2d614b6700 remove lots of duplicated code in diabook config handling 2012-10-16 13:33:53 +02:00
Simon L'nu 2c15bdd99e merge HEAD 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-10-15 22:48:25 -04:00
Tobias Diekershoff f5a458d139 DE/FR/PT-BR: update to the strings 2012-10-13 09:38:47 +02:00
fermionic 2f3d118e77 Merge pull request #508 from fermionic/no-theme-control-of-live-update-location 
allow themes to decide where live updates appear
 2012-10-10 17:34:28 -07:00
Zach Prezkuta 0d56f82efa frost style improvements; various tweaks 2012-10-09 09:44:56 -06:00
Zach Prezkuta 0ea89852d2 allow themes to decide where live updates appear 2012-10-09 09:41:33 -06:00
Tobias Diekershoff c0c8869f89 CS: update to the strings 2012-10-09 08:23:52 +02:00
Tobias Diekershoff 1fa88bb79e DE/PT-BR: update to the strings 2012-10-06 10:43:14 +02:00
Thomas Willingham ffe7209114 Darkzero - make "visible to" legible. 2012-10-06 01:18:03 +01:00
Zach Prezkuta 5f2826f84e update themes for new All Networks option 2012-10-04 19:59:30 -06:00
Thomas Willingham d33abe2de9 Dispy - selecting any network and then switching back to "all networks" 
didn't work.  Remove nets.tpl to make it use the default one.
 2012-10-04 23:19:50 +01:00
pixelroot ceb8b8b77f new file: view/theme/smoothly/file.gif 
modified:   view/theme/smoothly/search_item.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-10-04 16:37:02 +02:00
Tobias Diekershoff ef9eec5561 DE: update to the strings 2012-10-04 10:33:49 +02:00
Tobias Diekershoff 65b52878c4 CS: update to the strings 2012-10-03 09:00:59 +02:00
Tobias Diekershoff 122cf96ffd FR: update to the strings 2012-10-03 07:56:29 +02:00
Tobias Diekershoff d651291916 DE: update to the strings 2012-10-03 07:56:12 +02:00
Christian Vogeley 44acbb25e4 Bring back BB-Code in comments 2012-10-02 21:29:00 +02:00
Zach Prezkuta e850e0c6d5 frost suport for categories and folder updates 2012-10-01 14:22:32 -06:00
fabrixxm 9d4fdee65d Merge pull request #500 from fabrixxm/quattro-fontsoptions 
Quattro fixes
 2012-10-01 07:05:58 -07:00
Fabrixxm c7a4c08081 quattro: fix jot "video link" tooltip 2012-10-01 09:59:55 -04:00
Fabrixxm 871f182414 quattro: add quattro-lilac to theme Makefile 2012-10-01 09:53:02 -04:00
Fabrixxm ca34d89482 quattro: fix post tags style, add icons for mentions, folders and categories 2012-10-01 09:38:25 -04:00
Fabrixxm 9d738570ee quattro: options for posts and textareas font size 2012-10-01 08:58:05 -04:00
friendica a620d5d9f3 Merge pull request #493 from fermionic/toggle-mobile-all-themes 
Toggle mobile all themes
 2012-09-30 01:58:51 -07:00
friendica b03edcd8e5 Merge pull request #499 from fermionic/network-remember-filters 
Network view updates
 2012-09-30 01:54:00 -07:00
Tobias Diekershoff db81050edd IT: update to the strings 2012-09-30 09:07:14 +02:00
Tobias Diekershoff cacd28d045 deleted nb_NO folder manually 2012-09-30 09:01:40 +02:00
Tobias Diekershoff e476a7126c should be nb-no 2012-09-30 08:52:40 +02:00
Tobias Diekershoff 2e8ac578cc RU: update to the strings 2012-09-30 08:49:16 +02:00
Tobias Diekershoff f547387ada FR: update to the strings 2012-09-30 08:43:15 +02:00
Tobias Diekershoff f73df7d209 DE: update to the strings 2012-09-30 08:41:43 +02:00
Tobias Diekershoff 4845aa229c nb_NO: added from Transifex 2012-09-30 08:41:03 +02:00
Zach Prezkuta 421c72d10f remember combination of last tab selected, last group selected, and last network selected; update only items seen in selected filters 2012-09-29 17:56:50 -06:00
Zach Prezkuta 4c2dd162a4 add new template file 2012-09-29 17:51:39 -06:00
Zach Prezkuta cee50502d3 toggle mobile on all themes; Frost updates 2012-09-29 17:47:47 -06:00
Fabrixxm de076afd6b quattro: update wall_thread.tpl to separate tags/mentions/folder/category display 2012-09-28 10:17:26 -04:00
Fabrixxm 574631c17a Merge remote branch 'friendica/master' into quattro-fontsoptions 2012-09-28 10:06:00 -04:00
Tobias Diekershoff ce8b6c4285 FR: update to the strings 2012-09-28 06:44:30 +02:00
friendica 9337441491 class not id 2012-09-27 02:54:14 -07:00
friendica d615f0b563 forumlist changes 2012-09-27 02:47:50 -07:00
Tobias Diekershoff 44469afe86 added IS from transifex, kudos to axelt 2012-09-27 06:42:57 +02:00
Tobias Diekershoff 0209edb25c FR: update to the strings 2012-09-27 06:31:55 +02:00
Tobias Diekershoff 1880ad40d9 CA: update to the strings 2012-09-27 06:30:37 +02:00
Tobias Diekershoff 88642699e7 EO: update to the strings 2012-09-27 06:29:25 +02:00
Tobias Diekershoff 5fb4ca346b CS: update to the strings 2012-09-27 06:27:06 +02:00
Tobias Diekershoff 7b7e3aab1f ES: update to the strings 2012-09-27 06:24:49 +02:00
Tobias Diekershoff ce38e574a2 DE: update to the strings 2012-09-27 06:21:16 +02:00
friendica 4a8100a409 frost-mobile - everything is walltowall 2012-09-25 21:55:53 -07:00
friendica 2cacbdb9e7 Merge https://github.com/friendica/friendica into pull 2012-09-25 19:11:58 -07:00
friendica e433f20cd8 sort out the 'delete selected' mess 2012-09-25 19:10:46 -07:00
pixelroot 75d65db785 Merge remote branch 'upstream/master' 2012-09-25 12:00:29 +02:00
pixelroot 0bf9ff5821 modified: view/theme/smoothly/events_reminder.tpl 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-09-25 11:59:58 +02:00
friendica 245d9f0aca one template to rule them all 2012-09-25 01:31:48 -07:00
friendica a798ef1a56 one template to rule them all 2012-09-24 21:43:03 -07:00
pixelroot 0592a9e3ca modified: view/theme/smoothly/login.tpl 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-09-24 16:07:41 +02:00
friendica 8df6f249fd Merge https://github.com/friendica/friendica into pull 2012-09-24 01:31:23 -07:00
pixelroot 0834779405 Merge remote branch 'upstream/master' 2012-09-24 10:16:05 +02:00
pixelroot 05223cc325 modified: view/theme/smoothly/search_item.tpl 
modified:   view/theme/smoothly/theme.php
	modified:   view/theme/smoothly/wall_item.tpl
	modified:   view/theme/smoothly/wall_thread.tpl
	modified:   view/theme/smoothly/wallwall_item.tpl
	modified:   view/theme/smoothly/wallwall_thread.tpl
 2012-09-24 10:15:31 +02:00
friendica 94f3aef1ea allow a bit more height 2012-09-24 00:46:00 -07:00
friendica 316014e4ea restore category/file display on dispy/diabook 2012-09-24 00:35:19 -07:00
pixelroot c44d068adf Merge branch 'master' of http://github.com/friendica/friendica 2012-09-24 08:46:25 +02:00
friendica 054f8edb59 zeros - theming for new categories/folder display 2012-09-23 19:22:48 -07:00
Tobias Diekershoff 930169a8aa DE: update to the strings 2012-09-22 08:42:07 +02:00
pixelroot 57849ff959 modified: view/theme/smoothly/style.css 2012-09-21 08:57:22 +02:00
pixelroot fa2156a9c1 modified: view/theme/smoothly/style.css 2012-09-20 13:26:53 +02:00
pixelroot 8a8fe725af modified: view/theme/smoothly/style.css 2012-09-20 13:25:12 +02:00
pixelroot 85c0260f33 modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2012-09-20 13:15:01 +02:00
pixelroot 12f7c32f9b modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2012-09-20 11:32:55 +02:00
pixelroot 49098ed11d deleted: view/theme/smoothly/match.tpl 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-09-20 09:25:53 +02:00
Zach Prezkuta 1aa111387a -- Fix Diaspora profile update avatar bugs 
-- Protect BBCode tags inside of [pre] from space re-formatting
-- More information in email poll logging
-- Frost/Frost Mobile bug fixes
 2012-09-19 20:35:39 -06:00
friendica c11aa30ef4 this is not the best solution, but don't close the comment-bb buttons when you click outside the comment, because the comment-bb buttons are outside the comment and if you click one on an empty comment box the comment goes away completely and the bbcode doesn't get inserted. 2012-09-19 18:24:20 -07:00
friendica 51bee79b21 Merge https://github.com/friendica/friendica into pull 
Conflicts:
	view/theme/smoothly/follow.tpl
 2012-09-19 15:39:19 -07:00
friendica 09a00a9a07 html tag completed early 2012-09-19 15:34:21 -07:00
pixelroot 31064a15ec modified: view/theme/smoothly/theme.php 2012-09-19 16:16:58 +02:00
pixelroot a4f25f6eaa modified: view/theme/smoothly/style.css 2012-09-19 16:14:45 +02:00
pixelroot 05a61b80e2 modified: view/theme/smoothly/follow.tpl 
modified:   view/theme/smoothly/jot.tpl
	modified:   view/theme/smoothly/peoplefind.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	modified:   view/theme/smoothly/wall_item.tpl
	modified:   view/theme/smoothly/wall_thread.tpl
	modified:   view/theme/smoothly/wallwall_item.tpl
	modified:   view/theme/smoothly/wallwall_thread.tpl
 2012-09-19 15:53:37 +02:00
friendica 82678e7bbf bad html in view/follow.tpl 2012-09-19 03:17:41 -07:00
Thomas Willingham 96d6d6b988 Pull request #487 2012-09-18 16:15:36 +01:00
Alex 61eb884a20 Update view/theme/smoothly/bottom.tpl 2012-09-18 13:13:05 +03:00
friendica 863e036b76 Merge pull request #483 from fabrixxm/bug471 
admin: Don't allow to block or delete site admin in users admin page.
 2012-09-17 17:39:32 -07:00
Thomas Willingham 69182360ef Merge pull request #486 from cvogeley/master 
Show notifications in title, ignore OSX .DS_Store files
 2012-09-17 14:44:17 -07:00
Christian Vogeley c024ed601e Remove and ignore .DS_Store 2012-09-17 23:03:34 +02:00
Tobias Diekershoff 808b0f2ed8 ES: bringing the strings to 100% thx to csolisr 2012-09-17 21:52:21 +02:00
Christian Vogeley 318bc23e8a Add notifications in title 2012-09-17 20:39:34 +02:00
Thomas Willingham e34b8e6d46 Pull request #484 (Smoothly) 2012-09-17 18:37:44 +01:00
tomtom84 68c2316ce3 Corrected titlebar notifications in Diabook 2012-09-17 17:54:07 +02:00
Thomas Willingham 11eebf7091 Add titlebar notifications to Dispy. 2012-09-17 14:54:40 +01:00
Thomas Willingham 9cabcad36c Add title bar notifications to Smoothly 2012-09-17 14:53:17 +01:00
Fabrixxm 6aa45fb9cc admin: Don't allow to block or delete site admin in users admin page. fix bug 471 2012-09-17 08:48:43 -04:00
Alex f558a1fe8d Merge pull request #482 from pixelroot/master 
bug fix
 2012-09-17 05:12:53 -07:00
pixelroot ede6b4ad12 modified: view/theme/smoothly/style.css 2012-09-17 14:16:13 +02:00
pixelroot 176fe0351a new file: view/theme/smoothly/shiny.png 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-09-17 13:49:09 +02:00
Alex 01daaafc92 Merge pull request #481 from pixelroot/master 
Better mark new posts
 2012-09-17 04:46:00 -07:00
pixelroot cd3938dfda new file: view/theme/smoothly/default.php 
new file:   view/theme/smoothly/footer.tpl
	new file:   view/theme/smoothly/header.tpl
	modified:   view/theme/smoothly/nav.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-09-17 11:22:12 +02:00
Alex 06c9330c5e Merge pull request #480 from pixelroot/master 
Bug fixes
 2012-09-17 02:20:07 -07:00
Fabrixxm 6deb070890 quattro: first work on font size options 2012-09-17 03:29:58 -04:00
Zach Prezkuta ab10a7b56b missed one 2012-09-16 18:57:04 -06:00
Zach Prezkuta 3c7419ec57 various bug fixes 2012-09-16 18:56:31 -06:00
Tobias Diekershoff d29da99dbd frost: added some missing baseurls to nav.tpl 2012-09-16 18:33:55 +02:00
Thomas Willingham f198953790 Merge branch 'master' of https://github.com/friendica/friendica 2012-09-16 16:17:43 +01:00
Thomas Willingham 225c9bb30e Make 'Friendika' 'Friendica' in open search. 2012-09-16 16:16:22 +01:00
Tobias Diekershoff 89981b33bb DE: update to the strings 2012-09-16 10:48:29 +02:00
friendica 2abbd1dc19 permissions selector showing up for guests, testbubble and smoothly 2012-09-15 20:21:17 -07:00
Tobias Diekershoff 21d685b21c DE: update to the strings 2012-09-15 10:38:08 +02:00
pixelroot 816680ca85 new file: view/theme/smoothly/bottom.tpl 
new file:   view/theme/smoothly/js/jquery.autogrow.textarea.js
	new file:   view/theme/smoothly/js/modernizr.custom.2.5.3.js
	new file:   view/theme/smoothly/js/modernizr.custom.2.5.3.min.js
 2012-09-14 19:08:39 +02:00
pixelroot 3c846547f7 modified: view/theme/smoothly/style.css 2012-09-14 19:08:21 +02:00
Alex 7ae1e4620d Merge pull request #476 from pixelroot/master 
new funktion
 2012-09-14 10:07:17 -07:00
pixelroot 6537a94b1a new file: view/theme/smoothly/down.png 2012-09-14 17:55:27 +02:00
pixelroot a300973084 modified: view/theme/smoothly/style.css 2012-09-14 17:55:17 +02:00
Alex 5d22b13242 Merge pull request #475 from pixelroot/master 
Bugs
 2012-09-14 08:53:27 -07:00
Tobias Diekershoff cb1c9de069 quattro: lilac color schema 2012-09-14 17:01:26 +02:00
Tobias Diekershoff 6c44125fb5 DE: update to the strings 2012-09-14 15:46:14 +02:00
Tobias Diekershoff 882f437149 quattro: mail link to profile page 2012-09-14 15:35:40 +02:00
pixelroot 252e112ad5 modified: view/theme/smoothly/style.css 2012-09-14 12:46:32 +02:00
Alex 98540b630e Merge pull request #474 from pixelroot/master 
Bug fix
 2012-09-14 03:43:48 -07:00
pixelroot e78b86f534 modified: view/theme/smoothly/style.css 2012-09-14 11:57:13 +02:00
Alex 9c7d5d42e1 Merge pull request #473 from pixelroot/master 
Editor redesign
 2012-09-14 02:54:30 -07:00
pixelroot bdc5a3ab29 deleted: view/theme/smoothly/group_edit.tpl 2012-09-14 10:16:35 +02:00
Alex ac0ad8fecf Merge pull request #472 from pixelroot/master 
Group-Edit bug
 2012-09-14 01:14:48 -07:00
pixelroot d002573543 deleted: view/theme/smoothly/default.php 
modified:   view/theme/smoothly/nav.tpl
 2012-09-14 09:55:54 +02:00
Alex 2a404ae6dd Merge pull request #471 from pixelroot/master 
Theme Smoothly
 2012-09-14 00:54:54 -07:00
pixelroot 1c4bea295f new file: view/theme/smoothly/default.php 2012-09-14 09:33:47 +02:00
pixelroot d1984c4c64 modified: view/theme/smoothly/nav.tpl 
modified:   view/theme/smoothly/style.css
 2012-09-14 09:33:21 +02:00
pixelroot bff9c3d460 modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2012-09-14 08:50:10 +02:00
friendica 32d4a359f1 reverse the default newuser privacy setting to public. Sites can over-ride. 2012-09-13 19:11:07 -07:00
Thomas Willingham 290da6c845 Merge pull request #469 from pixelroot/master 
Theme Smoothly
 2012-09-13 07:59:16 -07:00
pixelroot 0cc661dd9c modified: view/theme/smoothly/style.css 2012-09-13 16:50:55 +02:00
pixelroot 664680cdd8 modified: view/theme/smoothly/style.css 2012-09-13 16:30:12 +02:00
friendica d3699498ac Merge pull request #468 from pixelroot/master 
Theme Smoothly
 2012-09-13 03:50:55 -07:00
pixelroot a1ed9c72c2 modified: view/theme/smoothly/star.png 
modified:   view/theme/smoothly/theme.php
 2012-09-13 11:41:14 +02:00
pixelroot 2b9c2b2d1d modified: view/theme/smoothly/style.css 2012-09-13 09:54:27 +02:00
pixelroot 931e1c6c66 modified: view/theme/smoothly/style.css 2012-09-13 09:48:02 +02:00
pixelroot 16e35d1787 new file: view/theme/smoothly/message_side.tpl 2012-09-13 09:35:12 +02:00
pixelroot 4ba7ce0308 modified: view/theme/smoothly/peoplefind.tpl 
modified:   view/theme/smoothly/style.css
 2012-09-13 09:34:50 +02:00
Zach Prezkuta e8acdb31bc add mobile toggle to frost mobile 2012-09-12 21:35:51 -06:00
pixelroot 864e2c03d9 modified: view/theme/smoothly/style.css 2012-09-12 17:25:44 +02:00
pixelroot e3d20b51c8 modified: view/theme/smoothly/style.css 2012-09-12 16:27:31 +02:00
pixelroot a3add1d851 modified: view/theme/smoothly/profile_vcard.tpl 
modified:   view/theme/smoothly/style.css
 2012-09-12 16:20:44 +02:00
tobiasd 250c615058 Merge pull request #466 from pixelroot/master 
Theme Smoothly
 2012-09-12 07:02:40 -07:00
pixelroot 77aee41280 modified: view/theme/smoothly/style.css 2012-09-12 15:49:18 +02:00
pixelroot a283d6844c modified: view/theme/smoothly/theme.php 2012-09-12 14:44:42 +02:00
pixelroot 207451d82d modified: view/theme/smoothly/style.css 2012-09-12 14:42:10 +02:00
friendica ec1abfda46 Merge https://github.com/friendica/friendica into pull 2012-09-11 18:57:40 -07:00
friendica a8d12061ca rev update + multiple profile photos 2012-09-11 18:56:38 -07:00
fermionic 984274659d Merge pull request #464 from pixelroot/master 
theme smoothly
 2012-09-11 07:27:19 -07:00
pixelroot 5ae445b1ff new file: view/theme/smoothly/generic_links_widget.tpl 
modified:   view/theme/smoothly/style.css
 2012-09-11 15:23:49 +02:00
pixelroot 4cc4404752 new file: view/theme/smoothly/arrow.png 
new file:   view/theme/smoothly/categories_widget.tpl
	modified:   view/theme/smoothly/style.css
 2012-09-11 14:02:36 +02:00
pixelroot 30a9db78f5 modified: view/theme/smoothly/style.css 2012-09-11 11:25:01 +02:00
pixelroot 5f7f1fb7b1 modified: view/theme/smoothly/nav.tpl 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	new file:   view/theme/smoothly/totop.png
 2012-09-11 11:06:55 +02:00
Tobias Diekershoff 36bd5286f2 DE: update to the strings 2012-09-11 09:19:11 +02:00
friendica fa65db9aa1 bring back comment edit buttons 2012-09-10 18:06:18 -07:00
friendica 4b7c6329e9 Merge pull request #462 from CyberDomovoy/threaded_items 
Threaded items, objects
 2012-09-10 16:19:13 -07:00
fermionic 9e9765a89f Merge pull request #463 from pixelroot/master 
Version 0.5
 2012-09-10 08:08:24 -07:00
pixelroot 9685ba3fbc modified: view/theme/smoothly/style.css 2012-09-10 16:31:36 +02:00
pixelroot ee20708f75 modified: view/theme/smoothly/style.css 2012-09-10 16:21:54 +02:00
pixelroot b5dee575a8 modified: style.css 2012-09-10 15:38:44 +02:00
pixelroot e51440ec98 modified: view/theme/smoothly/style.css 2012-09-10 15:19:43 +02:00
pixelroot 264f32db80 modified: view/theme/smoothly/style.css 2012-09-10 14:58:57 +02:00
pixelroot aef0824cc8 modified: view/theme/smoothly/style.css 2012-09-10 14:52:47 +02:00
pixelroot c059f92b5a modified: view/theme/smoothly/style.css 2012-09-10 14:36:51 +02:00
pixelroot 7603e2de75 deleted: view/theme/smoothly/comment_item.tpl 
deleted:    view/theme/smoothly/moderated_comment.tpl
	modified:   view/theme/smoothly/style.css
 2012-09-10 14:18:24 +02:00
pixelroot e492664325 new file: view/theme/smoothly/follow.tpl 
new file:   view/theme/smoothly/peoplefind.tpl
	modified:   view/theme/smoothly/style.css
 2012-09-10 12:30:34 +02:00
pixelroot f96b91c254 modified: view/theme/smoothly/style.css 2012-09-10 11:01:43 +02:00
Domovoy bb68461c6d Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	include/conversation.php
 2012-09-10 09:19:08 +02:00
friendica 0d9ffd07c2 remove mobile file 2012-09-10 00:15:01 -07:00
Tobias Diekershoff 656604a5ff DE: getting the strings back to 100% 2012-09-09 18:31:15 +02:00
Tobias Diekershoff 63ab82d3dd frost-mobile: was missing infront of the nav-images 2012-09-09 13:26:15 +02:00
fermionic 1088257aad Merge pull request #461 from pixelroot/master 
Version 0.4
 2012-09-08 07:33:26 -07:00
pixelroot a04d0e6832 deleted: view/theme/smoothly/mobile 2012-09-08 09:26:13 +02:00
pixelroot b6d310675b deleted: view/theme/smoothly/icons/dot.png 
deleted:    view/theme/smoothly/js/jquery.ae.image.resize.js
	deleted:    view/theme/smoothly/js/jquery.ae.image.resize.min.js
 2012-09-08 09:25:06 +02:00
pixelroot 393a91ea78 modified: view/theme/smoothly/comment_item.tpl 
new file:   view/theme/smoothly/dot.png
	new file:   view/theme/smoothly/moderated_comment.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	deleted:    view/theme/smoothly/icons/dot.png
	deleted:    view/theme/smoothly/js/jquery.ae.image.resize.js
	deleted:    view/theme/smoothly/js/jquery.ae.image.resize.min.js
 2012-09-08 09:24:37 +02:00
pixelroot 002168ebd9 new file: view/theme/smoothly/js/jquery.ae.image.resize.js 
new file:   view/theme/smoothly/js/jquery.ae.image.resize.min.js
	modified:   view/theme/smoothly/theme.php
 2012-09-08 08:54:18 +02:00
Zach Prezkuta 63d02d98c5 add settings sections and add contacts; other tweaks and fixes 2012-09-07 12:17:03 -06:00
pixelroot c616b05a33 modified: view/theme/smoothly/jot.tpl 
modified:   view/theme/smoothly/style.css
 2012-09-07 17:13:51 +02:00
pixelroot 9f7fbbdee3 modified: view/theme/smoothly/style.css 2012-09-07 16:32:20 +02:00
pixelroot 8685ca5a7f new file: view/theme/smoothly/mobile 2012-09-07 10:10:25 +02:00
pixelroot 1157b627af modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
	view/theme/smoothly/mobile
 2012-09-07 10:09:24 +02:00
Zach Prezkuta af3e36f665 mark all mobile themes 2012-09-06 17:30:24 -06:00
Zach Prezkuta 77529ccdf1 allow individual choice of mobile themes 2012-09-06 17:24:34 -06:00
fermionic 41439804f4 Merge pull request #456 from pixelroot/master 
New Theme "Smoothly"
 2012-09-06 11:08:48 -07:00
pixelroot 6a46717e1a modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/wallwall_thread.tpl
 2012-09-06 16:25:16 +02:00
pixelroot 6ac28c97f1 modified: view/theme/smoothly/jot.tpl 
modified:   view/theme/smoothly/style.css
 2012-09-06 15:50:02 +02:00
pixelroot a6f7ff686c modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/wallwall_thread.tpl
 2012-09-06 14:15:38 +02:00
pixelroot a888b59c42 modified: view/theme/smoothly/login.tpl 
modified:   view/theme/smoothly/style.css
 2012-09-06 13:25:13 +02:00
pixelroot 5c91ca9687 new file: view/theme/smoothly/icons/dot.png 
new file:   view/theme/smoothly/lang_selector.tpl
	modified:   view/theme/smoothly/login.tpl
	modified:   view/theme/smoothly/style.css
	new file:   view/theme/smoothly/wall_thread.tpl
	new file:   view/theme/smoothly/wallwall_thread.tpl
 2012-09-06 12:04:56 +02:00
pixelroot 0d9f6c89cc modified: view/theme/smoothly/comment_item.tpl 
modified:   view/theme/smoothly/contact_template.tpl
	modified:   view/theme/smoothly/jot-header.tpl
	modified:   view/theme/smoothly/jot.tpl
	modified:   view/theme/smoothly/login.tpl
	modified:   view/theme/smoothly/photo_top.tpl
	modified:   view/theme/smoothly/profile_entry.tpl
	modified:   view/theme/smoothly/profile_vcard.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	view/theme/smoothly/icons/
	view/theme/smoothly/lang_selector.tpl
	view/theme/smoothly/wall_thread.tpl
	view/theme/smoothly/wallwall_thread.tpl
 2012-09-06 11:17:17 +02:00
pixelroot 5e3076b5d2 view/theme/smoothly/icons/ 
view/theme/smoothly/lang_selector.tpl
	view/theme/smoothly/wall_thread.tpl
	view/theme/smoothly/wallwall_thread.tpl
 2012-09-06 09:44:15 +02:00
Zach Prezkuta c6f4404914 conversation.tpl doesnt appear to be necessary 2012-09-05 11:12:08 -06:00
Zach Prezkuta 0d45fec969 add threading files to make testbubble not broken with threading 2012-09-05 11:11:03 -06:00
pixelroot 92a9070e1e view/theme/smoothly/lang_selector.tpl 2012-09-05 16:04:29 +02:00
pixelroot e326e3e5d0 modified: view/theme/smoothly/style.css 2012-09-05 13:29:45 +02:00
pixelroot 89adfbeb80 deleted: view/theme/smoothly/back-gradient.jpg 
modified:   view/theme/smoothly/style.css
 2012-09-05 10:28:15 +02:00
pixelroot de9bcb5825 new file: view/theme/smoothly/login.tpl 2012-09-05 09:46:26 +02:00
pixelroot 2d37a18513 view/theme/smoothly/login.tpl 2012-09-05 09:42:52 +02:00
Zach Prezkuta 79012bf888 conversation needs preview parameter 2012-09-04 18:47:49 -06:00
pixelroot 05dda2f226 new file: view/theme/smoothly/back-gradient.jpg 
new file:   view/theme/smoothly/calendar.png
	new file:   view/theme/smoothly/comment_item.tpl
	new file:   view/theme/smoothly/connect.png
	new file:   view/theme/smoothly/contact_template.tpl
	new file:   view/theme/smoothly/conversation.tpl
	new file:   view/theme/smoothly/group_drop.tpl
	new file:   view/theme/smoothly/group_edit.tpl
	new file:   view/theme/smoothly/group_side.tpl
	new file:   view/theme/smoothly/groups.png
	new file:   view/theme/smoothly/icons.png
	new file:   view/theme/smoothly/icons.svg
	new file:   view/theme/smoothly/jot-header.tpl
	new file:   view/theme/smoothly/jot.tpl
	new file:   view/theme/smoothly/lock.cur
	new file:   view/theme/smoothly/login-bg.gif
	new file:   view/theme/smoothly/lrarrow.gif
	new file:   view/theme/smoothly/mail_head.tpl
	new file:   view/theme/smoothly/match.tpl
	new file:   view/theme/smoothly/menu-user-pin.jpg
	new file:   view/theme/smoothly/menu-user-pin.png
	new file:   view/theme/smoothly/nav-bg.png
	new file:   view/theme/smoothly/nav.tpl
	new file:   view/theme/smoothly/nets.tpl
	new file:   view/theme/smoothly/next.png
	new file:   view/theme/smoothly/notifications.png
	new file:   view/theme/smoothly/photo-menu.jpg
	new file:   view/theme/smoothly/photo_album.tpl
	new file:   view/theme/smoothly/photo_top.tpl
	new file:   view/theme/smoothly/photo_view.tpl
	new file:   view/theme/smoothly/photography.png
	new file:   view/theme/smoothly/premium.png
	new file:   view/theme/smoothly/prev.png
	new file:   view/theme/smoothly/profile_entry.tpl
	new file:   view/theme/smoothly/profile_vcard.tpl
	new file:   view/theme/smoothly/saved_searches_aside.tpl
	new file:   view/theme/smoothly/screenshot.jpg
	new file:   view/theme/smoothly/screenshot.png
	new file:   view/theme/smoothly/search.png
	new file:   view/theme/smoothly/search_item.tpl
	new file:   view/theme/smoothly/star.png
	new file:   view/theme/smoothly/style.css
	new file:   view/theme/smoothly/theme.php
	new file:   view/theme/smoothly/user.png
	new file:   view/theme/smoothly/wall_item.tpl
	new file:   view/theme/smoothly/wallwall_item.tpl
 2012-09-02 13:11:17 +02:00
pixelroot 0aebf15f03 deleted: view/theme/softy/back-gradient.jpg 
deleted:    view/theme/softy/calendar.png
	deleted:    view/theme/softy/comment_item.tpl
	deleted:    view/theme/softy/connect.png
	deleted:    view/theme/softy/contact_template.tpl
	deleted:    view/theme/softy/conversation.tpl
	deleted:    view/theme/softy/group_drop.tpl
	deleted:    view/theme/softy/group_edit.tpl
	deleted:    view/theme/softy/group_side.tpl
	deleted:    view/theme/softy/groups.png
	deleted:    view/theme/softy/icons.png
	deleted:    view/theme/softy/icons.svg
	deleted:    view/theme/softy/jot-header.tpl
	deleted:    view/theme/softy/jot.tpl
	deleted:    view/theme/softy/lock.cur
	deleted:    view/theme/softy/login-bg.gif
	deleted:    view/theme/softy/lrarrow.gif
	deleted:    view/theme/softy/mail_head.tpl
	deleted:    view/theme/softy/match.tpl
	deleted:    view/theme/softy/menu-user-pin.jpg
	deleted:    view/theme/softy/menu-user-pin.png
	deleted:    view/theme/softy/nav-bg.png
	deleted:    view/theme/softy/nav.tpl
	deleted:    view/theme/softy/nets.tpl
	deleted:    view/theme/softy/next.png
	deleted:    view/theme/softy/notifications.png
	deleted:    view/theme/softy/photo-menu.jpg
	deleted:    view/theme/softy/photo_album.tpl
	deleted:    view/theme/softy/photo_top.tpl
	deleted:    view/theme/softy/photo_view.tpl
	deleted:    view/theme/softy/photography.png
	deleted:    view/theme/softy/premium.png
	deleted:    view/theme/softy/prev.png
	deleted:    view/theme/softy/profile_entry.tpl
	deleted:    view/theme/softy/profile_vcard.tpl
	deleted:    view/theme/softy/saved_searches_aside.tpl
	deleted:    view/theme/softy/screenshot.jpg
	deleted:    view/theme/softy/screenshot.png
	deleted:    view/theme/softy/search.png
	deleted:    view/theme/softy/search_item.tpl
	deleted:    view/theme/softy/star.png
	deleted:    view/theme/softy/style.css
	deleted:    view/theme/softy/theme.php
	deleted:    view/theme/softy/user.png
	deleted:    view/theme/softy/wall_item.tpl
	deleted:    view/theme/softy/wallwall_item.tpl
	view/theme/smoothly/
 2012-09-02 13:09:16 +02:00
Tobias Diekershoff a287b34eb3 DE strings (pokes THX @zottel) 2012-09-02 11:59:44 +02:00
Fabrixxm 02037e345d quattro: fix attachments icons, fix wall-to-wall comments, style blockquote element, bigger text in textareas 2012-09-01 04:52:01 -04:00
friendica 2ace7d6646 Merge pull request #451 from fabrixxm/master 
fixes and tweaks
 2012-08-31 01:26:03 -07:00
Fabrixxm 51686cce01 quattro: remove 'experimental' 2012-08-31 03:32:10 -04:00
Fabrixxm ad45d9a78a quattro: fix live update 2012-08-31 03:31:33 -04:00
pixelroot 9346de5686 deleted: view/theme/softy/style.alex 
deleted:    view/theme/softy/style.alt
 2012-08-30 16:50:22 +02:00
pixelroot d96e3d95c1 new file: view/theme/softy/back-gradient.jpg 
new file:   view/theme/softy/calendar.png
	new file:   view/theme/softy/comment_item.tpl
	new file:   view/theme/softy/connect.png
	new file:   view/theme/softy/contact_template.tpl
	new file:   view/theme/softy/conversation.tpl
	new file:   view/theme/softy/group_drop.tpl
	new file:   view/theme/softy/group_edit.tpl
	new file:   view/theme/softy/group_side.tpl
	new file:   view/theme/softy/groups.png
	new file:   view/theme/softy/icons.png
	new file:   view/theme/softy/icons.svg
	new file:   view/theme/softy/jot-header.tpl
	new file:   view/theme/softy/jot.tpl
	new file:   view/theme/softy/lock.cur
	new file:   view/theme/softy/login-bg.gif
	new file:   view/theme/softy/lrarrow.gif
	new file:   view/theme/softy/mail_head.tpl
	new file:   view/theme/softy/match.tpl
	new file:   view/theme/softy/menu-user-pin.jpg
	new file:   view/theme/softy/menu-user-pin.png
	new file:   view/theme/softy/nav-bg.png
	new file:   view/theme/softy/nav.tpl
	new file:   view/theme/softy/nets.tpl
	new file:   view/theme/softy/next.png
	new file:   view/theme/softy/notifications.png
	new file:   view/theme/softy/photo-menu.jpg
	new file:   view/theme/softy/photo_album.tpl
	new file:   view/theme/softy/photo_top.tpl
	new file:   view/theme/softy/photo_view.tpl
	new file:   view/theme/softy/photography.png
	new file:   view/theme/softy/premium.png
	new file:   view/theme/softy/prev.png
	new file:   view/theme/softy/profile_entry.tpl
	new file:   view/theme/softy/profile_vcard.tpl
	new file:   view/theme/softy/saved_searches_aside.tpl
	new file:   view/theme/softy/screenshot.jpg
	new file:   view/theme/softy/screenshot.png
	new file:   view/theme/softy/search.png
	new file:   view/theme/softy/search_item.tpl
	new file:   view/theme/softy/star.png
	new file:   view/theme/softy/style.alex
	new file:   view/theme/softy/style.alt
	new file:   view/theme/softy/style.css
	new file:   view/theme/softy/theme.php
	new file:   view/theme/softy/user.png
	new file:   view/theme/softy/wall_item.tpl
	new file:   view/theme/softy/wallwall_item.tpl
 2012-08-30 16:42:50 +02:00
Domovoy ef52ff6b01 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-30 07:47:21 +02:00
Zach Prezkuta 2ef1081c68 make the show more line look nicer 2012-08-28 20:19:47 -06:00
fermionic 9ae5ae6df5 Merge pull request #448 from fermionic/limit-items-on-all-pages 
limit number of items on profile page too
 2012-08-28 19:03:15 -07:00
fermionic 8c064069d9 Merge pull request #443 from fermionic/new-users-privacy-settings 
automatically make posts private for new users
 2012-08-28 19:02:51 -07:00
Tobias Diekershoff c2b4dc2e60 DE: some translations 2012-08-28 18:14:57 +02:00
Tobias Diekershoff d9ffb0578c quattro: display date info as "ago" with mouse over date stamp 2012-08-27 19:47:04 +02:00
Tobias Diekershoff cf91a7f79a quattro: mail_display has no ago information so don't display it 2012-08-27 19:39:31 +02:00
Tobias Diekershoff 036d5db0c0 quattro: use "ago" for date information and on mouse the date stamp 2012-08-27 19:32:23 +02:00
Tobias Diekershoff 37a0504f96 quattro: expanded the new prvmessage field a bit 2012-08-27 08:13:07 +02:00
Zach Prezkuta c681e69794 limit number of items on profile page too; add show more back to Frost mobile; some show more fixes 2012-08-26 15:21:26 -06:00
Zach Prezkuta a77081f659 remove show more/less from frost mobile--it is too great a load 2012-08-26 09:31:37 -06:00
Zach Prezkuta 0fe1727d74 remove show more/less animation on mobile 2012-08-26 09:22:49 -06:00
Zach Prezkuta 7c9c92e542 update version 2012-08-25 22:43:32 -06:00
Zach Prezkuta 193cc2c537 try to get rid of scrollbars in Frost 2012-08-25 22:42:12 -06:00
Zach Prezkuta f062ccbb66 add documentation; add to admin panel; some tweaks and interface stuff 2012-08-25 15:03:16 -06:00
fermionic 5cb618bcf1 Merge pull request #444 from fermionic/frost-notifications-sometimes-dont-show 
restore nav element to login pages, since system messages are sent in it
 2012-08-25 09:10:01 -07:00
Zach Prezkuta 3413cc1006 restore nav element to login pages, since system messages are sent in it 2012-08-25 10:08:25 -06:00
Zach Prezkuta 54d4fc73c4 fix image and file upload on frost moble; add support to frost for local post time 2012-08-24 21:25:39 -06:00
Domovoy 5dd3e8a990 One click comments on threaded items. 
comment-wwedit-wrapper and wall-item-outside-wrapper get the additional class "threaded" when applicable.
 2012-08-23 13:09:35 +02:00
Domovoy 3e5c711a72 Sync objects with upstream 2012-08-23 10:54:21 +02:00
friendica 386b6d081b moods 2012-08-22 21:36:55 -07:00
friendica 4f72e656ca Merge https://github.com/friendica/friendica into pull 2012-08-21 19:42:37 -07:00
friendica ff0e0782a5 restore old comment behaviour when threading turned off 2012-08-21 19:41:50 -07:00
Tobias Diekershoff 07a27d217c DE more updates to the strings 2012-08-21 08:23:47 +02:00
Tobias Diekershoff d470496ead Quattro: added localtime timestamp title to entries 2012-08-20 11:20:49 +02:00
Tobias Diekershoff 96e6be3c19 DE strings update 2012-08-20 11:12:40 +02:00
friendica bcec1bddc0 put the real post time into the post 2012-08-19 14:39:43 -07:00
Zach Prezkuta b4a4ccfb2b include login style when necessary 2012-08-18 14:47:59 -06:00
Zach Prezkuta 045f98cddd another javascript 2012-08-16 21:51:36 -06:00
Thomas Willingham ee998864e6 Make Vier threaded comments not broken. 
These should be inherited from Quattro really, but aren't.
 2012-08-16 18:21:33 +01:00
Zach Prezkuta 3531704d08 admin page selector for mobile theme 2012-08-15 08:54:30 -06:00
Tobias Diekershoff a09c200799 add selector for mobile theme to admin panel 2012-08-15 10:16:42 +02:00
Tobias Diekershoff 52908d5e80 lets mark mobile themes similar to experimental ones 2012-08-15 10:15:21 +02:00
Zach Prezkuta 77626cca74 missed something again 2012-08-14 19:54:22 -06:00
Zach Prezkuta 45b21c1d20 basic updates for Dispy and Diabook to try to make them at least not broken with threading updates 2012-08-14 19:42:07 -06:00
Tobias Diekershoff a763a064ff DE some updates to the translation 2012-08-14 12:37:32 +02:00
fermionic 8d89a915fc Merge pull request #434 from fermionic/frost-update-for-threaded-comments 
sigh I always miss something when copying over
 2012-08-11 19:53:08 -07:00
Zach Prezkuta 91aacdbb3d sigh I always miss something when copying over 2012-08-11 20:51:51 -06:00
friendica 6348634a1b Merge https://github.com/friendica/friendica into pull 
Conflicts:
	view/wall_thread.tpl
 2012-08-11 15:42:48 -07:00
friendica 1cd23860cb rev update 2012-08-11 15:39:45 -07:00
Zach Prezkuta 5890e3fa3a update frost mobile TODO 2012-08-11 14:43:13 -06:00
Zach Prezkuta 5e09fc31f5 Threading updates 
- Add rudimentary thread handling to Frost
- Fix possible CSS bug in several themes from threading update
- Add ability for themes to prevent threading
 2012-08-11 14:36:58 -06:00
friendica 20be1778db bring likes back - comment ordering is still a bit funky 2012-08-10 16:36:44 -07:00
Zach Prezkuta bcf214debb readability in TODO 2012-08-10 08:37:31 -06:00
Zach Prezkuta d9279da369 - Frost Mobile: redo CSS to adjust automatically to the screen width 
- Frost Mobile: various tweaks and fixes
- Allow themes to limit number of items on the Network page
 2012-08-10 08:34:00 -06:00
Fabrixxm ec3d8a80cd quattro: fix collapsed thread, fix comment box, style previev comment, add 'expand / collapse" thread 2012-08-10 06:27:01 -04:00
Fabrixxm 0f15c117ee quattro: move comment box for top-level item at the end of comments list 2012-08-10 04:53:39 -04:00
Fabrixxm c4bff3d393 quattro: add comment tools icons, fix hide/show comment tools 2012-08-10 04:29:22 -04:00
Fabrixxm 64a6e8693c quattro: remove unused parameter 'comment' from function cmtBbClose 2012-08-10 04:27:50 -04:00
Fabrixxm 2b7d08508d head.tpl: commentOpen() and commentClose() return true/false 
usefull to concatenate other actions: "commentClose(this, $id) && cmtBbClose($id)"
 2012-08-10 04:25:08 -04:00
Domovoy 9c920fd7b9 Merge pull request #5 from fabrixxm/threaded_items 
Threaded items support for Quattro theme
 2012-08-09 02:14:22 -07:00
Domovoy afaa5f2038 Removed useless comment box (from old non-threaded template, to comment box where displayed) 2012-08-07 12:13:42 +02:00
Domovoy 5ca71d04b2 Wall to wall items should now be threaded too. 2012-08-07 12:08:36 +02:00
Domovoy c0024daff7 Added view/wallwall_thread.tpl 2012-08-07 12:02:06 +02:00
Domovoy f3b1391501 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-07 09:40:21 +02:00
friendica 3032d663f6 Merge pull request #427 from fermionic/frost-embedded-videos 
allow themes to change the size of embedded videos
 2012-08-06 15:58:17 -07:00
Simon L'nu 7ceb213859 add a 'manage' icon to clarify things 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-08-06 17:05:25 -04:00
Simon L'nu 76e1e07571 Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  rev update
  Frost-mobile: media query in css for tablets
  expire issue
  rev update
 2012-08-06 13:18:00 -04:00
Zach Prezkuta d8a13d6e8d allow themes to change the size of embedded videos 2012-08-06 09:59:57 -06:00
Fabrixxm 4062312e9c quattro: collaps threaded items 2012-08-06 04:48:24 -04:00
Fabrixxm fd7ea5cc91 quattro: support threaded comments 2012-08-05 16:55:20 -04:00
Christian Vogeley e6067e6694 Frost-mobile: media query in css for tablets 
Use space more efficiently on tablets in frost-mobile theme. Tested with
iPad 1.
 2012-08-05 16:08:07 +02:00
Domovoy e247915f48 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	include/conversation.php
 2012-08-05 13:43:53 +02:00
Simon L'nu 3d0fc813dc Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  missed an instance of $mobileapp in switch to generic app label
  ImageMagick rotates CW while imagerotate() rotates CCW
  update main frost version
  update version and todo
  -- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter) -- More HTML cleanup in TPL files -- Various Frost bug fixes and tweaks
  put back notags
  fix angle char storage and transmission, rev update
  Darkzero/NS .contact-photo-menu
  rev update
 2012-08-04 23:41:51 -04:00
Zach Prezkuta ed9811762d missed an instance of $mobileapp in switch to generic app label 2012-08-04 21:05:25 -06:00
Zach Prezkuta 1f8182a453 update main frost version 2012-08-04 14:05:56 -06:00
Zach Prezkuta 849720f160 update version and todo 2012-08-04 14:04:18 -06:00
Zach Prezkuta 63628910b2 -- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter) 
-- More HTML cleanup in TPL files
-- Various Frost bug fixes and tweaks
 2012-08-04 14:02:39 -06:00
Domovoy 8742beb772 Flatten children when threads are disabled 2012-08-03 22:28:21 +02:00
Domovoy 75700a725e Comment box is inside the item 2012-08-03 19:18:56 +02:00
Domovoy 66848b0471 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	update.php
 2012-08-03 18:57:37 +02:00
Thomas Willingham 208019ea9c Darkzero/NS .contact-photo-menu 2012-08-03 03:07:29 +01:00
Simon L'nu 9433d229ed Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  parse_url: Fixed a problem in the detection if there was an image or not. Additionally removed some test content.
  rev update
  Changed markdown to enable diaspora postings with images that contain links
  bbcode: two new bbcode elements (style, class) for CSS
  Moving the index creation commands into a readme file due to the fact that creating of these indexes is really slow.
  network: Caching of images
  scale_external_images: Fix: Hadn't looked for pictures in the format [img=XxY]
  Further performance improvements
  Speed improvements in the database
 2012-08-02 12:46:36 -04:00
Michael Vogel b904a21134 Merge remote branch 'upstream/master' 2012-08-02 10:27:11 +02:00
Simon L'nu 31eff37693 Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  ugly fix to make editplain work
  quattro: readd sparkle cursor
  quattro: style for "show more" addon
  tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat.
  logic was reversed - should work now
  fix almost all errant divs in view/ and frost folders
  Provide backend ability to poke as a comment rather than top-level post
  rev update
 2012-08-01 22:59:54 -04:00
Zach Prezkuta 3e8e1ab830 ugly fix to make editplain work 2012-08-01 19:09:28 -06:00
Michael Vogel 04c31d194f Merge remote branch 'upstream/master' 
Conflicts:
	update.php
 2012-08-02 00:21:14 +02:00
Michael Vogel bed99674d2 bbcode: two new bbcode elements (style, class) for CSS 2012-08-02 00:13:37 +02:00
Fabrixxm fde3edaa21 quattro: readd sparkle cursor 2012-08-01 04:45:27 -04:00
Fabrixxm bf04fb450a quattro: style for "show more" addon 2012-08-01 04:41:21 -04:00
friendica 14282a40bb Merge pull request #419 from fermionic/more-div-problems 
fix almost all errant divs in view/ and frost folders
 2012-07-31 21:58:08 -07:00
Zach Prezkuta fc22c356ff fix almost all errant divs in view/ and frost folders 2012-07-31 22:43:18 -06:00
friendica 764ee653ba Provide backend ability to poke as a comment rather than top-level post 2012-07-31 20:59:51 -07:00
Simon L'nu 0e7f6d1417 Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  fix /display bug; oembed audio bug; other tweaks
  Frost: reduce DOM elements by about 20%; other tweaks and fixes
  rev update
  errant div in events_reminder.tpl
  pass deleted flag to display
  rev update
  fix filer bug; some interface tweaks
  Update view/theme/frost/nav.tpl
  Update view/theme/frost-mobile/nav.tpl
  don't show birthday/event details on mobile devices
  rev update
  remove server-specific change
  update version of frost and frost-mobile
  Modify Javascript to improve page loading times
  rev update
  Friendicaland got bigger.
 2012-07-31 23:16:56 -04:00
Zach Prezkuta 885bb50f0d fix /display bug; oembed audio bug; other tweaks 2012-07-31 18:53:18 -06:00
Zach Prezkuta b522ffeea5 Frost: reduce DOM elements by about 20%; other tweaks and fixes 2012-07-31 08:00:50 -06:00
Zach Prezkuta 72df6ff664 errant div in events_reminder.tpl 2012-07-30 07:59:08 -06:00
Domovoy 07f87848b4 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-30 13:36:33 +02:00
Zach Prezkuta 067865db9e fix filer bug; some interface tweaks 2012-07-29 14:49:12 -06:00
Domovoy 30d7db5e42 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-29 22:43:49 +02:00
fermionic 4f13618b18 Merge pull request #414 from 23n/patch-1 
Update view/theme/frost-mobile/nav.tpl
 2012-07-29 12:36:22 -07:00
Domovoy 2fc0fcdc18 Unlimited level threading is now a site option. 2012-07-29 19:53:04 +02:00
Domovoy 25015d3ab9 Update now handles threaded items. 2012-07-29 18:39:38 +02:00
Domovoy 8ea3087342 Collapsing is back for threaded comments. 
Comment box is displayed at the end of the thread.
Comments on comments are all collapsed
 2012-07-29 17:13:21 +02:00
23n 5b5e4b6cb7 Update view/theme/frost/nav.tpl 
moved identity/page management-link to system-menu
 2012-07-29 15:28:59 +03:00
23n 0f1b33a278 Update view/theme/frost-mobile/nav.tpl 
move identity management link to menu
 2012-07-29 15:07:52 +03:00
Domovoy 10eb873f7c Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-29 10:03:17 +02:00
Zach Prezkuta 38d4df77c6 remove server-specific change 2012-07-28 10:14:28 -06:00
Zach Prezkuta 231b37217b update version of frost and frost-mobile 2012-07-28 10:03:56 -06:00
Zach Prezkuta 1f09e7ad23 Modify Javascript to improve page loading times 
1. Add template category 'end' that places content right before final </body> tag
	2. Move most Javascript from tpl files into one cacheable file, theme.js
	3. Load scripts at end of the HTML document instead of in the header
	4. Minify several Javascript files

Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.
 2012-07-28 09:57:16 -06:00
Domovoy eaf0d04bfb Comment box is now inside the item. Makes it easier to know what we are commenting on. 2012-07-27 22:58:51 +02:00
Domovoy d558d25540 CommentBox is now hidden by default, this can be toggled with a fake link 2012-07-27 22:47:18 +02:00
Domovoy 8ecf8167db Threaded comments are starting to work. 
For now, only on normal view, and not during update
 2012-07-27 22:08:57 +02:00
Simon L'nu c5603cf756 fixed head.tpl before the last pull. hadn't pushed and merged with upstream yet. 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-07-25 22:35:50 -04:00
Simon L'nu 794ae669ce fixes to cursor 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-07-25 22:28:09 -04:00
Fabrixxm 727c93cb8c quattro: add id to items container div 
needed to make commit 4c6a4321 work
 2012-07-25 08:12:21 -04:00
Zach Prezkuta 2e080f594e update head.tpl for dispy 2012-07-24 18:29:23 -06:00
friendica 57a75d240b Merge pull request #406 from fermionic/frost-theme 
Introducing Frost
 2012-07-24 15:28:16 -07:00
Zach Prezkuta 9378bc1375 disable tos and privacy links 2012-07-24 09:27:27 -06:00
Zach Prezkuta 178329b6dc disable tos and privacy links 2012-07-24 09:26:12 -06:00
Zach Prezkuta f9809102a2 Introducing Frost Mobile 2012-07-24 09:16:51 -06:00
Zach Prezkuta 8126e8ea47 Introducing Frost 2012-07-24 09:15:57 -06:00
friendica aa5e60248a Merge pull request #405 from fermionic/support-for-mobile-themes 
changes to support a mobile theme
 2012-07-23 20:18:23 -07:00
Zach Prezkuta 5cb979f5e4 changes to support a mobile theme 2012-07-23 20:37:00 -06:00
friendica b20a80bf39 rev update 2012-07-23 15:27:25 -07:00
friendica 0ff93edeee poke privacy 2012-07-20 04:03:32 -07:00
friendica d1243c9ad7 allow to prefill - url/poke?f=&c=nn - nn is contact id 2012-07-19 20:54:23 -07:00
friendica a54278649f poke notifications 2012-07-19 20:13:40 -07:00
friendica b78bd8cc94 duplicate input names 2012-07-19 19:48:33 -07:00
friendica d442bbc482 have fun... 2012-07-19 18:17:16 -07:00
Martin Schmitt eae6e665c0 Esperanto -> 100% 2012-07-16 22:33:23 +02:00
Simon L'nu 021f0829e6 re-add the sparkle stuff 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-07-15 12:03:53 -04:00
friendica 15cae001d9 move plink sparkles to the right html element in dispy 2012-07-13 04:22:42 -07:00
Simon L'nu 10ce535cac add doctitle thingy, and update cursor 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-07-13 04:35:16 -04:00
Simon L'nu d08a97bb9f add some sparkle ;) 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-07-13 02:37:45 -04:00
Thomas Willingham bd08a6b565 Add sparkle cursor to Quattro/Vier/TestBubble 2012-07-12 19:21:21 +01:00
friendica 085b589468 add some sparkle to plinks 2012-07-11 21:04:08 -07:00
tomtom84 f475850739 diabook: add notification in website-title, whenever new notifications arrive 2012-07-08 21:50:17 +02:00
Vasudev Kamath ba4db236ec Merge branch 'master' of git://github.com/friendica/friendica 2012-07-06 22:47:27 +05:30
friendica 8b19168999 a bit more colour 2012-07-05 22:20:27 -07:00
friendica f40b056e3b some initial code and benchmarking for "red" content rendering engine 2012-07-04 20:37:15 -07:00
friendica fd626022ec add smarty engine, remove some obsolete zot1 stuff 2012-07-03 22:23:08 -07:00
Thomas Willingham badaa68340 Diabook directory wide variants. 2012-07-04 01:08:50 +01:00
Zvi ben Yaakov (a.k.a rdc) 424797138f Limiting .directory-photo-wrapper styles to <section> so as not to 
interfere with .directory-photo-wrapper in <aside>
 2012-07-03 21:49:02 +03:00
friendica f7144e671c fix diabook directory pages (only the normal style - any volunteers for the wide?) 2012-07-02 16:56:37 -07:00
Thomas Willingham 74a819980f Various theme stuff. 
Profile group list for testbubble
Screenshot for facepark
Various niggles in darkzero/NS
 2012-07-02 03:40:12 +01:00
friendica 696d78d658 Merge pull request #369 from rdc/master 
Added more profile data and CSS styling to the /directory page
 2012-07-01 16:44:21 -07:00
Martin Schmitt 85c078f862 Esperanto -> 100% 2012-07-01 19:13:24 +02:00
Zvi ben Yaakov (a.k.a rdc) 2214cd74e5 Added more profile data and CSS styling to the /directory page 2012-07-01 14:46:03 +03:00
friendica 31718968c6 advanced profile theming 2012-06-30 01:29:29 -07:00
Fabrixxm a03e6b96ea quattro: fix Forum widget, hide edit profile link 2012-06-29 05:47:53 -04:00
Fabrixxm 8b18ee49ff quattro: some updates 
- add makefile to rebuild both css with single command
- fix icons in Forums widget
- style photos pages
 2012-06-29 05:29:58 -04:00
friendica be658788de maintain page position when hovering on pop-outs 2012-06-28 22:19:12 -07:00