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

18998 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael e61ed380f7 Reworked dfrn_notify endpoint, added public endpoint 2018-04-21 09:55:41 +00:00
Hypolite Petovan c57f0bcce6
Merge pull request #4880 from tobiasd/20180421-lng 
translation updates to DE, FI and PL
 2018-04-21 02:40:30 -04:00
Tobias Diekershoff e65395a17f update PL translations THX waldis 2018-04-21 07:45:06 +02:00
Tobias Diekershoff b3e10f96a8 update PL translations THX waldis 2018-04-21 07:44:54 +02:00
Tobias Diekershoff 87d55e69e2 update FI translations THX Kris 2018-04-21 07:43:29 +02:00
Tobias Diekershoff ec8720224d update DE translations 2018-04-21 07:42:31 +02:00
Hypolite Petovan 69a7afc577
Merge pull request #4855 from M-arcus/env-var-mysql 
[TASK] Config: Add MySQL environment variables
 2018-04-20 12:30:17 -04:00
Marcus Müller 26ba5edda7
[TASK] Template: Add check for environment values 2018-04-20 18:24:28 +02:00
Marcus Müller 19cddd2bc8
[TASK] Config: Add check for environment values 2018-04-20 18:21:00 +02:00
Tobias Diekershoff ea1a434dc1
Merge pull request #4877 from fabrixxm/dev/followup-pr4861 
Frio admin/users : follow up of  4861 - "more space"
 2018-04-20 14:36:54 +02:00
fabrixxm f976361935 Frio admin/users template: show account type in user details 2018-04-20 14:30:04 +02:00
fabrixxm 12b7bce1cc admin users, don't set account-type if page flag isn't PAGE_NORMAL 2018-04-20 14:27:36 +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 9a7f508550 Admin users: Update page type names, add raw flags template context 
Change user table header "Account" to "Type": it use less space :-)
 2018-04-20 14:02:45 +02:00
Hypolite Petovan 92473e15b5
Merge pull request #4875 from tobiasd/20180420-msg 
regenerated master messages.po file
 2018-04-20 07:57:59 -04:00
Hypolite Petovan 12e79a68b7
Merge pull request #4874 from tobiasd/20180420-lng 
IT, FI and ZH_CN translation updates
 2018-04-20 07:57:13 -04:00
Tobias Diekershoff da541513ad regenerated master messages.po file 2018-04-20 09:31:27 +02:00
Tobias Diekershoff 4d4ed6fb17
Merge pull request #4863 from MrPetovan/task/4860-add-hidden-input-in-console 
Add hidden input in newpassword console
 2018-04-20 09:29:17 +02:00
Tobias Diekershoff 3a52ffc1b8 IT, FI and ZH_CN translation updates 2018-04-20 08:30:40 +02:00
Hypolite Petovan e2ded28504
Merge pull request #4870 from astifter/develop 
Add space before Impressum.
 2018-04-19 15:35:48 -04:00
Friendica dc4b384414 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-04-19 19:24:35 +00:00
Friendica 400bab676d Add space before Impressum. 
The page /friendica/ contains an Impressum section which is activated with an AddOn.
Add more space after last paragraph of information, before impressum, because site
looks quite cramped otherwise.
 2018-04-19 19:03:29 +00:00
Hypolite Petovan 53b7e4b102
Merge pull request #4861 from fabrixxm/issue/3395 
Frio: add template for admin/users
 2018-04-19 13:03:03 -04: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
Hypolite Petovan f043554ab7
Merge pull request #4849 from M-arcus/installation-script 
[FEATURE] Install Script: Add first version
 2018-04-19 07:57:02 -04:00
Hypolite Petovan f65a7b3130 Add hidden password input to Console\NewPassword 
- Add Exception when password is empty
 2018-04-19 07:51:26 -04:00
Hypolite Petovan 0496822ca3 Add Exception when password is empty in User::hashPassword() 2018-04-19 07:51:26 -04:00
Hypolite Petovan b73d5a641f [Composer] Add seld/cli-prompt dependency 2018-04-19 07:51:26 -04:00
Marcus Müller e2a58a791c
[DOCS] Auto Install: Add description 2018-04-19 10:21:41 +02:00
Tobias Diekershoff ab82c6df03
Merge pull request #4865 from annando/dfrn-reshare 
Diaspora: Improved reshared coding
 2018-04-19 08:43:18 +02:00
Michael Vogel 10465110c1
Merge pull request #4851 from MrPetovan/task/4709-add-query-based-content-filter 
Add query based content filter
 2018-04-19 08:21:53 +02:00
Michael Vogel 32f78a4b01
Merge pull request #4864 from MrPetovan/bug/fix-memcached-delete 
Fix MemcachedCacheDrive::delete() method
 2018-04-19 08:16:18 +02:00
Michael c507cdf946 Code simplified 2018-04-19 06:07:23 +00:00
Michael da06416426 Merge remote-tracking branch 'upstream/develop' into dfrn-reshare 2018-04-19 05:44:06 +00:00
Hypolite Petovan 87f638bdc9 Improve CacheSessionhandler 
- Replace !x() by empty()
- Add return values to read() and destroy()
 2018-04-18 23:37:06 -04:00
Hypolite Petovan ca4ca51c6a Add hostname prefix in MemcachedCacheDriver 2018-04-18 23:36:23 -04: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
Marcus Müller 457b86711d
[TASK] Auto install: Rework class 2018-04-18 14:30:42 +02:00
Marcus Müller 24626f5fd2
[TASK] Auto install: Rename script command 2018-04-18 14:21:40 +02:00
Marcus Müller 7b7ca71bf6
[TASK] Auto install: Rename script command 2018-04-18 14:20:21 +02:00
Marcus Müller d53e64a583
[TASK] Install Script: Register installation class 2018-04-18 11:46:27 +02:00
Marcus Müller 1d552b5e66
[TASK] Install script: Add installation class 2018-04-18 11:43:23 +02:00
Marcus Müller 96d8591b95
[TASK] Remove auto_install.php 2018-04-18 11:40:16 +02:00
Michael Vogel 21dbe233cb
Merge pull request #4859 from tobiasd/20180418-lng 
update to the FI translation THX Kris
 2018-04-18 08:17:16 +02:00
Tobias Diekershoff 9cb2369c15 update to the FI translation THX Kris 2018-04-18 07:57:16 +02:00
Tobias Diekershoff fda5ad647d
Merge pull request #4857 from annando/duplicated-tags 
Avoid duplicated multibyte tags
 2018-04-18 07:50:56 +02:00