MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
18364 commits 3 branches 0 tags 96 MiB
Commit graph

4776 commits

Author SHA1 Message Date
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