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 |
|