Hypolite Petovan
|
be7041c3e0
|
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
|
2017-02-15 22:00:02 -05:00 |
|
fabrixxm
|
2536bd4f56
|
Merge pull request #3153 from tobiasd/20170208-quattroembedvideo
remove float left to fix issue 2987 in quattro theme
|
2017-02-08 09:34:28 +01:00 |
|
Tobias Diekershoff
|
e223fee40d
|
remove float left to fix issue 2987 in quattro theme
|
2017-02-08 07:21:19 +01:00 |
|
Tobias Diekershoff
|
c574bc5538
|
Merge pull request #3151 from rabuzarus/20170203_-_frio_fix_tabbar_glitch
Bugfix: frio - fix tabbar on mobile view
|
2017-02-08 06:35:15 +01:00 |
|
Tobias Diekershoff
|
3adbbd6689
|
Merge pull request #3152 from rabuzarus/20170208_-_fix_oembed_video_floating
Bugfix: for "embedded videos are cut off" #2987
|
2017-02-08 06:33:44 +01:00 |
|
rabuzarus
|
d27c8f4932
|
fix oembeded video floating
|
2017-02-08 02:18:42 +01:00 |
|
rabuzarus
|
60ef105a14
|
frio - fix tabbar on mobile view
|
2017-02-08 01:34:36 +01:00 |
|
Tobias Diekershoff
|
3c5f7e457a
|
Merge pull request #3149 from annando/1601-new-diaspora-mention
Support for the new Diaspora mention format
|
2017-02-05 16:38:09 +01:00 |
|
Michael
|
e9d719a299
|
removed to-do
|
2017-02-05 07:02:20 +00:00 |
|
Michael
|
9f706fcfbb
|
Add include
|
2017-02-04 22:27:49 +00:00 |
|
Michael
|
0d1f88033b
|
Support for the new Diaspora mention format
|
2017-02-04 22:22:12 +00:00 |
|
Tobias Diekershoff
|
2092fa03b2
|
Merge pull request #3147 from rebeka-catalina/vier_dark_item_links
Vier dark item links
|
2017-02-03 20:28:39 +01:00 |
|
Tobias Diekershoff
|
efc25f744a
|
Merge pull request #3148 from rabuzarus/20170203_-_frio_fix_tabbar_glitch
Bugfix: frio - the tabbar should be hidden if it is a dirict child of the section element
|
2017-02-03 20:28:23 +01:00 |
|
rabuzarus
|
7f1acdb8e9
|
frio - append tabbar to nav only if it's a direct child of section
|
2017-02-03 19:37:47 +01:00 |
|
rabuzarus
|
c12850250d
|
Bugfix: frio - move tabs to the top of the contacts-template
|
2017-02-03 19:18:10 +01:00 |
|
rebeka-catalina
|
39da1f1d03
|
Update dark.css
|
2017-02-03 19:07:39 +01:00 |
|
rabuzarus
|
a71f7aefbb
|
Bugfix: frio - the tabbar should be hidden if it is in the section element
|
2017-02-03 19:00:55 +01:00 |
|
rebeka-catalina
|
2483e7cda7
|
Make links visually different from normal text
|
2017-02-03 19:00:04 +01:00 |
|
Michael Vogel
|
2c71d307c8
|
Merge pull request #3141 from tobiasd/20170201-htconfig
make sure all config done with the installer is represented in the emergency backup template as well
|
2017-02-02 09:40:05 +01:00 |
|
Tobias Diekershoff
|
adedf18b30
|
Merge pull request #3146 from annando/1701-pnut
Preparation to add the social network "pnut"
|
2017-02-02 09:10:28 +01:00 |
|
Michael
|
275a1c6574
|
Preparation to add the social network "pnut"
|
2017-02-02 06:06:23 +00:00 |
|
Tobias Diekershoff
|
2f00683b77
|
Merge pull request #3144 from annando/bugfix-index
Bugfix: An index was missing
|
2017-02-01 22:34:11 +01:00 |
|
Michael
|
8a75a20d26
|
Bugfix: An index was missing
|
2017-02-01 21:08:13 +00:00 |
|
Tobias Diekershoff
|
39136b6485
|
Merge pull request #3143 from annando/develop
Bugfix for pull request 3125
|
2017-02-01 16:33:48 +01:00 |
|
Michael
|
da30538a98
|
Bugfix for pull request 3125
|
2017-02-01 13:50:05 +00:00 |
|
Tobias Diekershoff
|
94694aae86
|
RInO is not true / false anymore
|
2017-02-01 08:45:13 +01:00 |
|
Tobias Diekershoff
|
a9b3c6d9d7
|
make sure all config done with the installer is represented in the emergency backup template as well
|
2017-02-01 08:26:22 +01:00 |
|
Tobias Diekershoff
|
bf7314e46e
|
Revert "make sure all config done with the installer is represented in the emergency backup template as well"
This reverts commit d78201cf50.
|
2017-02-01 08:24:51 +01:00 |
|
Tobias Diekershoff
|
d78201cf50
|
make sure all config done with the installer is represented in the emergency backup template as well
|
2017-02-01 08:23:41 +01: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 |
|