keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
18925 commits 4 branches 0 tags 179 MiB
Commit graph

18925 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan
ec9baef968 Add new Content\BBCode::toPlaintext() 2018-04-21 04:10:25 -04:00
Hypolite Petovan
5476da53aa Move Content\BBCode::toPlaintext() to Model\Item::getPlaintextPost() 2018-04-21 04:09:45 -04: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
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
Tobias Diekershoff
596b934a02
Merge pull request #4858 from annando/issue-4655 
Issue 4655: Avoid multiplicated contact requests from the same account
 2018-04-18 07:50:34 +02:00
Michael
8a730b2d85 Issue 4655: Avoid multiplicated contact requests from the same account 2018-04-18 05:02:59 +00:00
Michael
ed87e634ed Avoid duplicated multibyte tags 2018-04-18 05:00:28 +00:00
Michael
f99af007ae Replaced queries 2018-04-18 04:59:33 +00:00
Michael
88353ce56f Merge remote-tracking branch 'upstream/develop' into dfrn-reshare 2018-04-18 03:12:13 +00:00
Hypolite Petovan
188158274c [Composer] Add bower-asset/vue dependency 2018-04-17 19:56:47 -04:00
Hypolite Petovan
961a6d29a9
Merge pull request #4856 from annando/dandelion 
better support for the Diaspora app "Dandelion"
 2018-04-17 12:50:06 -04:00
Michael
229d8eb0e9 better support for the Diaspora app "Dandelion" 2018-04-17 16:46:57 +00:00
Hypolite Petovan
6d2d15a80d
Merge pull request #4782 from Alkarex/fix-update-password 
Fix update password rehash
 2018-04-17 07:25:52 -04:00
Tobias Diekershoff
7b6d1e1ab3
Merge pull request #4853 from annando/site-defaults 
Default values for site configuration
 2018-04-17 10:12:11 +02:00
Michael Vogel
865c7f79b9
Merge pull request #4852 from tobiasd/20180417-fi 
update to the FI translation THX Kris
 2018-04-17 07:24:48 +02:00
Michael
e5583591d7 Default values for site configuration 2018-04-17 05:18:26 +00:00
Tobias Diekershoff
6f7de87088 update to the FI translation THX Kris 2018-04-17 07:17:46 +02:00
Hypolite Petovan
98f64ed824 Replace duplicate behaviors by Model\Term::populateTagsFromItem 
- Replaced in include/conversation
- Replaced in include/text
 2018-04-16 22:22:58 -04:00
Hypolite Petovan
17a0cc4f3d Add Model\Term::populateTagsFromItem method 2018-04-16 22:22:58 -04:00
Hypolite Petovan
54b75026fc Add header support for security token check 2018-04-16 22:22:58 -04:00
Hypolite Petovan
cc40dcf83c Add dbstructure_definition hook call 2018-04-16 22:22:58 -04:00
Hypolite Petovan
0334e49d8e
Merge pull request #4850 from tobiasd/20180416-newinfo 
new info mail address
 2018-04-16 14:35:57 -04:00
Tobias Diekershoff
150843af5f new info mail address 2018-04-16 17:28:19 +02:00
Marcus Müller
791071a1c6
[CLEANUP] Code: Remove function 2018-04-16 14:56:02 +02:00
Hypolite Petovan
e590610eee
Merge pull request #4848 from tobiasd/20180416-tos2 
display the thing
 2018-04-16 07:35:59 -04:00