clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,129 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

14129 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael 7a89d06465 Make sure that we only quit when we are sure we can 2017-02-01 08:43:18 +00:00
Michael 7324a661f1 Optimized timeouts during network operations 2017-02-01 00:15:37 +00:00
Michael 2424cb78d1 Only process feed and dfrn items when they aren't already stored 2017-01-31 19:39:09 +00:00
Tobias Diekershoff 44bd890645 Merge pull request #3140 from annando/issue-3116 
Bugfix issue 3116: Only allowed themes are displayed
 2017-01-31 07:36:25 +01:00
Tobias Diekershoff 4c1292f171 Merge pull request #3139 from annando/issue-3135 
Issue 3135: dbupdate is started again and again
 2017-01-31 07:30:15 +01:00
Michael 49834676c7 Bugfix issue 3116: Only allowed themes are displayed 2017-01-31 05:14:32 +00:00
Michael dae125e8ee Issue 3135: dbupdate is started again and again 2017-01-30 21:18:08 +00:00
Tobias Diekershoff 080233b9b9 Merge pull request #3137 from rabuzarus/20170130_-_fix_meta_element_in_display_module 
Bugfix: fix the author image in the meta elements in html head (display module)
 2017-01-30 15:56:41 +01:00
Tobias Diekershoff b6f64182a8 Merge pull request #3136 from rabuzarus/20170130_vier_photo_album 
style the photo album page of the vier theme
 2017-01-30 15:55:58 +01:00
rabuzarus 6d01dd83fe Bugfix: fix the author image in the meta elements in html head (display module) 2017-01-30 15:23:44 +01:00
rabuzarus ec4e60ce3a style the photo album page of the vier theme 2017-01-30 15:00:26 +01:00
Tobias Diekershoff dd36b2bded Merge pull request #3128 from annando/bugfix-no-self-destroy 
Bugfix: Sometimes the self contact seems to destroy itself
 2017-01-30 09:11:10 +01:00
Tobias Diekershoff 63e71ff297 Merge pull request #3127 from annando/bugfix-ssl-issues 
Bugfix: The SSL policy setting was not respected
 2017-01-30 08:46:25 +01:00
Tobias Diekershoff 0b04e0383c Merge pull request #3132 from annando/1701-remove-duplicates 
Adding unique indexes should now work with every MySQL flavour
 2017-01-30 08:40:26 +01:00
Michael 7ca809a00e Addind unique indexes should now work with every MySQL flavour 2017-01-29 17:31:20 +00:00
Michael ac88471e55 Make the code nicer 2017-01-29 14:00:44 +00:00
Michael c1eea3771f Bugfix: Sometimes the self contact seems to destroy itself 2017-01-29 13:57:03 +00:00
Michael ae849954cc Bugfix: The SSL policy setting was not respected 2017-01-29 13:50:57 +00:00
Tobias Diekershoff 069dd5b75d Merge pull request #3125 from annando/alternate-pr-3124 
Alternate solution for pull request 3124
 2017-01-28 15:25:30 +01:00
Michael 46ab87a303 Typo fixed 2017-01-28 13:38:18 +00:00
Michael ea22828d37 Alternate solution for pull request 3124 2017-01-28 12:19:04 +00:00
Michael Vogel 8b2c995c3d Merge pull request #3123 from tobiasd/20170128-nodbpwd 
during installation inform user that pwd cannot be blank
 2017-01-28 11:25:55 +01:00
Michael Vogel ffd934c78f Merge pull request #3122 from tobiasd/20170128-allowedthemes 
system -> allowed_themes was not set in htconfig template
 2017-01-28 11:25:29 +01:00
Tobias Diekershoff af699940d4 typo 2017-01-28 11:20:39 +01:00
Tobias Diekershoff 703628cd01 wording 2017-01-28 11:12:31 +01:00
Tobias Diekershoff 4b2f6138a4 smoothly is also allowed 2017-01-28 11:08:05 +01:00
Tobias Diekershoff 83607ff894 enforce them, but inform the user about it 2017-01-28 10:10:35 +01:00
Tobias Diekershoff 334bc7037a don't enfoce non-empty passwords during installation 2017-01-28 10:02:32 +01:00
Tobias Diekershoff 9259feec6f Merge pull request #3121 from annando/1701-bugfix-config 
Issue 3117: Can't store values that are only in the .htconfig.php
 2017-01-28 08:30:22 +01:00
Tobias Diekershoff d6e81117f9 system -> allowed_themes was not set in htconfig template 2017-01-28 08:26:40 +01:00
Michael Vogel 0179bc7f00 Merge pull request #3120 from tobiasd/20170128-editor 
added editorconfig config file
 2017-01-28 07:34:04 +01:00
Michael Vogel 05281a877b Merge pull request #3072 from Hypolite/issue/#3062 
Using placeholder attribute instead of hacky JS
 2017-01-28 07:32:18 +01:00
Tobias Diekershoff 0b5ef73d4a Merge pull request #3119 from annando/1701-bugfix-events 
Bugfix: Avoid duplicated birthday events
 2017-01-28 07:29:29 +01:00
Michael 32b997823f Don't forget the brackets 2017-01-28 06:21:58 +00:00
Michael 82086eea36 Bugfix: When a value was only in the .htconfig.php then it never was stored 2017-01-28 06:18:16 +00:00
Tobias Diekershoff 0342f559c1 added editorconfig config file 2017-01-28 07:15:57 +01:00
Hypolite Petovan c38a5e443d Merge branch 'develop' into issue/#3062 
* develop: (68 commits)
  Added documentation
  update to the translation
  update to the translations
  translation docs now contain basic usage of the Transifex client
  - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
  - Remove misc TinyMCE mentions in docs and minifyjs
  - Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter
  - Remove TinyMCE mentions in themes
  - Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value
  Remove tinyMCE libraries
  limit the description of the meta tag to 160 characters in /mod/display
  Improved handling of non string values in the config
  Bugfix: Caching of non string cache values now works.
  Reformatted stuff, improved query
  Auto-focus first input field of modal when shown
  Use cache instead of config for storing last proc_run time
  Some added logging
  Bugfix for masses of php warnings
  Rearranged the logging
  Some changed logging
  ...

# Conflicts:
#	view/theme/frost-mobile/js/theme.js
#	view/theme/frost/js/theme.js
 2017-01-27 15:30:21 -05:00
Michael Vogel d61a4a67db Merge pull request #3109 from Hypolite/issue/scrap-tinymce 
Scrap TinyMCE
 2017-01-27 21:08:33 +01:00
Michael 5760cfeb94 Added to-do 2017-01-27 19:57:57 +00:00
Michael Vogel 288ad37c3c Merge pull request #3110 from tobiasd/20170127-translationdocs 
translation docs now contain basic usage of the Transifex client
 2017-01-27 18:14:08 +01:00
Michael Vogel 31617eddca Merge pull request #3111 from tobiasd/20170127-lang 
translation updates
 2017-01-27 18:13:16 +01:00
Michael cb0600976d Bugfix: Avoid duplicated birthday events 2017-01-27 17:04:52 +00:00
Tobias Diekershoff 722b18ead7 Merge pull request #3096 from annando/1701-index-again 
Some more index stuff
 2017-01-27 16:52:12 +01:00
Michael 64d06b98b2 Added documentation 2017-01-27 15:13:37 +00:00
Tobias Diekershoff e5f0ba3407 update to the translation 2017-01-27 13:31:51 +01:00
Tobias Diekershoff 4523753455 update to the translations 2017-01-27 13:31:04 +01:00
Tobias Diekershoff 8f59833c51 translation docs now contain basic usage of the Transifex client 2017-01-27 12:39:21 +01:00
Hypolite Petovan bf6d235b26 - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content 2017-01-26 23:04:38 -05:00
Hypolite Petovan 46fe6b1908 - Remove misc TinyMCE mentions in docs and minifyjs 2017-01-26 22:58:25 -05:00
Hypolite Petovan 66482c1d9c - Remove $theme_richtext_editor boot var 
- Remove "richtext" feature
- Remove fix_mce_lf() function
- Remove nomce parameter
 2017-01-26 22:57:53 -05:00