Commit graph

10861 commits

Author SHA1 Message Date
friendica
c4c1c37bd3 profile likes 2014-06-22 22:16:26 -07:00
friendica
535aa28526 Merge https://github.com/friendica/red into pending_merge 2014-06-22 17:34:27 -07:00
friendica
3078eeaa69 give the admin a link to view channels from the channel admin page 2014-06-22 17:33:31 -07:00
friendica
eb31d61a26 when an admin censors a channel, we only need to notify the directory and not all the connections. 2014-06-22 17:26:05 -07:00
friendica
1dacfb375e honour the admin censored flag in the directory, and some slow progress on extended likes 2014-06-22 17:15:42 -07:00
Paolo T
1c432e4c49 Merge pull request #500 from tuscanhobbit/master
IT: strings updated
2014-06-22 19:55:31 +02:00
tuscanhobbit
35494c9e27 IT: strings updated 2014-06-22 19:54:07 +02:00
Thomas Willingham
388872949e Merge branch 'master' of https://github.com/friendica/red 2014-06-22 18:00:23 +01:00
Thomas Willingham
b47ff712de Minor doco 2014-06-22 18:00:04 +01:00
friendica
301c7cdb89 Merge https://github.com/friendica/red into pending_merge 2014-06-22 03:40:27 -07:00
friendica
a0747799fc likes table for liking things besides posts and comments 2014-06-22 03:39:43 -07:00
RedMatrix
729645e80e Merge pull request #499 from dawnbreak/master
Add HTML5 datalist to edit photo album field.
2014-06-22 19:07:10 +10:00
Klaus Weidenbach
2504d4c2a2 Add HTML5 datalist to edit photo album field.
This patch provides a datalist for the edit photo album field.
This makes it easier to move a picture to another existing folder in
the way that it provides a list of all available albums as values for
the album field.
2014-06-22 01:33:13 +02:00
friendica
a175c7dba7 Merge https://github.com/friendica/red into pending_merge 2014-06-21 16:04:30 -07:00
friendica
5968bc7f86 moods not working in other languages + doc updates 2014-06-21 16:04:00 -07:00
Klaus
78fd496638 correct a tiny syntax error
there was a space missing between two values
2014-06-22 00:58:53 +02:00
friendica
14a6a27213 limited progress in providing a POST option to shredder, back to auth signature mismatches again, likely a quoting issue 2014-06-19 21:52:49 -07:00
friendica
525daa7475 fix space around brackets changing. 2014-06-19 20:38:38 -07:00
friendica
00904d4994 cleanup 2014-06-19 16:09:02 -07:00
RedMatrix
4c0b8bc637 Merge pull request #498 from solstag/perms_pending
Implements a new permission level PERMS_PENDING
2014-06-20 08:57:21 +10:00
Alexandre Hannud Abdo
b20887995a Implements a new permission level PERMS_PENDING
With this a user can allow some action to any user which connects
to them, even before they've connected back.

Ref.
https://mobiliza.org.br/display/478d9e71eaf55748dc646d3990651d6d34cfb7db5c38360538ec730ca3ccf908@zothub.com

Also some code cleanup and an alternative logic for handling
notifications of permission changes in zot.php.

This assumes that private posts are still restricted to people in
your addressbook. Regardless of your global permissions, a
pending channel won't get private posts, even if the post
only has a deny clause not matching the pending channel.
2014-06-19 15:13:32 -03:00
friendica
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).
But you can now do something like
	for a in `util/shredder/shredder -c red/photos -q album=2013 | jshon -e photos -a -e src` ; do wget $a; done
and download all the photos in your 2013 album
2014-06-18 22:33:28 -07:00
friendica
224a2b9ddf put viewsrc back in a lightbox 2014-06-18 20:33:28 -07:00
friendica
5a0e135679 stylistic improvements to the suggestions page 2014-06-18 18:57:01 -07:00
friendica
88bb3c9ddb reset timestamps when unarchiving a connection 2014-06-18 18:29:04 -07:00
friendica
ecbbd66e8f You'll need these to build jshon - warning these are typically blocked by .gitignore 2014-06-18 17:19:44 -07:00
friendica
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". 2014-06-18 17:04:19 -07:00
friendica
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. 2014-06-18 16:26:27 -07:00
friendica
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. 2014-06-18 15:53:26 -07:00
friendica
476675e211 get rid of some old crap 2014-06-17 21:51:20 -07:00
friendica
ba56469d82 Merge https://github.com/friendica/red into pending_merge 2014-06-17 20:46:16 -07:00
friendica
8b66329a8f add photo count to photo album list 2014-06-17 20:45:53 -07:00
Thomas Willingham
ccb17972ab Doco - update external resources 2014-06-18 03:38:29 +01:00
friendica
35d42f8626 access control modification functions (item specific - we may need these for several data types) 2014-06-17 19:21:46 -07:00
friendica
6c1304c000 Merge https://github.com/friendica/red into pending_merge 2014-06-17 17:36:58 -07:00
friendica
5c8359f976 note work still remaining 2014-06-17 17:36:41 -07:00
friendica
dafd3a9e43 sync profiles to nomadic clones 2014-06-17 17:34:51 -07:00
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