Commit graph

10571 commits

Author SHA1 Message Date
jeroenpraat
105869c524 Images resized to 330pxfor consistency 2014-06-17 14:52:25 +00:00
RedMatrix
8b747d8178 Merge pull request #497 from git-marijus/master
make maximum load average setting work again
2014-06-17 10:52:14 +10:00
friendica
70b99ee23b more tweaks 2014-06-16 17:37:13 -07:00
friendica
27eae40707 Merge https://github.com/friendica/red into pending_merge 2014-06-16 17:35:28 -07:00
friendica
092c258b51 consistency 2014-06-16 17:35:11 -07:00
jeroenpraat
6e7bba046d Merge branch 'master' of https://github.com/friendica/red 2014-06-16 22:57:33 +00:00
jeroenpraat
b7f9a70be7 Update nl / Dark schema: Some minor, but important fixes 2014-06-16 22:55:29 +00:00
friendica
a868da6c07 project homepage tweaks 2014-06-16 15:55:20 -07:00
marijus
e6a655bde4 make maximum load average setting work again 2014-06-16 22:52:23 +02:00
RedMatrix
12726c4c3b Merge pull request #496 from tonybaldwin/master
added QR code instruction
2014-06-17 06:47:26 +10:00
marijus
580c827cde adjust expand/collapse speed to match jquery default 2014-06-16 21:13:11 +02:00
marijus
4b1625dd16 animate show/hide comments 2014-06-16 20:51:00 +02:00
jeroenpraat
349e5d45ec Cleaned out/updated images dir. So that we don't mix the old colour red with the new colour with. / Updated util/messages.po 2014-06-16 18:14:05 +00:00
jeroenpraat
b18d48b01b update nl 2014-06-16 17:47:06 +00:00
jeroenpraat
41fe3543c9 Hashlogo the same size as before (width 450px was still in home.html). Added svg and light text version for dark backgrount) 2014-06-16 17:39:13 +00:00
tony baldwin
3336db5006 added QR code instruction 2014-06-16 07:48:44 -04:00
friendica
4e689f875a add assets 2014-06-16 01:49:58 -07:00
friendica
02825f597f remove overflow property on banner 2014-06-16 01:32:23 -07:00
friendica
38e0bb4530 document why this works 2014-06-15 19:25:16 -07:00
friendica
e1ec1e7c5f sort out the unobscure mess 2014-06-15 19:21:32 -07:00
friendica
0e4a28678d Merge https://github.com/friendica/red into pending_merge 2014-06-15 18:58:26 -07:00
friendica
72f00d6e04 issues with editing webpage permissions 2014-06-15 18:58:02 -07:00
Paolo T
e2a0778e08 Merge pull request #495 from tuscanhobbit/master
IT: updated strings
2014-06-15 20:53:00 +02:00
tuscanhobbit
c566668d7e IT: updated strings 2014-06-15 20:51:35 +02:00
marijus
0b4e1715de move hide-comments to center and change its appearence a little 2014-06-15 16:00:27 +02:00
friendica
2d6a1795b7 ensure item_private tracks acl fields on edit 2014-06-15 02:32:12 -07:00
friendica
0f6c321e3f only show jotnets when posting conversation items 2014-06-14 20:16:40 -07:00
friendica
b67c8ec8b9 webpage permissions weirdness 2014-06-14 16:35:38 -07:00
friendica
794cded66e Merge https://github.com/friendica/red into pending_merge 2014-06-14 15:13:53 -07:00
friendica
ca78adb0c0 rev update 2014-06-14 15:13:38 -07:00
friendica
3714bdfc54 Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master 2014-06-14 15:12:16 -07:00
RedMatrix
c97aa4504e Merge pull request #494 from git-marijus/master
unclutter menus a little
2014-06-15 08:09:26 +10:00
marijus
c80cf61a9b no need to have this twice 2014-06-14 23:10:48 +02:00
marijus
b7b8303f8d fix active state 2014-06-14 15:49:57 +02:00
marijus
bd06e58007 whitespace 2014-06-14 15:38:44 +02:00
marijus
b9256eed30 unclutter menues a little 2014-06-14 15:31:36 +02:00
pixelroot
aea19a5b3a modified: view/ru/strings.php 2014-06-14 15:14:07 +02:00
pixelroot
7f4516d747 modified: .htaccess
modified:   view/ru/strings.php
2014-06-14 14:34:17 +02:00
RedMatrix
9ac236d57d Merge pull request #491 from pixelroot/master
modified:   view/ru/messages.po
2014-06-14 21:49:58 +10:00
pixelroot
6a307f0db1 modified: view/ru/messages.po
modified:   view/ru/strings.php
2014-06-14 10:20:57 +02:00
RedMatrix
651f8c3dba Merge pull request #489 from pixelroot/master
modified:   view/ru/messages.po
2014-06-14 17:35:39 +10:00
pixelroot
39418fc35b modified: view/ru/messages.po
modified:   view/ru/strings.php
2014-06-14 09:25:01 +02:00
friendica
64a370056c load main.js last 2014-06-13 17:33:03 -07:00
friendica
b5ea259666 try to force the update mode to fix the "starting up browser, quickly loads page 2 at the beginning" bug 2014-06-13 05:38:00 -07:00
friendica
4c743b0e15 Merge https://github.com/friendica/red into pending_merge 2014-06-12 17:32:06 -07:00
friendica
78609e9363 send new connection notification even if auto-perms are set 2014-06-12 17:31:42 -07:00
RedMatrix
0c51aae768 Merge pull request #486 from pixelroot/master
modified:   view/ru/messages.po
2014-06-13 09:30:35 +10:00
RedMatrix
7bcd7ccb6e Merge pull request #487 from solstag/master
update pt-br translation
2014-06-13 09:30:20 +10:00
Alexandre Hannud Abdo
01a0fec2c7 update pt-br translation 2014-06-12 13:02:54 -03:00
pixelroot
0d33b03633 modified: view/ru/messages.po
modified:   view/ru/strings.php
2014-06-12 16:30:58 +02:00