rabuzarus
|
036c18be7b
|
use height: 0 instead of display: none to hide jot sections
|
2017-04-03 13:38:07 +02:00 |
|
rabuzarus
|
68659c7740
|
add missing overflow to css
|
2017-04-03 12:55:06 +02:00 |
|
rabuzarus
|
4dfdbeba54
|
fix max-height for screens bigger than 768px
|
2017-04-03 12:46:31 +02:00 |
|
rabuzarus
|
80f5a026be
|
re-enabel browser for small screens
|
2017-04-03 02:04:13 +02:00 |
|
rabuzarus
|
ee293f2ce2
|
Merge develop into 20170321_-_frio-fbbrowser
Conflicts:
view/theme/frio/js/filebrowser.js
view/theme/frio/js/theme.js
view/theme/frio/templates/filebrowser.tpl
view/theme/frio/templates/jot.tpl
|
2017-04-03 00:51:34 +02:00 |
|
rabuzarus
|
1ce5cc1b49
|
Merge pull request #3204 from Hypolite/improvement/frio-action-links-to-buttons
Frio: Turn action links into buttons
|
2017-04-02 23:15:57 +02:00 |
|
Michael Vogel
|
d9451ef969
|
Merge pull request #3279 from Hypolite/improvement/add-composer
Add Composer
|
2017-04-02 14:57:37 +02:00 |
|
Hypolite Petovan
|
6a5b9dcd76
|
Merge pull request #3283 from annando/issue-2957-2
Issue 2957: The avatar problem with mastodon should now be solved
|
2017-04-02 08:56:35 -04:00 |
|
Hypolite Petovan
|
95a5740229
|
Add links to EN pages in DE help
|
2017-04-02 08:54:11 -04:00 |
|
|
|
94f3f0887b
|
Issue 2957: The avatar problem with mastodon should now finally be solved
|
2017-04-02 12:37:22 +00:00 |
|
|
|
ed3aa9fa73
|
Merge pull request #3282 from annando/1704-platform-name
Show real platform names
|
2017-04-02 10:03:57 +02:00 |
|
|
|
54f49169d4
|
Show real platform names
|
2017-04-02 07:53:55 +00:00 |
|
Hypolite Petovan
|
2952e2b3e4
|
Merge pull request #3281 from annando/issue-3206-2957
Mastodon: plink for reshares, missing hostnames for avatars
|
2017-04-01 21:24:28 -04:00 |
|
Hypolite Petovan
|
00577eab2c
|
Add EOF newline to composer.json
|
2017-04-01 21:09:36 -04:00 |
|
|
|
07fd61b912
|
Mastodon: plink for reshares, missing hostnames for avatars
|
2017-04-01 23:39:19 +00:00 |
|
Hypolite Petovan
|
7606ac5e32
|
frio: Fix help pages inline code display
|
2017-04-01 17:58:35 -04:00 |
|
Hypolite Petovan
|
1c276b5cd5
|
Add Composer documentation
|
2017-04-01 17:58:21 -04:00 |
|
Hypolite Petovan
|
7cd795d795
|
Merge pull request #3280 from annando/issue-3142-2
Issue 3142: mcrypt is no more (as well as phpseclib)
|
2017-04-01 14:32:27 -04:00 |
|
|
|
240a0961c6
|
Standards ...
|
2017-04-01 17:08:11 +00:00 |
|
|
|
648d5bd047
|
More mcrypt is removed
|
2017-04-01 10:07:12 +00:00 |
|
|
|
16d4392573
|
Documentation added
|
2017-04-01 09:05:56 +00:00 |
|
|
|
f6d7ee2781
|
Issue 3142: mcrypt is no more (as well as phpseclib)
|
2017-04-01 08:28:42 +00:00 |
|
Hypolite Petovan
|
806368f151
|
Move MobileDetect library to vendor
- Bumped the version to 2.8.25 (from 2.8.11)
|
2017-03-31 23:05:07 -04:00 |
|
Hypolite Petovan
|
799e60aa62
|
Replace existing autoloader with Composer-supplied
- Move Friendica namespace to `src`
- Move required `ezyang/htmlpurifier` to vendor
- Remove existing static autoloader
- Change boot.php reference to the autoloader
|
2017-03-31 23:02:38 -04:00 |
|
Hypolite Petovan
|
cae0543629
|
Composer: Add vendor directry
- Add gitignore to avoid committing libraries' .git folder
|
2017-03-31 22:34:30 -04:00 |
|
Hypolite Petovan
|
8c49a7b68f
|
Add composer.json
|
2017-03-31 22:33:18 -04:00 |
|
Hypolite Petovan
|
c97b1d6c03
|
Add executable composer.phar in util
|
2017-04-01 01:24:10 +02:00 |
|
Hypolite Petovan
|
87aac45230
|
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
|
2017-03-31 19:14:27 -04:00 |
|
Hypolite Petovan
|
d301a363b0
|
Merge pull request #3277 from annando/issue-3142
Replaces mcrypt with phpsec.
|
2017-03-31 11:02:30 -04:00 |
|
|
|
3796a141c6
|
We don't need this include anymore
|
2017-03-31 06:25:48 +00:00 |
|
|
|
1560534621
|
Now it's openssl - and no copy&paste failure anymore
|
2017-03-31 06:22:43 +00:00 |
|
|
|
973fcd3624
|
Test with OpenSSL
|
2017-03-30 23:21:52 +00:00 |
|
|
|
54c8fb2bb8
|
Replaces mcrypt with phpsec.
|
2017-03-30 18:29:12 +00:00 |
|
Hypolite Petovan
|
109f851795
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons
|
2017-03-28 03:14:03 -04:00 |
|
Hypolite Petovan
|
3cb08c7458
|
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
|
2017-03-28 03:12:53 -04:00 |
|
Michael Vogel
|
a4255de1e2
|
Merge pull request #3275 from tobiasd/20170327-es
ES translation THX Albert
|
2017-03-28 06:18:58 +02:00 |
|
Hypolite Petovan
|
bb559aaf30
|
Merge pull request #3276 from annando/issue-2959
Reestablish the communication with Mastodon
|
2017-03-27 23:44:09 -04:00 |
|
Hypolite Petovan
|
ce4eb1deb0
|
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
|
2017-03-27 21:24:24 -04:00 |
|
|
|
4fc1ebd4ea
|
Doing some Hypolyzation
|
2017-03-27 21:02:56 +00:00 |
|
|
|
c85331d8ac
|
Reestablish the communication with Mastodon
|
2017-03-27 20:58:15 +00:00 |
|
|
|
4720778edc
|
ES translation THX Albert
|
2017-03-27 22:06:56 +02:00 |
|
|
|
8580cd87a6
|
Merge pull request #3271 from Hypolite/issue/#3189
Fix Diaspora code blocks being mangled
|
2017-03-27 09:26:39 +02:00 |
|
|
|
0cf000469e
|
Merge pull request #3272 from annando/issue-2364
Only import new OStatus posts if they are from our followers
|
2017-03-27 09:24:41 +02:00 |
|
|
|
fa7721c735
|
Prevent Hypolite from doing comments about standards ;-)
|
2017-03-27 06:11:45 +00:00 |
|
|
|
364d88fa70
|
Only import new OStatus posts if they are from our followers
|
2017-03-27 05:33:43 +00:00 |
|
Hypolite Petovan
|
909439e59f
|
Fix contacts "View" link color
- Fixed whitespaces in `event.tpl`
|
2017-03-26 19:22:19 -04:00 |
|
Hypolite Petovan
|
55e4bab00e
|
Improve babel page display for diaspora2bb mode
- Fix formatting
|
2017-03-26 19:06:22 -04:00 |
|
Hypolite Petovan
|
3e285a690a
|
Fix Diaspora code blocks being mangled
- Remove whitespace removal code from `diaspora2bb()`
- Add code block skipping the HTML transforms removing whitespace in
`htm2bbcode()`
|
2017-03-26 19:00:04 -04:00 |
|
Hypolite Petovan
|
b952b22735
|
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
|
2017-03-26 18:59:32 -04:00 |
|
Hypolite Petovan
|
9dd6998126
|
Merge pull request #3270 from annando/1703-no-spam
The "spam" libary is not in use, so we remove it completely
|
2017-03-26 10:35:42 -04:00 |
|
