Commit Graph

Select branches

Hide Pull Requests

3.6RC

CAPTHA

develop

japanese

master

origin

0.10

0.11

0.8

0.9

1.0

1.1

1.10

1.12

1.14

1.14.2

1.2

1.3

1.3.1

1.4

1.6

1.8

2.0

2.2

2.4

2.4.2

2.6

2.6.1

2.6.2

2.6.3

2.8

2.8.1

3.0

3.0.1

3.2

3.2.1

3.2.2

3.4

3.4.1

3.4.2

3.6

3.6.1

Mono Color

• b47ff712de Minor doco Thomas Willingham 2014-06-22 18:00:04 +01:00
• 301c7cdb89 Merge https://github.com/friendica/red into pending_merge friendica 2014-06-22 03:40:27 -07:00
• a0747799fc likes table for liking things besides posts and comments friendica 2014-06-22 03:39:43 -07:00
• 729645e80e Merge pull request #499 from dawnbreak/master RedMatrix 2014-06-22 19:07:10 +10:00
• 2504d4c2a2 Add HTML5 datalist to edit photo album field. Klaus Weidenbach 2014-06-22 01:03:48 +02:00
• a175c7dba7 Merge https://github.com/friendica/red into pending_merge friendica 2014-06-21 16:04:30 -07:00
• 5968bc7f86 moods not working in other languages + doc updates friendica 2014-06-21 16:04:00 -07:00
• 78fd496638 correct a tiny syntax error Klaus 2014-06-22 00:58:53 +02:00
• 14a6a27213 limited progress in providing a POST option to shredder, back to auth signature mismatches again, likely a quoting issue friendica 2014-06-19 21:52:49 -07:00
• 525daa7475 fix space around brackets changing. friendica 2014-06-19 20:38:38 -07:00
• 00904d4994 cleanup friendica 2014-06-19 16:09:02 -07:00
• 4c0b8bc637 Merge pull request #498 from solstag/perms_pending RedMatrix 2014-06-20 08:57:21 +10:00
• b20887995a Implements a new permission level PERMS_PENDING Alexandre Hannud Abdo 2014-06-17 04:26:18 -03:00
• c012c648e0 wherein I revive some of my 30+year old shell scripting skills so that we can process arbitrary api endpoints which generate arbitrary json and be able to crunch all of these on the command line. Getting the arbitrary query arguments into a form where they could be signed as part of the oauth packet was a challenge. (It still might be - I haven't tried querying any Chinese photo album names yet). friendica 2014-06-18 22:29:04 -07:00
• 224a2b9ddf put viewsrc back in a lightbox friendica 2014-06-18 20:33:28 -07:00
• 5a0e135679 stylistic improvements to the suggestions page friendica 2014-06-18 18:57:01 -07:00
• 88bb3c9ddb reset timestamps when unarchiving a connection friendica 2014-06-18 18:29:04 -07:00
• ecbbd66e8f You'll need these to build jshon - warning these are typically blocked by .gitignore friendica 2014-06-18 17:19:44 -07:00
• dd042f4f09 Turns out Linux has a shred command in /usr/bin and its purpose is to over-write files so we don't want to invoke it accidentally. So as not to cause confusion and issues we will rename ours to "shredder". Aussies are of course allowed to alias this to "shredda". friendica 2014-06-18 17:04:19 -07:00
• c16b403cf7 oh this is nice... http://kmkeen.com/jshon - this is what we need to make shred -- well "shred". I also had to change the photos album list API a bit to fix any imagined and/or real parsing issues and also fixed shred so it can find its auxiliary files. friendica 2014-06-18 16:26:27 -07:00
• 80d84206ed now we should be able to remove the function check. Revert if live updates or page loads go weird. I've tested, but it went weird on me last time I tried this a week or so ago so I'm crossing fingers. friendica 2014-06-18 15:53:26 -07:00
• 476675e211 get rid of some old crap friendica 2014-06-17 21:51:20 -07:00
• ba56469d82 Merge https://github.com/friendica/red into pending_merge friendica 2014-06-17 20:46:16 -07:00
• 8b66329a8f add photo count to photo album list friendica 2014-06-17 20:45:53 -07:00
• ccb17972ab Doco - update external resources Thomas Willingham 2014-06-18 03:38:29 +01:00
• 35d42f8626 access control modification functions (item specific - we may need these for several data types) friendica 2014-06-17 19:21:46 -07:00
• 6c1304c000 Merge https://github.com/friendica/red into pending_merge friendica 2014-06-17 17:36:58 -07:00
• 5c8359f976 note work still remaining friendica 2014-06-17 17:36:41 -07:00
• dafd3a9e43 sync profiles to nomadic clones friendica 2014-06-17 17:34:51 -07:00
• 105869c524 Images resized to 330pxfor consistency jeroenpraat 2014-06-17 14:52:25 +00:00
• 8b747d8178 Merge pull request #497 from git-marijus/master RedMatrix 2014-06-17 10:52:14 +10:00
• 70b99ee23b more tweaks friendica 2014-06-16 17:37:13 -07:00
• 27eae40707 Merge https://github.com/friendica/red into pending_merge friendica 2014-06-16 17:35:28 -07:00
• 092c258b51 consistency friendica 2014-06-16 17:35:11 -07:00
• 6e7bba046d Merge branch 'master' of https://github.com/friendica/red jeroenpraat 2014-06-16 22:57:33 +00:00
• b7f9a70be7 Update nl / Dark schema: Some minor, but important fixes jeroenpraat 2014-06-16 22:55:29 +00:00
• a868da6c07 project homepage tweaks friendica 2014-06-16 15:55:20 -07:00
• e6a655bde4 make maximum load average setting work again marijus 2014-06-16 22:52:23 +02:00
• 12726c4c3b Merge pull request #496 from tonybaldwin/master RedMatrix 2014-06-17 06:47:26 +10:00
• 580c827cde adjust expand/collapse speed to match jquery default marijus 2014-06-16 21:13:11 +02:00
• 4b1625dd16 animate show/hide comments marijus 2014-06-16 20:51:00 +02:00
• 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 jeroenpraat 2014-06-16 18:14:05 +00:00
• b18d48b01b update nl jeroenpraat 2014-06-16 17:47:06 +00:00
• 41fe3543c9 Hashlogo the same size as before (width 450px was still in home.html). Added svg and light text version for dark backgrount) jeroenpraat 2014-06-16 17:39:13 +00:00
• 3336db5006 added QR code instruction tony baldwin 2014-06-16 07:48:44 -04:00
• 4e689f875a add assets friendica 2014-06-16 01:49:58 -07:00
• 02825f597f remove overflow property on banner friendica 2014-06-16 01:32:23 -07:00
• 38e0bb4530 document why this works friendica 2014-06-15 19:25:16 -07:00
• e1ec1e7c5f sort out the unobscure mess friendica 2014-06-15 19:21:32 -07:00
• 0e4a28678d Merge https://github.com/friendica/red into pending_merge friendica 2014-06-15 18:58:26 -07:00
• 72f00d6e04 issues with editing webpage permissions friendica 2014-06-15 18:58:02 -07:00
• e2a0778e08 Merge pull request #495 from tuscanhobbit/master Paolo T 2014-06-15 20:53:00 +02:00
• c566668d7e IT: updated strings tuscanhobbit 2014-06-15 20:51:35 +02:00
• 0b4e1715de move hide-comments to center and change its appearence a little marijus 2014-06-15 16:00:27 +02:00
• 2d6a1795b7 ensure item_private tracks acl fields on edit friendica 2014-06-15 02:32:12 -07:00
• 0f6c321e3f only show jotnets when posting conversation items friendica 2014-06-14 20:16:40 -07:00
• b67c8ec8b9 webpage permissions weirdness friendica 2014-06-14 16:35:38 -07:00
• 794cded66e Merge https://github.com/friendica/red into pending_merge friendica 2014-06-14 15:13:53 -07:00
• ca78adb0c0 rev update friendica 2014-06-14 15:13:38 -07:00
• 3714bdfc54 Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master friendica 2014-06-14 15:12:16 -07:00
• c97aa4504e Merge pull request #494 from git-marijus/master RedMatrix 2014-06-15 08:09:26 +10:00
• c80cf61a9b no need to have this twice marijus 2014-06-14 23:10:48 +02:00
• b7b8303f8d fix active state marijus 2014-06-14 15:49:57 +02:00
• bd06e58007 whitespace marijus 2014-06-14 15:38:44 +02:00
• b9256eed30 unclutter menues a little marijus 2014-06-14 15:31:36 +02:00
• aea19a5b3a modified: view/ru/strings.php pixelroot 2014-06-14 15:14:07 +02:00
• 7f4516d747 modified: .htaccess modified: view/ru/strings.php pixelroot 2014-06-14 14:34:17 +02:00
• 9ac236d57d Merge pull request #491 from pixelroot/master RedMatrix 2014-06-14 21:49:58 +10:00
• 6a307f0db1 modified: view/ru/messages.po modified: view/ru/strings.php pixelroot 2014-06-14 10:20:57 +02:00
• 651f8c3dba Merge pull request #489 from pixelroot/master RedMatrix 2014-06-14 17:35:39 +10:00
• 39418fc35b modified: view/ru/messages.po modified: view/ru/strings.php pixelroot 2014-06-14 09:25:01 +02:00
• 64a370056c load main.js last friendica 2014-06-13 17:33:03 -07:00
• b5ea259666 try to force the update mode to fix the "starting up browser, quickly loads page 2 at the beginning" bug friendica 2014-06-13 05:38:00 -07:00
• 4c743b0e15 Merge https://github.com/friendica/red into pending_merge friendica 2014-06-12 17:32:06 -07:00
• 78609e9363 send new connection notification even if auto-perms are set friendica 2014-06-12 17:31:42 -07:00
• 0c51aae768 Merge pull request #486 from pixelroot/master RedMatrix 2014-06-13 09:30:35 +10:00
• 7bcd7ccb6e Merge pull request #487 from solstag/master RedMatrix 2014-06-13 09:30:20 +10:00
• 01a0fec2c7 update pt-br translation Alexandre Hannud Abdo 2014-06-12 13:02:54 -03:00
• 0d33b03633 modified: view/ru/messages.po modified: view/ru/strings.php pixelroot 2014-06-12 16:30:58 +02:00
• b05eca295b Merge branch 'master' of https://github.com/friendica/red marijus 2014-06-12 15:23:59 +02:00
• 822358adca add hover effect to expand/collaps marijus 2014-06-12 15:23:48 +02:00
• 3e20a0d784 update nl / dark schema: fixed prev/next buttons connections page and directory / same css layout for those buttons jeroenpraat 2014-06-11 14:32:57 +00:00
• 4a4281448f move expand/collapse to the center marijus 2014-06-11 10:04:51 +02:00
• de31ba5432 update nl jeroenpraat 2014-06-11 07:09:35 +00:00
• 4593472638 oops that's hex not decimal friendica 2014-06-10 23:00:37 -07:00
• 3dfcfbf85c issue #433 friendica 2014-06-10 22:35:15 -07:00
• 13ba9ef003 merge the app menus friendica 2014-06-10 21:21:50 -07:00
• e41375c889 syntax error friendica 2014-06-10 17:23:32 -07:00
• adbcf371f9 should really wait until after the first cuppa friendica 2014-06-10 16:40:55 -07:00
• 40c03c642e Merge https://github.com/friendica/red into pending_merge friendica 2014-06-10 16:34:52 -07:00
• 059ccae278 remote install app (untested) friendica 2014-06-10 16:34:21 -07:00
• 31d19efd1f update nl - there was an odd syntax error in strings.php jeroenpraat 2014-06-10 21:39:59 +00:00
• c5c57b865f Update nl jeroenpraat 2014-06-10 21:26:17 +00:00
• 31dce02701 Update nl jeroenpraat 2014-06-10 21:23:46 +00:00
• 970c82faa3 notify tweaks friendica 2014-06-09 19:07:15 -07:00
• 0fb8234693 allow rpost to take a channel argument (the channel nickname) and change channel to that if it's valid friendica 2014-06-09 16:57:01 -07:00
• f7c4ae7d1d Merge https://github.com/friendica/red into pending_merge friendica 2014-06-09 16:06:39 -07:00
• 04aed393e9 post app friendica 2014-06-09 16:06:24 -07:00
• c802a6cd71 update nl jeroenpraat 2014-06-09 18:26:40 +00:00
• 3e04e2313d update nl jeroenpraat 2014-06-09 18:24:52 +00:00