Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-25 06:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
21671 commits 3 branches 64 tags 237 MiB
Commit graph

2935 commits

Author SHA1 Message Date
hoergen
eb5edad07a
Add files via upload 
frio: new scheme Plusminus aims to minimize empty design spaces
 2018-06-30 13:39:11 +02:00
Roland Häder
8ad523fbc8
Continued a bit: 
- removed/fixed whitespaces and mixture of spaces/tabs (some)
- added new-line character at end of files (POSIX-compilant)
- reverted some code which I had messed up (compared to upstream/develop)
- removed duplicate dba::update() invocation in src/Protocol/DFRN.php
- also removed no longer valid TODO

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-06-20 22:19:54 +02:00
rabuzarus
0a97a3f822 Bugfix: hide savedsearch butten and subthread button for non local_users 2018-06-19 18:27:54 +02:00
rabuzarus
1a8d3c460e add class "wall-item-body" to all themes 2018-06-16 13:50:56 +02:00
rabuzarus
a2fc1be187 fix scroll position in stream while ajax update 2018-06-16 13:05:33 +02:00
rabuzarus
2b69571cbf Frio: add addon_hooks to head.tpl 2018-06-15 22:55:00 +02:00
Hypolite Petovan
f0c2b77157
Merge pull request #5215 from rabuzarus/20180614_-_frio_contact_suggestion_template 
Frio: provide a template for received contact suggestions
 2018-06-14 13:56:30 -04:00
rabuzarus
02344ce78c Frio: background color for fsuggest module 2018-06-14 18:57:30 +02:00
rabuzarus
aaeb85c944 Frio: scroll to the contact request in notifications module 2018-06-14 18:49:53 +02:00
rabuzarus
b8186ba98b Frio: provide a template for received contact suggestions 2018-06-14 17:05:23 +02:00
rabuzarus
0db6002e3c Frio: fix contact filtering on contacts page 2018-06-13 23:04:07 +02:00
Michael
8a34895a23 Use magicLink whenever possible 2018-06-02 08:05:06 +00:00
rabuzarus
9c9b82ba59 Frio: move tos link to a another place in the nave menu 2018-05-27 09:55:05 +02:00
rabuzarus
58f9498c7e Frio: tos page background for frio 2018-05-27 09:48:27 +02:00
Tobias Diekershoff
571311a80b removed deprecated themes frost(-mobile) 2018-05-26 10:25:42 +02:00
rabuzarus
0d7d688649 frio - add "info about the instance" link into the navbar for non-authed users 2018-05-22 12:44:35 +02:00
Hypolite Petovan
c41332364f
Merge pull request #5089 from tobiasd/20180519-tos 
privacy statement
 2018-05-20 08:20:16 -04:00
Michael
c70ebadd7d Issue-3412 related: Don't send connection posts anymore 2018-05-19 19:34:51 +00:00
Tobias Diekershoff
dd629d5fa4 registration: added display of privacy statement if enabled 2018-05-19 18:53:54 +02:00
Tobias Diekershoff
f285d9c7eb add link to TOS in frios registration template if enabled 2018-05-16 13:41:56 +02:00
Tobias Diekershoff
eec0826750 added link to the TOS page if it is activated 2018-05-16 11:57:06 +02:00
Andreas Neustifter
59b57459c6 Fix layout issue introduced with PR #4873. 
The find button in the find-people widget was badly layouted on Firefox under Debian.
Remove the width constraint and float: left so the button gracely drops to the next
line when necessary.
 2018-04-30 21:22:59 +00:00
Hypolite Petovan
2975d1a0be
Merge pull request #4959 from koyuawsmbrtn/develop 
Added dark scheme to frio
 2018-04-30 10:30:01 -04:00
Koyu Berteon
90b24251d2 Renamed files as requested 2018-04-30 15:38:46 +02:00
Koyu Berteon
125c3e7cab Corrected time 2018-04-30 15:34:23 +02:00
Koyu Berteon
01bd3a3a7b Fixed identation in dark.php 2018-04-30 15:27:40 +02:00
Koyu Berteon
72cab9bb93 Added dark scheme to frio 2018-04-30 15:25:31 +02:00
rabuzarus
0c0b715c63 Merge develop into 20180425_-_fix_help_aside 2018-04-30 14:56:25 +02:00
Hypolite Petovan
fde3d6f870 Replace current_theme() and current_theme_url() calls 2018-04-28 18:37:25 -04:00
Hypolite Petovan
3213715b60 Fix formatting in frio_boot.php 2018-04-28 18:36:32 -04:00
Andreas Neustifter
babb45efd8 Fix login page layout without OpenId. 
When OpenId is disabled and the input therefore is missing from the login the page looks
weird. Fix that.
 2018-04-27 20:00:46 +00:00
rabuzarus
a19784d209
Merge pull request #4890 from astifter/reorganize_login 
Reorganize Login to Fix #4878
 2018-04-27 19:56:25 +02:00
Hypolite Petovan
2d6dafc057 [frio] Improve background styles' description 2018-04-26 07:50:05 -04:00
Hypolite Petovan
1ce999a4ab [frio] Fix quoting style in php/Image 2018-04-26 07:46:59 -04:00
Hypolite Petovan
7feeb0af78 Add backward-compatibility for config variables after schema rename 2018-04-26 04:22:04 -04:00
rabuzarus
3fb993f37b frio - fix help toc aside 2018-04-25 23:30:56 +02:00
Hypolite Petovan
86e4690b5f [frio] Add background-repeat attribute to background image options 
- Update background image options names and labels
- Add background image option label tag
 2018-04-24 20:42:23 -04:00
Hypolite Petovan
4307a87d6a [frio] Rename "Default" color scheme as "Custom" 
- Capitalize scheme name
 2018-04-24 20:40:29 -04:00
Hypolite Petovan
0f82c3348d [frio] Rename bgcolor to background-color 2018-04-24 20:39:34 -04:00
Hypolite Petovan
3bfa6facfc [frio] Fix typo schema -> scheme 2018-04-24 20:26:14 -04:00
Hypolite Petovan
eb9b832c3a [frio] Normalize quoting style in PHP files 2018-04-24 20:12:43 -04:00
Hypolite Petovan
b65c8c55a4 [frio] Fix formatting in PHP files 2018-04-24 20:05:20 -04:00
Andreas Neustifter
d06a174f0c Make register-link less obtrusive. 2018-04-24 21:18:31 +00:00
Andreas Neustifter
1a69265da4 Fix missing background tiles. 2018-04-24 21:16:15 +00:00
rabuzarus
ac753e3320 frio - provide a template for invite page 2018-04-24 17:33:48 +02:00
Andreas Neustifter
6a1ce9c9c0 Fix login dialog layout for frio. 
Rearrange login dialog distinguish better between logging und registering.
 2018-04-23 20:29:55 +00:00
Andreas Neustifter
fe74a3d697 Remove empty help spans from templates. 
The empty spans from the templates mess up the layout sometimes, and are useless weight anyway.
Lets get rid of them.
 2018-04-23 20:29:55 +00:00
Andreas Neustifter
2d8a4a923f Fix login dialog layout. 
Rearrange login dialog distinguish better between logging und registering.
 2018-04-23 20:29:55 +00:00
Hypolite Petovan
a66e9b81ba
Merge pull request #4873 from astifter/develop 
Remove pagination when empty, move new Member Tips and use common widget to find people.
 2018-04-23 10:23:21 -04:00
rabuzarus
763b061a2b frio - Bugfix - there was a wrong user count in admin-users template 2018-04-23 00:26:00 +02:00
rabuzarus
04bdba0d78 frio - some work on the admin contactblock template to be more consistant with other setting pages 2018-04-22 23:06:06 +02:00
Friendica
390983a331 Haromonize Find People Widget. 
In the right_aside on the /contacts page in the left aside there are
almost identical widgets to search for contacts. Drop one and use common
widget in both places.
 2018-04-22 20:44:22 +00:00
rabuzarus
5a82ee04bc frio - some work on the admin users template to be more consistant with other setting pages 2018-04-22 20:23:24 +02:00
rabuzarus
7e41f62809 frio - add missing page styles for user setting pages 2018-04-21 16:22:11 +02:00
Hypolite Petovan
afced187bc
Merge pull request #4885 from rabuzarus/20180421_-_fix_frio_in_directory 
frio - fix default template if friendica is installed into a subdirectory
 2018-04-21 10:10:32 -04:00
rabuzarus
8f6e018958 frio - remove $baseurl variable from default template because we don't need it anymore 2018-04-21 16:04:11 +02:00
rabuzarus
a65e93faea frio - fix default template if friendica is installed into a subdirectory 2018-04-21 15:43:11 +02:00
rabuzarus
54c3efccab frio - don't show the "insert image" button in modals (because it doesn't work at the current state) 2018-04-21 14:27:57 +02:00
rabuzarus
4285cd5dc7 frio - fix image upload for prv messages 2018-04-21 14:05:40 +02:00
fabrixxm
f976361935 Frio admin/users template: show account type in user details 2018-04-20 14:30:04 +02:00
fabrixxm
23e5225b20 Frio admn/users: use icons for page flags and account type in table 
to have more space
 2018-04-20 14:11:34 +02:00
fabrixxm
516eb2b9ea Frio admin/users template: fix users avatars, table cols width to have more space 2018-04-20 14:07:11 +02:00
fabrixxm
abd7b2666c Frio: admin/users template 
- replace last a href=# with button
- use smallest breakpoint for panels footers
 2018-04-19 19:00:16 +02:00
fabrixxm
e909beee04 Frio: admin/users template 
- move checkboxes on first column
- move select/deselect all as button group on panel footer
- use existing jquery in mod_admin.js for select/deselect all functionality
- add page content wrapper, without padding
- fix user avatar size in "pending deletion" table
 2018-04-19 18:17:46 +02:00
fabrixxm
20a2918bda Frio: admin/user template fixes 
- small fixes to html
- move js and css to extern files
- move checkboxes to first column
 2018-04-18 21:43:33 +02:00
fabrixxm
362654abf0 Fix indentation 2018-04-18 19:44:10 +02:00
fabrixxm
1017e244ca Frio: add template for admin/users 2018-04-18 17:52:34 +02:00
Tobias Diekershoff
00311af79b added missiing information to theme templates 2018-04-12 10:33:28 +02:00
Hypolite Petovan
60f3a6aac0 [frio] Add color to group membership action buttons 2018-04-06 23:55:29 -04:00
Hypolite Petovan
59d42e9681
Merge pull request #4762 from annando/frio-accessibility 
Some more accessibility for "Frio"
 2018-04-06 17:07:25 -04:00
Michael
ed316b38ee Some more accessibility for "Frio" 2018-04-06 20:42:38 +00:00
Michael Vogel
05cff59f70
Merge pull request #4722 from MrPetovan/task/add-content_filter-hook 
Add content_filter hook
 2018-04-06 06:42:52 +02:00
Michael
3792012723 Improved accessibility for "Frio" 2018-04-05 21:50:34 +00:00
Hypolite Petovan
180f7d8218 Add disabled_cw user setting 2018-04-04 23:08:47 -04:00
rabuzarus
34204ca580 update javascript cropper library 2018-03-29 17:57:06 +02:00
Michael
8bdd417b04 Asynchronous Javascript is deactivated 2018-03-27 05:45:56 +00:00
Hypolite Petovan
daffc27061 Move suppress_tags config to template 
- Add new item.suppress_tags template variable
- Fix template formatting
 2018-03-25 00:38:23 -04:00
Hypolite Petovan
27d94023ee Merge branch 'master' into develop 2018-03-23 06:15:55 -04:00
Andi
97840abdd6 2018-03-22 01:25:43 +01:00
Andi
1e2820805b vier: replace hard coded style path 2018-03-22 01:15:59 +01:00
Andi
e473be01db frio: removed "Illegal string offset" Warnings 2018-03-21 23:53:41 +01:00
Michael
858fd127a1 Fix: subscribing to the old followers hadn't worked 2018-03-14 00:27:15 +00:00
Hypolite Petovan
15099a97d5 [frio] Add asynchronous javascript assets loading 2018-03-07 08:08:37 -05:00
Hypolite Petovan
274ce95d13 Move Composer assets to view/ 2018-03-07 08:07:36 -05:00
Michael
9cf342f02a Improved JS, updating single items now work 2018-02-27 22:37:11 +00:00
Hypolite Petovan
f0268c6142 Fix indentation in frio/css/style.css 2018-02-18 08:13:59 -05:00
Hypolite Petovan
96078a1fca [frio] Make settings/addon look like settings/display 2018-02-18 08:13:59 -05:00
Hypolite Petovan
7a38fbf84b [Scrutinizer] Fix undeclared variables part 7: mod/ and view/ 
- Remove unused function `salmon_return()`
 2018-02-14 00:07:26 -05:00
rabuzarus
02ef222fe1 fix undeclared variables or wrong variable names (/view) 2018-02-12 16:50:05 +01:00
rabuzarus
9a4d19e284 move membersince addon to core 2018-02-09 20:44:45 +01:00
Hypolite Petovan
b5a88c5b12
Merge pull request #4422 from rabuzarus/20180208_-_frio_rename_transparency_in_opacity 
frio: renaming background transparency into background opacity
 2018-02-08 12:55:16 -05:00
rabuzarus
143af5a6d5 frio: renaming background transparency into background opacity 2018-02-08 18:47:06 +01:00
rabuzarus
d59cd7dfa4 frio: disable nav login button on home and login module 2018-02-08 18:36:39 +01:00
rabuzarus
764a9be90a Frio: add admin summary template 2018-02-07 16:14:12 +01:00
Tobias Diekershoff
85c8bf0228
Merge pull request #4399 from MrPetovan/task/3878-move-include-bbcode-to-src 
Move include/bbcode to src/ part 1 : Everything but bbcode()
 2018-02-07 07:18:39 +01:00
rabuzarus
d6a751bfd1 Frio: better styling for the admin addons/themes selection page 2018-02-06 16:13:19 +01:00
Hypolite Petovan
010cf3b1e8 Update references to BBCode methods 
- Resolve name conflicts with Util\Network
 2018-02-04 19:26:22 -05:00
Hypolite Petovan
1e99cea033 [frio] Fix spacing in field_input.tpl 2018-02-03 09:51:23 -05:00
Tobias Diekershoff
c28b62b302 lets print out the internets 2018-01-31 11:31:47 +01:00
Tobias Diekershoff
7ef77b926a Admin menu reorganisation 
The aside menu in the admin panel is now handled in one array, which also
holds the submenu items. Also the sections of the menu are now a bit more
structured and separated from each other.
 2018-01-30 13:37:00 +01:00
Hypolite Petovan
cd392db078 Move js/ folder under view/ 
- Move library/cropper to view/js/cropper
- Move library/jquery-textcomplete to view/js/jquery-textcomplete
 2018-01-28 16:17:36 -05:00
Hypolite Petovan
a05eeeb49c Remove jQuery Migrate file 
- Remove script references
 2018-01-28 15:54:20 -05:00
Hypolite Petovan
19e197ef51 Forgot a path element in perfect-scrollbar paths 2018-01-27 21:09:49 -05:00
Hypolite Petovan
e54cdb1f72 Fix wrong path to perfect-scrollbar library files 2018-01-27 19:06:20 -05:00
Hypolite Petovan
341d2fae12 Updated references to perfect-scrollbar 2018-01-27 18:04:02 -05:00
Michael Vogel
f5c6df2110
Merge pull request #4338 from MrPetovan/task/4265-move-fullcalendar-to-composer 
Move fullcalendar to Composer
 2018-01-27 23:56:06 +01:00
Hypolite Petovan
97dc1583ea Remove commented out references to tiptip 2018-01-27 16:16:41 -05:00
Hypolite Petovan
e34bc8761e Update references to fullcalendar and moment 2018-01-27 15:51:08 -05:00
Hypolite Petovan
9b0fc558f7 Update references to jgrowl 2018-01-27 11:52:06 -05:00
Hypolite Petovan
9d78010e7f Update references to jquery.datetimepicker 2018-01-27 08:09:30 -05:00
Hypolite Petovan
30c1cc0e8c
Merge pull request #4312 from zeroadam/feature/L10n 
Move pgettext to src
 2018-01-24 11:48:55 -05:00
hoergen
fe7786671e removed heading backgrnd, added mention highlight 2018-01-24 08:02:33 +01:00
Tobias Diekershoff
1908a9feb9 Config::get returns null if value not set, so the check needs to be adopted 2018-01-23 08:15:53 +01:00
Adam Magness
21f593bf4b Adjust for templates 
Use new t() for template button text
 2018-01-22 22:20:35 -05:00
Hypolite Petovan
b021b76661 Remove references to video.js 2018-01-22 20:45:42 -05:00
Adam Magness
27d5a7112a Theme t() uses 
Updatee t() calls in themes
 2018-01-22 18:38:34 -05:00
Adam Magness
f0725ae384 Hopefully all t() 
hopefully the last of the t()
 2018-01-22 18:03:26 -05:00
Adam Magness
ead9d86236 More t() 
Update more t() calls
 2018-01-22 18:03:26 -05:00
Hypolite Petovan
1b2334745a Fix limit and search parameters in frio_acl_lookup 2018-01-21 12:39:47 -05:00
Hypolite Petovan
d3fa7ae5ae Fix contact autocomplete template repeated picture 
- Use <template> to prevent wrong src lookup
 2018-01-21 11:48:16 -05:00
Hypolite Petovan
a5952e5425
Merge pull request #4297 from hoergen/develop 
[vier] changed some spacing
 2018-01-21 08:34:01 -05:00
hoergen
d384b7b117 changed some spacing 2018-01-21 14:29:18 +01:00
Adam Magness
a7d887a68e CSS files 
update plugin references in css files.
 2018-01-20 07:48:22 -05:00
Adam Magness
b86b04a81a Change plugin to addon 
change the use of plugin to addon where appropriate.
 2018-01-20 07:48:22 -05:00
Adam Magness
6c4c567319 Remove require 
remove require_once for plugins.php
 2018-01-20 07:48:22 -05:00
Adam Magness
11cf36105c Update Addon functions and calls 
Update function names and calls for Addon class.
 2018-01-20 07:48:22 -05:00
Hypolite Petovan
4ed86adfab [frio] Add max-width: 100% for video tags 2018-01-19 20:14:26 -05:00
Hypolite Petovan
b432a17538 Update references to jquery 2018-01-18 11:27:14 -05:00
Hypolite Petovan
9ee1b14b2b Update references to colorbox css and js files 
- Remove commented out references to other css/js files
 2018-01-18 11:27:14 -05:00
Hypolite Petovan
0d9595d80a Update all references to webtoolkit.base64 2018-01-17 21:23:51 -05:00
Michael Vogel
a13ad278ef
Merge pull request #4259 from MrPetovan/task/4116-remove-vendor-from-git 
Remove vendor from git
 2018-01-18 01:02:55 +01:00
fabrixxm
f51fda7911 fix for coding standars 2018-01-17 17:27:27 +01:00
fabrixxm
fc8e8feec1 Frio: add login background color admin option 2018-01-17 16:33:27 +01:00
fabrixxm
2c8bbea65d frio: tweak login template, fix style 
move lost pwd link and register to submit wrapper,
use flexbox for submit row in login form,
show register link as button
fix form label colors in mobile
 2018-01-17 16:01:34 +01:00
fabrixxm
9862194914 Frio: fix home page 
Add home.tpl, fix style with custom home.html, fix style with custom page content from addon
 2018-01-17 13:29:04 +01:00
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
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
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
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
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
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
hoergen
6bf75a2f31 added more styles for setting page and fixed input pointer 2017-12-09 04:03:18 +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
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
hoergen
0b752324b5 plusminus - removed blockquote borders, adjusted font size on several elements and classes 2017-12-03 13:39:56 +01: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
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
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
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