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

5136 Commits

Author SHA1 Message Date
Hypolite Petovan 6fe64a5ac6 Fix references to text_highlighter css 2018-01-16 23:48:07 -05:00
Hypolite Petovan e36f2bb1fb Use short form array syntax everywhere 
- Add short form array syntax to po2php.php generation
 2018-01-15 14:07:17 -05:00
Adam Magness 6cf6029ff5 Rename functions and calls 
Rename functions and update calls
 2018-01-15 09:50:06 -05:00
Adam Magness 2ef8d72b60 Missing use 
missing use statement for profile
 2018-01-14 21:29:19 -05:00
Adam Magness 4fb2547df8 Update function calls 
update function calls to use profile class
 2018-01-14 21:22:39 -05:00
fabrixxm 5392f9eb8b spaces to tabs 2018-01-14 21:53:37 +01:00
fabrixxm de227e305e Frio: add input for login backround image in admin settings 2018-01-14 19:19:24 +01:00
fabrixxm 1064da1052 New home/login page style 2018-01-14 18:45:00 +01:00
hoergen 1f8b9b68e5 Changes on popup menus 2018-01-12 08:05:51 +01:00
Hypolite Petovan 2f2ded4e55 [frio] Set videowidth to 622px 2018-01-10 19:25:08 -05:00
rabuzarus eb031e7ee2 rename the "save" button to 'follow' when searching for tags 2018-01-10 16:08:39 +01:00
Hypolite Petovan c157e7ffa4 Improve connectors settings display 
- Move settings templates to subfolder
- Add accordion display to "General Theme Settings" in frio
- Replace hand-written template with form field includes
- Simplify sprintf(t()) structures
 2018-01-05 02:17:36 -05:00
Michael Vogel c938623a3d
Merge pull request #4167 from MrPetovan/bug/4155-remove-proxy-oembed 
Add settings for OEmbed
 2018-01-04 20:57:27 +01:00
Tobias Diekershoff 04589ecd38
Merge pull request #4092 from MrPetovan/task/3954-move-auth-to-src 
Move auth to src
 2018-01-04 18:06:42 +01:00
Hypolite Petovan 50e04d87c2 Add no_oembed_rich_content and allowed_oembed admin settings 2018-01-04 11:58:32 -05:00
Michael 0b5f7da270 forgotten templates 2018-01-04 14:04:08 +00:00
Michael f66f631079 We now have a single menu item again 2018-01-04 14:02:04 +00:00
Michael 3e8bde5730 Removed now unused JS 2018-01-04 13:08:38 +00:00
Michael 3ffea2cd2c We now have a global page for all global entries from the network. 2018-01-03 13:27:43 +00:00
Hypolite Petovan 9a3e773a9a Merge branch 'develop' into task/3954-move-auth-to-src 2018-01-02 19:30:41 -05:00
rabuzarus ebb60ddd58 bugfix: -frio- save search button should be only visible if the feature is enabled 2018-01-02 15:48:11 +01:00
Hypolite Petovan 66dbef93e3 Fix formatting and PHP notices in bb_ShareAttributes 
- Use x() to check for existence of key in $matches
- Remove unused $reldate from template shared_content
 2018-01-02 08:09:49 -05:00
Hypolite Petovan 54d598ce7c Fix formatting and PHP Notice in frio theme 
- Fix undefined variable $a->install in frio/style
- Removed unused $args assignments in frio/theme
- Removed unused $sql_extra2 variable in frio_acl_lookup()
 2018-01-02 08:09:49 -05:00
Hypolite Petovan 190a765731 Fix Notice and formatting in frio 2017-12-29 21:55:13 -05:00
Michael 2b50f001b9 Added statistics 2017-12-19 07:39:21 +00:00
rabuzarus 0787f093d6 frio: remove shome whitespace 2017-12-15 18:16:07 +01:00
rabuzarus 85f558d8fb frio: fix some contact list issues 2017-12-15 18:09:04 +01:00
Tobias Diekershoff 1c9d137c28 update for FR translation - thx Thecross! 2017-12-13 12:01:11 +01:00
hoergen 95309fe5c4 Adjustments events view in timeline/wall 2017-12-11 00:16:23 +01:00
hoergen 6baf7b4da2 removed avatar and name from month/week and fixed time display 2017-12-11 00:03:59 +01:00
hoergen f4fdf61f44 Mostly calendar adjustments 2017-12-10 14:18:24 +01:00
Tobias Diekershoff 9d9840592f update for FR translation - thx Thecross! 2017-12-10 08:42:49 +01:00
Tobias Diekershoff 274b83c9a9 update for FR - thx Thecross! 2017-12-09 19:54:56 +01:00
hoergen 6bf75a2f31 added more styles for setting page and fixed input pointer 2017-12-09 04:03:18 +01:00
Tobias Diekershoff 6d48f5578d EN US and GB translation updates 2017-12-08 09:42:24 +01:00
Hypolite Petovan bc58e8d3be Rename Model\GlobalContact to Model\GContact 2017-12-07 23:57:56 -05:00
Hypolite Petovan 3fc3e67b70 Separate Object\Photo into Model\Photo and Object\Image 
- Renamed a bunch of functions to shorter or clearer names
 2017-12-07 23:54:51 -05:00
Michael Vogel 5747cfc79c
Revert "Move Objects to Model" 2017-12-08 05:21:51 +01:00
Michael Vogel e437c74d0e
Merge pull request #4031 from MrPetovan/task/3878-move-objects-to-model 
Move Objects to Model
 2017-12-08 05:02:21 +01:00
hoergen 0e2355039f Style buttons, lists, inputs and some cleanup 2017-12-08 02:16:50 +01:00
Adam Magness 48367220b8 Templete adjustment 
based on errors that were showing up in the debugger console on chrome
 2017-12-07 09:35:24 -05:00
Hypolite Petovan cd84bf8963 Rename Model\GlobalContact to Model\GContact 2017-12-07 09:09:28 -05:00
Hypolite Petovan 52bddd580c Separate Object\Photo into Model\Photo and Object\Image 
- Renamed a bunch of functions to shorter or clearer names
 2017-12-07 08:56:11 -05:00
Michael Vogel 2a55cf2a3d
Merge pull request #4026 from zeroadam/ModRemovals 
Remove mod files
 2017-12-07 07:43:37 +01:00
Tobias Diekershoff 8c08f19ad6 update for FR 2017-12-07 07:22:36 +01:00
Tobias Diekershoff 8fad959d74 update for DE 2017-12-07 07:22:23 +01:00
Adam Magness 8bbfc44d47 Remove templates 
remove associated template files.
 2017-12-06 23:44:52 -05:00
hoergen 90292d761d customized and colored buttons 2017-12-07 01:56:21 +01:00
Adam Magness cadfef63c4 Update false evaluations 
=== false and !== false to is_null where appropriate.
 2017-12-06 14:57:06 -05:00
Tobias Diekershoff db4d44748b another -x 2017-12-05 07:26:02 +01:00
Hypolite Petovan 239a0d70ad
Merge pull request #3996 from annando/no-zot 
Zot was never really supported, so it is now removed completely
 2017-12-03 08:40:29 -05:00
Michael df89e0384d Added description to networks, renaming some network names 2017-12-03 13:26:52 +00:00
hoergen 0b752324b5 plusminus - removed blockquote borders, adjusted font size on several elements and classes 2017-12-03 13:39:56 +01:00
Michael 6f7510550d NETWORK_MAIL2 was never finished, so remove it as well 2017-12-03 09:19:58 +00:00
Hypolite Petovan 75181322ba Improve page contacblock for frio theme 2017-12-01 22:33:04 -05:00
Hypolite Petovan ff459441cf
Merge branch 'develop' into task/admin-block-list 2017-12-01 00:48:13 -05:00
Hypolite Petovan dc09319695 Add admin/contactblock page 
- Add page template
 2017-12-01 00:43:39 -05:00
Hypolite Petovan 16d0c30328 Move admin templates to dedicated sub-folder 2017-12-01 00:40:55 -05:00
Hypolite Petovan 052ba729d7 Improved translation functions 
- Add built-in vsprintf to t()
- Add built-in sprintf to tt()
 2017-12-01 00:35:40 -05:00
Hypolite Petovan 0ae6f571da
Merge pull request #3982 from zeroadam/Photo-#3878 
Photo to src
 2017-11-30 20:33:48 -05:00
hoergen 346820990c added some styles and removed typos 2017-11-30 00:13:16 +01:00
hoergen 52625653d3 removed tabsi, removed some blank lines. 2017-11-29 17:43:09 +01:00
hoergen a926c8ce4c added some more minimalism, added annotations, removed some blank lines 2017-11-29 17:12:25 +01:00
Adam Magness 54827e7fed Photo to src 
Move Photo to Friendica\Object namespace and replace require_once statments with use statements.
 2017-11-29 07:52:27 -05:00
Michael 8bffee43b3 Threads are now always enabled. 2017-11-28 18:54:39 +00:00
Hypolite Petovan b65247a251
Merge pull request #3968 from hoergen/develop 
added new style sheet to theme vier
 2017-11-26 17:46:43 -05:00
hoergen c32b6000cb removed blank lines 2017-11-26 21:56:39 +01:00
hoergen b348692a47 added plusminus style sheet and sort the style sheets alphabetically 2017-11-26 20:46:55 +01:00
hoergen 887655c1bd added new style sheet plusminus 2017-11-26 20:46:20 +01:00
hoergen 7a8fb79fc5 Adding new stylesheet to theme vier. It aims a more clean visual 2017-11-26 20:45:17 +01:00
Hypolite Petovan 3fbf2e3bcf
Merge pull request #3966 from rabuzarus/20171122_-_port_tagcloud 
A tag cloud widget for the profile page
 2017-11-26 11:16:14 -05:00
rabuzarus 655b2cd0d3 tag cloud: clear align settings in the tagcloud widget 2017-11-26 04:36:45 +01:00
Michael cb7648359c When we are requesting a conneczion, the contactis no longer "blocked" 2017-11-26 02:31:26 +00:00
rabuzarus 4224209497 Merge develop into 20171122_-_port_tagcloud 
Conflicts:
	include/features.php
 2017-11-25 23:41:20 +01:00
Michael 3cb906c420 Issue 3911: Fetch keywords for feeds 2017-11-25 11:59:20 +00:00
rabuzarus 19afabd268 tags: possibility to filter posts for tags and profile owner (profile) 2017-11-23 00:59:20 +01:00
rabuzarus 59ae5633ec tag-cloud: some polishing + remove authors (we don't use it at the moment) 2017-11-22 23:18:01 +01:00
rabuzarus d7d653aab6 port tag cloud widget from hubzilla 2017-11-22 21:29:07 +01:00
Tobias Diekershoff 2acc8091ab IT translations THX Mauro Batini 2017-11-22 07:34:37 +01:00
Adam Magness 7cee150868 ForumManager to src 
ForumManager moved to Friendica\Content namespace
 2017-11-21 07:20:22 -05:00
Hypolite Petovan 2336fa9d74 Add smart_threading user setting 2017-11-19 00:57:31 -05:00
Adam Magness 259f91caa9 PortableContact created 
Create PortableContact and remove socgraph, update references, and calls
 2017-11-15 10:53:16 -05:00
Adam Magness 47db624105 GlobalContact created 
Moved DirSearch and GlobalContact related functions to Friendica\Model namespace
 2017-11-15 09:47:49 -05:00
Michael 731ec347b1 Removed old template parser 2017-11-11 09:26:23 +00:00
rebeka-catalina ef485cd8b7 Made hyperlinks visually different from normal text 2017-11-11 08:40:45 +01:00
Hypolite Petovan 6b23548a2b
Merge pull request #3896 from tobiasd/20171110-community 
adding a global community disclaimer
 2017-11-10 16:17:38 -05:00
Tobias Diekershoff df547a8bc9 move HTML from mod/community into template file 2017-11-10 18:22:28 +01:00
Tobias Diekershoff ff3b4c0edb update for DE 2017-11-10 07:52:47 +01:00
Tobias Diekershoff b73c99dc22 update for ES thx Albert 2017-11-10 07:52:34 +01:00
Adam Magness 4ca68c7af0 Class file relocations 
Issue #3878
 2017-11-08 08:37:03 -05:00
Michael 76caf7a9cf Small corrections 2017-11-08 06:43:20 +00:00
Michael 76f73c7236 And some more places 2017-11-07 22:15:59 +00:00
Adam Magness b995e858e6 Review changes 
Replacements for ::delete() as well as changes to include use statements.
 2017-11-07 09:12:01 -05:00
Adam Magness 0dfa57948f Issue-#3873 
Replace deprecated functions with new syntax.
 2017-11-07 06:24:39 -05:00
Hypolite Petovan c847a2f9cc
Merge pull request #3874 from tobiasd/20171009-checkversion 
check upstream version
 2017-11-06 13:59:49 -05:00
Tobias Diekershoff f097d4d479 std foo 2 2017-11-06 18:21:16 +01:00
Michael 2894214347 Misspelled "detailed" 2017-11-04 12:08:12 +00:00
Michael 7de3eae8d0 There is now a user switch to change between condensed and detailled notifications 2017-11-04 12:01:08 +00:00
Tobias Diekershoff b6f1a0be5a and it is not used in the template anymore as well 2017-11-04 08:34:47 +01:00
Tobias Diekershoff 503ffa98d2 settings for checkversion 2017-11-04 08:15:28 +01:00
Tobias Diekershoff 1928217f83 added config wrapper around new option, opt-in 2017-11-03 15:52:40 +01:00
Tobias Diekershoff e3c3cf96b3 update for ES thx Albert 2017-11-01 17:00:08 +01:00
Tobias Diekershoff 65e96caf29 update for ES thx Albert 2017-10-30 10:36:45 +01:00
Michael e2224a2ddc Some Webfinger clean up 2017-10-28 11:48:29 +00:00
Tobias Diekershoff 10ede73141 update for ES thx Albert 2017-10-26 09:49:08 +02:00
rabuzarus 578dc6f967 frio: sanitize $schema only if the variable is initialized 2017-10-24 14:44:31 +02:00
rabuzarus 2687a42e3c frio: sanitise $schema 2017-10-23 22:14:35 +02:00
rabuzarus 7e273ba51b frio: fix wrong slider position in the theme_settings 2017-10-23 21:15:46 +02:00
rabuzarus 6a8969452a frio: add the possibility for the admin to change the colors for non personal pages 2017-10-23 20:26:31 +02:00
rabuzarus 1585918f29 frio: set a dummy img for background image if no img was set (Otherwise the empty value would be replaced in the browser with a path to the theme and the css would be loaded a second time) 2017-10-23 15:25:09 +02:00
rabuzarus 9be6dfadba frio: use cached css if no settings (or file) have changed 2017-10-23 15:16:23 +02:00
Michael Vogel 2c55d9f3ce Merge pull request #3817 from rabuzarus/20171019_-_fix_some_html_violations 
fix some HTML violations in frio
 2017-10-22 07:48:06 +02:00
Michael Vogel 2a5dd1e857 Merge pull request #3815 from rabuzarus/20171019_-_fix_more_posted_date_widget 
fix some more HTML violations in posted_date_widget.tpl
 2017-10-21 08:14:52 +02:00
rabuzarus 30a4857842 more template code simplification in posted_date_widget 2017-10-20 16:12:43 +02:00
rabuzarus 781c4986c6 a little bit template code simplification in posted_date_widget 2017-10-20 15:59:14 +02:00
rabuzarus f2d51737eb fix some HTML violations in frio 2017-10-20 15:21:42 +02:00
rabuzarus 8167e75e6a fix some more HTML violations in posted_date_widget.tpl 2017-10-19 16:34:08 +02:00
rabuzarus 184bfc722d fix #3812 - some brocken parts in the display of events (default template) 2017-10-19 14:16:39 +02:00
Michael Vogel b78996416c Merge pull request #3809 from rabuzarus/20171018_-_fix_posted_date_widget 
Bugfix: useless li end tag in posted_date_widget.tpl
 2017-10-19 07:50:45 +02:00
rabuzarus 8cc17bdde6 fix coding style 2017-10-19 00:52:01 +02:00
rabuzarus dd8ff1f097 remove unused 'aria-labelledby' in frios modal 2017-10-18 23:38:51 +02:00
rabuzarus a6e8734a37 Bugfix: fix some duplicate ID 2017-10-18 23:22:05 +02:00
rabuzarus 6630e50ecf Bugfix:useless li end tag in posted_date_widget.tpl 2017-10-18 22:49:16 +02:00
rabuzarus 7ddc5339fd frio: fix event seperator 2017-10-18 20:44:29 +02:00
rabuzarus e5ce73b1f8 frio: fix margin and title for events 2017-10-18 20:18:50 +02:00
Michael Vogel d60f96f0e1 Merge pull request #3797 from rabuzarus/20171015_-_duplicate_event 
add event action: duplicate events
 2017-10-18 18:57:58 +02:00
Tobias Diekershoff c5f2ea0de8 Merge pull request #3794 from hethi/fix-de-typos 
fix some german strings on /admin statistics page
 2017-10-18 08:36:58 +02:00
Michael 4744d6bf84 we now provide a feed for the conversation 2017-10-18 06:25:22 +00:00
Herbert Thielen 30cf94a209 changes as downloaded from transifex 2017-10-17 16:02:36 +02:00
Herbert Thielen 3c51febad2 revert accidentally inserted line breaks 2017-10-16 19:37:41 +02:00
Herbert Thielen 6957069fb7 avoid "Nutzer_innen" 2017-10-16 19:33:55 +02:00
Herbert Thielen ff934c8a34 run po2php on de/messages.po to update strings.php 2017-10-16 16:19:05 +02:00
Herbert Thielen 66202ccf22 fix some german strings on /admin statistics page 2017-10-16 16:12:01 +02:00
Tobias Diekershoff cadc8aa6e8 Merge pull request #3787 from rabuzarus/20171013_-_format_event_in_stream 
event items are now more themeable in the networkstream
 2017-10-16 11:29:43 +02:00
rabuzarus 67b9e57547 add event copy link to default event.tpl 2017-10-15 22:52:22 +02:00
rabuzarus c1699364ae reload the acl if a new event edit or copy modal is opened 2017-10-15 22:34:31 +02:00
rabuzarus 74d813042f extend checkbox template for customized attributes 2017-10-15 18:45:49 +02:00
rabuzarus 204c134ab8 Buxfix: fix image floating in frios nav-short-info 2017-10-15 17:54:35 +02:00
rabuzarus 4584670af4 add event action: duplicate events 2017-10-15 17:30:28 +02:00
rabuzarus dcbf4d6d11 fix event html construction (fixes #2646) 2017-10-13 20:03:47 +02:00
rabuzarus 553428d1b1 event items are now more themeable in the networkstream. 
The event description stays the same - but the theme developer can provide an template how the other event data should be organized and look
 2017-10-13 19:42:27 +02:00
Tobias Diekershoff 5afab4b178 update DE translation 2017-10-13 18:10:08 +02:00
S.Krumbholz 80dde20c64 Update vier with new global support forum 
vier has a hardcoded path to the helpers forum as well.
I've changed the path of the global support forum to https://forum.friendi.ca/profile/helpers.
 2017-10-12 15:59:13 +02:00
Michael Vogel c2472d9981 Merge pull request #3774 from tobiasd/20171010-lng 
ES and PT BR translation work
 2017-10-10 11:39:56 +02:00
Tobias Diekershoff 0b66f3ed1e update for ES thx Albert 2017-10-10 07:13:52 +02:00
Tobias Diekershoff 61095f7546 update for PT BR thx abinoam 2017-10-10 07:12:40 +02:00
Michael c8eefbd091 Force a republish to the directory server 2017-10-09 19:26:45 +00:00
Michael df1e96441e Frio: Relocate message wasn't send 2017-10-07 15:45:00 +00:00
Tobias Diekershoff 95e8daa4c8 update EN US and GB variations 2017-10-05 14:09:52 +02:00
Tobias Diekershoff 6440297895 update ZH-CN translation thx mytbk 2017-10-03 06:35:45 +02:00
Tobias Diekershoff 57f65a20a6 update DE translation 2017-10-03 06:29:15 +02:00
Tobias Diekershoff dcc9e16d50 update ZH-CN translation 2017-10-02 18:08:21 +02:00
Tobias Diekershoff 5d566db381 zh-cn was updated as well 2017-09-27 07:15:14 +02:00
Tobias Diekershoff 009a028c14 update EN US and GB variations 2017-09-27 07:10:12 +02:00
Michael 289dde39ce Removed unused setting 2017-09-25 19:05:05 +00:00
Tobias Diekershoff fe7dbb2d49 update DE translation 2017-09-24 10:06:41 +02:00
Michael e8a2c68647 The plink in Diaspora posts now links to the correct place 2017-09-23 08:52:06 +00:00
Michael a5cf2c69c8 Reworked network page 2017-09-13 06:43:43 +00:00
Tobias Diekershoff 7ac56ed0bc update DE translation 2017-09-05 18:19:52 +02:00
rabuzarus 2bf6b15833 Merge pull request #3675 from annando/mail-profile 
Links to profiles in mails now show the profile address as title
 2017-09-03 11:54:21 +02:00
Michael Vogel bfe9040113 Merge pull request #3677 from rabuzarus/20170902_-_fix_oembed_video 
fix some optical glitches with oembedded links and videos
 2017-09-02 21:49:35 +02:00
rabuzarus 4602a46585 fix some optical glitches with oembedded links and videos 2017-09-02 18:56:22 +02:00
rabuzarus 94f03efde0 Frio: add register template 2017-09-02 17:49:55 +02:00
Michael b1668ffdda Address instead of url 2017-09-01 19:32:12 +00:00
Michael 0e8104b172 Links to profiles in mails mow show the profile address and "redir" always works 2017-08-31 12:01:44 +00:00
Michael 04f286dca2 Support for JSON based webfinger 2017-08-30 05:34:37 +00:00
Tobias Diekershoff c948e4cdc3 Merge pull request #3668 from annando/frio-register 
Only show register link when "register" is allowed
 2017-08-29 08:02:18 +02:00
Michael 3a3f3d933e Only show register link when "register" is allowed 2017-08-29 05:12:49 +00:00
rabuzarus be6aa3cbf9 Frio: provide single photo view template 2017-08-28 14:29:11 +02:00
Tobias Diekershoff 5d9a64122a update DE translation 2017-08-26 19:39:31 +02:00
Tobias Diekershoff 94f6f12ba3 Merge pull request #3658 from annando/static-methods 
Avoid some more warnings
 2017-08-26 10:32:28 +02:00
Michael 5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
Michael 3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
rabuzarus e03b0c9385 Bugfix: fix missing closing div in Frio 2017-08-25 20:03:49 +02:00
Tobias Diekershoff 959d6ae15e Merge pull request #3654 from annando/externalpubsubhubbub 
Removed external pubsubhubbub URL
 2017-08-25 09:47:58 +02:00
Michael 5c53544118 Removed external pubsubhubbub URL 2017-08-25 02:58:38 +00:00
Tobias Diekershoff b1dc6ae550 EN (missed a file) 2017-08-24 16:53:19 +02:00
Tobias Diekershoff 277465fa1f update EN US and GB variations 2017-08-23 14:53:37 +02:00
Tobias Diekershoff 33b3ad991c DE translations 2017-08-15 19:54:08 +02:00
Tobias Diekershoff b7fb43484e Merge pull request #3614 from annando/avoid-warnings 
Avoid some PHP warnings, no functional changes
 2017-08-03 07:58:16 +02:00
Michael 1bd85971a4 Avoid some PHP warnings, no functional changes 2017-08-03 05:50:44 +00:00
rabuzarus ccb3f6b655 Add subthread to frio (needs reanabling the frio theme) 2017-08-02 15:52:11 +02:00
Tobias Diekershoff 016e4a0efc Show contacts personal message in local profile 2017-08-01 17:47:13 +02:00
AndyHee fc3bb1ec70 Update US and GB Translations 2017-07-31 21:18:22 +07:00
Michael c98ae304c0 Endless scroll now avoids showing the same items 2017-07-31 06:04:37 +00:00
Tobias Diekershoff 8654b028ec DE translations 2017-07-12 08:26:26 +02:00
Michael Vogel 896bf4046c Merge pull request #3569 from tobiasd/20170702-delete 
delete item from admin panel
 2017-07-10 18:44:19 +02:00
Tobias Diekershoff d88584af69 Merge pull request #3567 from rjm6823/develop 
Contacts page directory link
 2017-07-08 08:36:54 +02:00
Tobias Diekershoff d535864d98 added template for delete item 2017-07-07 10:37:36 +02:00
Tobias Diekershoff 1e0f4c2f70 DE and ES translations 2017-07-07 08:43:10 +02:00
RJ Madsen fec2f8fd82 Replacing quotes around new directory link 2017-07-06 17:56:18 -04:00
RJ Madsen c4b40babb0 Switched to proper global directory instead of local directory 2017-07-06 17:31:36 -04:00
RJ Madsen 255f38710c Added global directory link to the find people side panel 2017-07-06 14:19:58 -04:00
Michael Vogel 2b161108fe Merge pull request #3439 from tobiasd/20170506-token 
[Needs OpenID testing] Add token to register
 2017-07-02 21:31:53 +02:00
Tobias Diekershoff e515c20cbc DE translations 2017-06-30 08:24:45 +02:00
AndyHee 0f604538ba EN-GB and EN-US Translations 2017-06-26 18:03:32 +07:00
AndyHee afa7421aa2 DE Translation 2017-06-26 17:43:00 +07:00
AndyHee bee466532f DE Translation 2017-06-26 17:31:12 +07:00
Tobias Diekershoff 6672dcc36f DE translations 2017-06-26 11:07:18 +02:00
Tobias Diekershoff e0c46678e5 autofocus for search input field 2017-06-24 10:17:16 +02:00
Tobias Diekershoff 45ef0a9ee0 DE translations 2017-06-19 17:03:08 +02:00
Roland Häder 4e49939421
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split2-6-2 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-13 23:26:06 +02:00
Tobias Diekershoff 1838024f6d Merge pull request #3528 from Hypolite/task/replace-explicit-php-logical-operators 
Replace explicit php logical operators
 2017-06-09 07:44:19 +02:00
Hypolite Petovan ad4cdf2a9d Replace lowercase operators 2017-06-08 21:03:44 -04:00
Tobias Diekershoff a9b948d6f9 added hints how to specify a port for the database connection 2017-06-08 15:00:50 +02:00
Hypolite Petovan 9c0d2c31e8 Replace AND and OR in PHP conditions by && and || 2017-06-07 22:00:59 -04:00
Michael 6e6941a546 We have an alternate link 2017-06-06 21:56:25 +00:00
Michael 932e14971f Issue 2864: Add a "alternate" link on display page 2017-06-06 17:56:22 +00:00
Tobias Diekershoff f3d8da7d33 Merge branch 'master' into develop 2017-06-06 12:20:55 +02:00
Tobias Diekershoff 796efa119f Merge pull request #3520 from AndyHee/3.5.2rc 
Correcting path for en-gb and en-gb translations core
 2017-06-06 09:27:25 +02:00
Andy H3 b59ca39d32 Rename view/lang/en-US/strings.php to view/lang/en-us/strings.php 2017-06-06 13:00:20 +07:00
Andy H3 0322ed4dbc Rename view/lang/en-US/messages.po to view/lang/en-us/messages.po 2017-06-06 12:58:59 +07:00
Andy H3 2529552809 Rename view/lang/en-GB/strings.php to view/lang/en-gb/strings.php 2017-06-06 12:58:20 +07:00
Andy H3 a0b0e38c28 Rename view/lang/en-GB/messages.po to view/lang/en-gb/messages.po 2017-06-06 12:57:08 +07:00
Tobias Diekershoff cdc0eab49d ES translation THX Albert 2017-06-06 07:11:27 +02:00
Tobias Diekershoff af41e5ed83 Merge pull request #3518 from AndyHee/3.5.2rc 
Update EN-GB Translation Core + Create EN-US Translation core
 2017-06-06 06:56:02 +02:00
Andy H3 379a01a1c5 Update messages.po 2017-06-05 22:22:16 +07:00
Andy H3 098ef3de99 Create strings.php 2017-06-05 22:21:31 +07:00
Andy H3 a7403349bc Create messages.po 2017-06-05 22:20:27 +07:00
Andy H3 757bf75493 Update strings.php 2017-06-05 21:37:56 +07:00
Andy H3 887e309e85 Update messages.po 2017-06-05 21:36:26 +07:00
Hypolite Petovan cbd3edbc05 Update remaining "dir.friendi.ca" instances 2017-06-02 22:15:43 -04:00
Tobias Diekershoff 47bd3243cd Merge pull request #3500 from AndyHee/3.5.2rc 
Update EN-GB translation core
 2017-05-29 11:18:42 +02:00
Andy H3 29560a3d06 Update strings.php 2017-05-29 15:36:12 +07:00
Andy H3 3e68feb315 Update messages.po 2017-05-29 15:35:04 +07:00
Tobias Diekershoff 67ae517406 DE translations 2017-05-29 07:21:42 +02:00
Tobias Diekershoff c74f144f15 RU translations THX Frederico Gonçalves Guimarães 2017-05-27 09:35:23 +02:00
Tobias Diekershoff 226c7f7910 RU translations THX pztrn 2017-05-27 09:09:41 +02:00
Michael Vogel 0cc15f5c3d Merge pull request #3481 from Hypolite/issue/#3480 
Remove special case of "url" from insertFormatting
 2017-05-24 07:20:07 +02:00
Andy H3 cebe1c00db EN-GB Translation 2017-05-23 22:05:34 +07:00
Andy H3 9ee4532936 Create messages.po 
British English localisation that aims to address various issues in the source, including consistent spelling, appropriate level of capitalisation, succinct wording, and user-centred phrases at basic level.
 2017-05-23 20:05:40 +07:00
Michael Vogel e5429b2d17 Merge pull request #3483 from rabuzarus/20170522_-_frio_event_button_fix 
Bugfix: fix frio's event dropdown color
 2017-05-22 17:55:28 +02:00
rabuzarus dc76e81d3e Bugfix: fix frio's event dropdown color 2017-05-22 14:44:51 +02:00
Hypolite Petovan d14da1214c Remove special case of "url" from insertFormatting 2017-05-21 13:41:28 -04:00
Hypolite Petovan 88e5e06b45 Standards 2017-05-21 13:40:51 -04:00
Hypolite Petovan 87e7fac397 Frio: Fix hubzilla scrollToItem 
- Removed unnecessary item guid truncation
 2017-05-20 13:18:20 -04:00
rabuzarus 5c9033a7e2 Frio: some correction in grammar/expression - thx Hypolite 2017-05-19 13:32:55 +02:00
rabuzarus 3cb5c83fca Frio: a word was missing in the README 2017-05-19 13:18:27 +02:00
rabuzarus 58260021b6 Frio: remove experimental flag + rise version number to 0.8 2017-05-19 13:11:30 +02:00
Tobias Diekershoff fd5d058156 Merge pull request #3472 from rabuzarus/feature/frio/fixedaside2 
Frio: better UX for aside bar
 2017-05-17 11:27:37 +02:00
rabuzarus 4a47361116 Merge pull request #3380 from fabrixxm/feature/frio/fixedaside2 
Frio: better UX for aside bar
 2017-05-16 17:31:06 +02:00
Tobias Diekershoff 3fb99e74d8 IT translations THX fabrixxm 2017-05-16 07:39:38 +02:00
Roland Häder 7a9456d5ac
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2 
Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-11 14:54:26 +02:00
fabrixxm 61e8147daf Frio: recalculate sticky aside on click only on a tags 
This to prevent input elements in aside to lose focus after the
recalculation.
 2017-05-09 14:53:56 +02:00
rabuzarus 757f3a3f5d Bugfix: frio - make register tooltip work 2017-05-08 19:39:06 +02:00
fabrixxm d162e689da frio mobile: disable page scroll when aside is shown 2017-05-08 15:14:31 +02:00
Hypolite Petovan 86cae070f2 Merge branch 'develop' into improvement/move-app-to-src-2 2017-05-07 12:58:11 -04:00
Tobias Diekershoff dacef3683a add token to register 2017-05-06 14:49:53 +02:00
Tobias Diekershoff 3dc938d2e9 DE translations 2017-05-06 08:56:15 +02:00
rabuzarus 0135b7e357 Merge pull request #3417 from fabrixxm/feature/frio/admintemplates 
Frio: admin aside template and generic_links_widget
 2017-05-04 15:33:24 +02:00
Hypolite Petovan dfd4c8528e Add new documentation page about moving classes to src 2017-05-02 23:37:40 -04:00
Hypolite Petovan 1d427aa214 Standards: Remove EOF closing PHP tags 2017-05-02 23:36:56 -04:00
Hypolite Petovan 4b16de6d80 Fix wrong class name case 
- Use leading backslash for non-namespace class names in App
 2017-05-02 23:36:46 -04:00
Hypolite Petovan 20043914e6 Move App to src 
- Add `use Friendica\App;` wherever needed
 2017-05-02 22:59:36 -04:00
Hypolite Petovan 56ee734b00 Cleanup /format pre-move 2017-05-02 22:59:24 -04:00
fabrixxm 588f87bf79 Standards 2017-05-01 18:25:56 +02:00
Tobias Diekershoff 2c0e76f2cc DE translations 2017-05-01 08:23:01 +02:00
Michael 715e15cbe1 There is now a memory limit for the poller 2017-04-29 17:36:46 +00:00
Hypolite Petovan 2c9c867393 frio: Fix typo in various button callbacks 2017-04-28 21:50:09 -04:00
Michael ba5780c4a1 Remove the "discard" button for contact requests from Diaspora. 2017-04-28 08:36:10 +00:00
fabrixxm 57366e391f frio: admin aside template 2017-04-27 21:25:53 +02:00
fabrixxm 7bed3e909a frio: hilight selectet item in generic_links_widget.tpl 
Add a custom generic_links_widget.tpl.
The class ".selected" is add to `li` instead of `a`,
hilighting current item, e.g. in user settings aside.
 2017-04-27 19:34:01 +02:00
fabrixxm 1da4b9d942 frio: add comment note about sticky aside hack 2017-04-27 19:21:14 +02:00
fabrixxm 0ffe426ff1 Frio: Enable stiky aside only on desktop-size windows. 
"Hack" to fix the "scroll back to top" problem with
chrome-based browsers, sticky-kit and off-canvas aside
 2017-04-27 08:39:35 +02:00
fabrixxm 0afc732059 frio mobile aside: add overlay transition 2017-04-26 10:16:39 +02:00
fabrixxm bd4ce2daee mobile aside: max-width and transparent overlay 
fix maximum aside with in mobile screen at 300px.
This way the aside will not cover all the screen.
The area not covered by aside element are dimmed by a semi-transparent overlay
 2017-04-26 08:58:45 +02:00
fabrixxm ea9d44c20a Fix sticky aside when height change 2017-04-26 08:56:47 +02:00
Hypolite Petovan 7d9d22914f Refactor "URL" to "domain" for blocklist 
- Add slash trimming to domain
- Reformatted mod/friendica
 2017-04-25 22:45:42 -04:00
Hypolite Petovan 0b8f80c747 Merge pull request #3388 from tobiasd/20170424-blocklistadminpanel 
blocklist front end for the admin panel
 2017-04-25 21:23:20 -04:00
Tobias Diekershoff f146c85e75 standards 2017-04-25 18:57:50 +02:00
Hypolite Petovan 82ea7ead66 Merge pull request #3374 from rabuzarus/20170407_-_group_edit 
Frio: provide own group template + some restructuring in group.php
 2017-04-24 19:50:46 -04:00
Tobias Diekershoff 1a436281c5 added template for the blocklist editor in the admin panel 2017-04-24 23:44:27 +02:00
rabuzarus 20a53e14ca add a visual indicator (fade) on group membership change 2017-04-23 15:26:26 +02:00
rabuzarus e7914ecc95 add $contact.change_member to the js template. At the present time we don't make use of it, but the js smarty template should be the same as the php smarty template 2017-04-23 14:58:23 +02:00
rabuzarus 46291b2e2b fix smarty PHP warnings 2017-04-23 14:51:41 +02:00
fabrixxm e569e20caf Frio: sitck aside on page scroll 
use sticky-kit jquery library to keep aside inside viewport
when user scrolls the page.
 2017-04-22 20:36:48 +02:00
fabrixxm 5b731a60ae Frio: Fix aside in mobile view 
Aside is fixed to cover page, without the need to scroll back top to see it.
 2017-04-22 20:34:52 +02:00
Sandro Santilli e08228ca09 Add auth_cookie_lifetime variable to installation config template 2017-04-21 17:19:58 +02:00
rabuzarus f99bb958f6 Merge develop into 20170407_-_group_edit 
Conflicts:
	mod/group.php
 2017-04-21 16:09:48 +02:00
rabuzarus 40e5436604 some restructuring in groups.php + Frio: provide own group template 2017-04-21 16:04:29 +02:00
Michael 3592f90910 Merge remote-tracking branch 'upstream/develop' into 1704-mastodon 
Conflicts:
	include/bbcode.php
 2017-04-20 05:44:31 +00:00
Michael Vogel 83cc56e713 Merge pull request #3326 from Alkarex/utf8mb4 
Default to utf8mb4
 2017-04-20 05:28:16 +02:00
Pierre Rudloff 8549da4f7b Make standalone tweaks work with infinite scrolling 2017-04-19 23:51:18 +02:00
Michael e16fb74b0c Reworked OStatus communication part to better support Mastodon. 2017-04-19 21:37:00 +00:00
Pierre Rudloff 2ea2c4b87b In standalone mode, open links to source in a new tab (fixes #3359) 2017-04-19 23:27:11 +02:00
Alexandre Alapetite 6cc4f8b0a9 Delete frio dynamic.php 
https://github.com/friendica/friendica/pull/3326#discussion_r112116929
 2017-04-19 21:44:13 +02:00
Hypolite Petovan f15bb6c516 Add autosize call for all external textarea value changes 2017-04-18 22:04:23 -04:00
Hypolite Petovan 5c3abe0ca6 Prevent comment UI from closing when using BBCode buttons with empty textarea 2017-04-18 22:03:49 -04:00
Michael 33d5e5b818 Issue 3157: No fulltext anymore 2017-04-18 20:09:05 +00:00
rabuzarus 6a7a4591d3 Merge pull request #3333 from Rudloff/feature/theme-color 
theme-color meta
 2017-04-17 13:51:37 +02:00
Pierre Rudloff 6cd6e886db Updated theme-color code 
Add comment explaining what the code does
Remove unused include
Code standards
 2017-04-17 13:38:55 +02:00
Alexandre Alapetite 5d3bf9307f More replaces UTF8 to UTF8MB4 2017-04-16 15:53:48 +02:00
Tobias Diekershoff a0a0885527 Merge pull request #3339 from Hypolite/issue/#2803-icons 
Change icon of contact page links
 2017-04-14 07:35:16 +02:00
Tobias Diekershoff b8fd48dddc Merge pull request #3335 from annando/issue-3331 
Issue 3331: Remove unneeded table "deliverq"
 2017-04-14 07:32:30 +02:00
Hypolite Petovan 440fd29c1e Change icon of contact page links 2017-04-13 23:00:02 -04:00
Pierre Rudloff ead9cbe534 Web app manifest (fixes #3317) 2017-04-13 16:46:36 +02:00
Pierre Rudloff d0407f8b76 theme-color meta 2017-04-13 12:03:02 +02:00
Michael d82684219a Issue 3331: Removed unneeded table "deliverq" 2017-04-13 04:51:16 +00:00
Tobias Diekershoff dad89a125a RU translations THX pztrn 2017-04-09 07:35:12 +02:00
Hypolite Petovan 472345d740 Merge branch 'develop' into space_before_t 2017-04-08 23:17:31 -04:00
rebeka-catalina 554704e6b9 Added a whitespace between comma and t() 2017-04-08 16:57:24 +02:00
Tobias Diekershoff 42cc8d729b Merge pull request #3306 from Hypolite/issue/#3274 
Fix path to default Text_Highlighter CSS
 2017-04-08 15:24:16 +02:00
Hypolite Petovan 318166a381 Fix path to default Text_Highlighter CSS 2017-04-08 08:59:41 -04:00
rabuzarus c65fc6f8de Bugfix: there was a gui issue on the navbar account dropdown button 2017-04-08 13:30:16 +02:00
Tobias Diekershoff fb94a0add7 the Quattro admin_user template was missing the users note for the admin 2017-04-07 12:59:22 +02:00
rabuzarus a9b3696560 Bugfix: bulk deletion button was not available anymore 2017-04-07 11:35:45 +02:00
Hypolite Petovan cfb99aa323 Merge pull request #3266 from rabuzarus/20170321_-_frio-fbbrowser 
frio: fbrowser styling
 2017-04-07 00:01:46 -04:00
Sandro Santilli 27cce1e6dc Add type="text" attribute for openid input field 2017-04-06 21:48:20 +02:00
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