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

19225 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel
39edd086e0
Merge pull request #4893 from MrPetovan/bug/4879-remove-backslash-in-birthday-events 
Fix quoting style in DFRN::birthdayEvent()
 2018-04-22 07:54:07 +02:00
Hypolite Petovan
08afec3170 Only show event reminders of events attendyes or attendmaybe 2018-04-21 22:53:13 -04:00
Hypolite Petovan
851c5d841f Fix quoting style in DFRN::birthdayEvent() 2018-04-21 21:03:12 -04:00
Hypolite Petovan
6d88984ee5 Move Model\Item::getPlaintextPost to Model\ItemContent::getPlaintextPost 2018-04-21 20:50:13 -04:00
Hypolite Petovan
18078ce7a4 Prevent infinite loop when a dbstructure_definition hook is orphan 
- Add cascade option to dba::delete
- use cascade = false for orphan hook deletion
 2018-04-21 20:34:07 -04:00
Hypolite Petovan
ee672b946e Add Text\BBCode::toPlaintext to mod/babel 2018-04-21 18:48:10 -04:00
Hypolite Petovan
daf94a8f63
Merge pull request #4891 from annando/private-forum-redux 
Better working with private forums
 2018-04-21 18:19:27 -04:00
Michael
16beab4652 Better working with private forums 2018-04-21 21:59:02 +00:00
Tobias Diekershoff
5dda815521
Merge pull request #4887 from rabuzarus/20180421_-_frio_add_missing_settings_css 
frio - add missing page styles for user setting pages
 2018-04-21 16:29:27 +02:00
Tobias Diekershoff
0700452c49
Merge pull request #4888 from friendica/revert-4883-install_config 
Revert "Moved .htconfig.php file & extracted Install business logic"
 2018-04-21 16:28:51 +02:00
Tobias Diekershoff
f63be91bd5
Revert "Moved .htconfig.php file & extracted Install business logic" 2018-04-21 16:28:22 +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
Hypolite Petovan
401934f21f
Merge pull request #4883 from nupplaphil/install_config 
Moved .htconfig.php file & extracted Install business logic
 2018-04-21 09:59:57 -04:00
Hypolite Petovan
d08ddaa116
Merge pull request #4884 from rabuzarus/20180421_-_fix_image_upload_for_msg 
frio - fix image upload for prv messages
 2018-04-21 09:58:54 -04: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
Philipp Holzer
334d392154 Merge remote-tracking branch 'origin/develop' into install_config 2018-04-21 14:23:49 +02:00
Philipp Holzer
346697d771 Moved .htconfig file 
Extracted install business functions to new Class `Install.php`
 2018-04-21 14:10:53 +02:00
rabuzarus
4285cd5dc7 frio - fix image upload for prv messages 2018-04-21 14:05:40 +02:00
Tobias Diekershoff
ebe203336f
Merge pull request #4882 from annando/private-forums 
Contact requests from Diaspora for private forums aren't accepted automatically anymore
 2018-04-21 13:54:10 +02:00
Michael
fd7658a70a Contact requests from Diaspora for private forums aren't accepted automatically anymore 2018-04-21 10:39:46 +00:00
Michael
e61ed380f7 Reworked dfrn_notify endpoint, added public endpoint 2018-04-21 09:55:41 +00:00
Hypolite Petovan
1e67c32142 Fix BBCode::getAbstract scope 2018-04-21 04:38:27 -04:00
Hypolite Petovan
abc50eb3ae Improve Model\Item::addLanguageInPostopts() 
- Use Content\BBCode::toPlaintext method
- Rename $arr parameter to $item
- Rename $lng variable to $languages
 2018-04-21 04:11:32 -04:00
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
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