Commit graph

493 commits

Author SHA1 Message Date
Hypolite Petovan
479180ca8e Merge branch 'develop' into issue/#3062 2017-01-08 11:44:45 +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
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
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
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
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
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
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
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
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
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
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
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
Michael Vogel
196eb6009f The XMPP address is now in the profile and will be transmitted 2016-09-25 15:28:00 +00:00
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
rabuzarus
37ae63e120 fix contact dropping on contact edit page also for other themes 2016-08-17 16:51:04 +02:00
rabuzarus
768d10536f frio: templates for contact_edit and crepair 2016-07-26 09:09:40 +02:00
Ben Roberts
864cf0f70d update MF2 and vcard data for issue #2629 2016-06-21 10:23:43 -04: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
c99da380cf frio: events - adapt changes to the templates of the other themes 2016-06-17 10:33:12 +02:00
rabuzarus
3a9a9e6a1c frio + core: some restructure in profiles.php + frio template for profiles settings 2016-06-10 11:24:38 +02:00
Michael Vogel
e2e32eecac New template for shared content instead of hardcoded stuff in source 2016-06-07 22:29:50 +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
6944d67dbc photos view: fix js error with undefined variable 2016-05-13 01:26:07 +02:00
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
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
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
rabuzarus
0056403b15
fix: contact edit poll_interval wasn't submitted 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
cc7d1d453b
rework autocomplete: seperate bbcode completion 2016-05-01 13:47:24 +02:00
rabuzarus
2bd60075ae
rework autocomplete: some styling if contact is forum 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
52896d64c2
rework autocomplete: css work 2016-05-01 13:45:38 +02:00
rabuzarus
9943d4a60a vier-mobile: expand embedded video on play 2016-04-25 22:12:53 +02:00
Michael Vogel
1f4f60a82d Merge pull request #2480 from rabuzarus/2504_vier_mobile_fix
vier mobile fixes
2016-04-25 21:41:43 +02:00
rabuzarus
4daa9a50f5 vier-mobile: little css fix 2016-04-25 20:30:02 +02:00
rabuzarus
fa66fa9b28 vier-mobile: fix embedded video for tablets and bigger 2016-04-25 20:24:36 +02:00
rabuzarus
7b48ef23d5 vier-mobile: fix embedded video and embedded link images for tablets and bigger 2016-04-25 20:04:10 +02:00
rabuzarus
c553ab9b46 vier-mobile: fix threaded view for tablets and bigger 2016-04-25 19:54:03 +02:00
Michael Vogel
0c5f315294 Vier: No visible login border/no search and events without login 2016-04-24 21:45:06 +02:00
rabuzarus
7ee9c536ee fix: contact edit poll_interval wasn't submitted 2016-04-20 15:37:34 +02:00
rabuzarus
9190380dec rework autocompletion: Update mobile.css 2016-04-17 22:27:49 +02:00
rabuzarus
84238e1b89 vier: colorbox fix (img max-width: 100%) 2016-04-17 15:34:15 +02:00
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
fabrixxm
d30d13959b Merge pull request #2328 from rabuzarus/0602_contact_profile
polishing of the contact-edit page
2016-03-06 19:56:59 +01:00
Michael Vogel
996cd8c24e The Font Awesome library is now updated, the replxy button is changed 2016-03-05 13:29:01 +01:00
04a7d6384e
No need to set $a->theme_info = array() everywhere if you can define it in App
itself.

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 14:27:38 +01:00
rabuzarus
0db83b9586 contactedit-actions-button: move repair back to tabbar 2016-02-23 19:19:45 +01:00
Michael Vogel
7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +01:00
Michael Vogel
c5b724828a Just some more removed baseurls ... 2016-02-17 08:08:28 +01:00
Michael Vogel
f7537c9e90 Remove the baseurl where possible to avoid mixed content 2016-02-17 00:01:24 +01:00
Michael Vogel
307f90cdfe Vier: Pictures in the side bar shouldn't be larger than the side bar 2016-02-13 14:21:53 +01:00
rabuzarus
2e04a00d30 contactedit-actions-button: some adjustment for vier dark scheme 2016-02-08 23:25:48 +01:00
rabuzarus
0c764684bb Merge develop into 0602_contact_profile 2016-02-08 23:16:02 +01:00
rabuzarus
0b5d7b300e contactedit-actions-button: adjust the themes and template polishing 2016-02-08 23:15:20 +01:00
fabrixxm
d6cf791677 Merge pull request #2324 from rabuzarus/0502_vier_dark
vier: some consistency fixes for the dark scheme
2016-02-07 09:53:24 +01:00
fabrixxm
ecfb6ec924 Merge pull request #2313 from rabuzarus/0302_forum_class
forums.php is now ForumManager.php and providing class ForumManager
2016-02-07 09:28:50 +01:00
rabuzarus
95819684c2 Merge develop into 0502_vier_dark
Conflicts:
	view/theme/vier/dark.css
2016-02-06 13:09:41 +01:00
rabuzarus
0bccfea596 vier: some consistency fixes for the dark scheme 2016-02-06 00:54:50 +01:00
rabuzarus
bcf1020635 vier smileybutton: dark.css insert new line at the end of the file 2016-02-05 21:38:55 +01:00
rabuzarus
9fd3d8116b vier smileybutton: little polish in dark.css 2016-02-05 21:30:31 +01:00
rabuzarus
41405ed0f2 vier: display smiley-preview as inline-block - needs addons update 2016-02-05 21:24:01 +01:00
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
437784b7bb Merge pull request #2318 from annando/1602-vier-font
Vier: The font "system" can make the system look ugly
2016-02-05 06:56:26 +01:00
Michael Vogel
b85369a03b Vier: The font "system" can make the system look ugly 2016-02-04 18:58:33 +01:00
rabuzarus
a75be65860 vier: little float fix 2016-02-04 16:45:39 +01:00
rabuzarus
12c6ba9081 vier: remove some hardcoded css to be more mobile friendly 2016-02-04 16:21:40 +01:00
rabuzarus
52dbb0b4a2 Forum class - rename Class CamelCase and rename some methods 2016-02-04 14:51:54 +01:00
rabuzarus
9a54afa629 Forum class - rename Class CamelCase and rename some methods 2016-02-04 14:47:20 +01:00
rabuzarus
c1070e4655 forums.php is now forum.php and providing class forum 2016-02-03 18:05:26 +01:00
Fabrixxm
f21e3e46c7 Vier mobile: better jot buttons on small screens 2016-02-03 15:01:24 +01:00
Fabrixxm
1ddae21cff Vier mobile: fix content width, events style, oembed 2016-02-03 14:48:46 +01:00
Fabrixxm
3c6ebfa5a9 Vier - mobile friendly ACL window and form fields 2016-02-03 14:03:00 +01:00
rabuzarus
58c1f9a60f vier: use object-fit: cover for recent photos view 2016-02-03 03:59:42 +01:00
rabuzarus
ad5be2901e rework autocomplete: some styling if contact is forum 2016-02-03 00:25:33 +01:00
rabuzarus
162f754e2d Merge develop into 1901_autocomplete 2016-01-30 16:57:54 +01:00
rabuzarus
8e0f04026c vier: some fixes for mobile view 2016-01-30 01:53:21 +01:00
rabuzarus
d0ade828c0 rework autocomplete: some cleanup and docu 2016-01-24 19:56:23 +01:00
rabuzarus
e3475bd587 rework autocomplete: css work 2016-01-21 13:28:29 +01:00
Michael Vogel
6c7cf2a766 Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-18 00:53:18 +01:00
rabuzarus
f428635682 vier: add missing forumlist_profile 2016-01-17 15:54:58 +01:00
Michael Vogel
90a8d6f0f5 Several performance improvements 2016-01-15 23:27:25 +01:00
rabuzarus
556f76de01 vier: mobile view - fix word breaking 2016-01-13 19:56:21 +01:00
fabrixxm
fcf7a791f1 Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget"
This reverts commit 83e54f70d3, reversing
changes made to ecf576bdd0.
2016-01-04 11:46:19 +01:00
fabrixxm
83e54f70d3 Merge pull request #2223 from rabuzarus/2912_photo_widget
photo aside widget for profile page
2016-01-04 10:06:07 +01:00
fabrixxm
907d20940a Merge pull request #2221 from rabuzarus/2812_vier_mobile_icons
vier: make TopNavBar mobile friendly
2015-12-31 09:38:27 +01:00
rabuzarus
89c0a8f8a8 vier: remove double available accesskeys 2015-12-30 00:48:11 +01:00
rabuzarus
20fbf670db photo aside widget for profile page 2015-12-30 00:26:50 +01:00
Michael Vogel
b41ab85feb Merge pull request #2220 from rabuzarus/2812_notify_menu
vier: some visual work on the notification menu
2015-12-29 14:31:41 +01:00
rabuzarus
871fb609d4 vier: add missing clear divs to right aside 2015-12-29 02:01:17 +01:00