volse-hubzilla.git - Volse Hubzilla -- soft fork of main Hubzilla core for Volse

	Commit message (Collapse)	Author	Age	Files	Lines
*	move code out of templates - not sure how this even worked.	friendica	2014-07-03	1	-9/+9
\|
*	Red Matrix default instead of global default. Is more clear. Update nl to ↵	jeroenpraat	2014-07-02	3	-6056/+5857
\| \| \| \|	99%. Update util/messages.po
*	Merge branch 'master' of https://github.com/friendica/red	jeroenpraat	2014-07-02	3	-6074/+5878
\|\
\| *	Merge pull request #525 from tuscanhobbit/master	Paolo T	2014-07-02	2	-6074/+5875
\| \|\ \| \| \| \| \| \|	IT: strings updated
\| \| *	IT: strings updated	Paolo Tacconi	2014-07-02	2	-6074/+5875
\| \| \|
\| * \|	minor adjustments	friendica	2014-07-01	1	-0/+3
\| \| \|
* \| \|	Changed Default to Light (global default). So if hub owners want to change ↵	jeroenpraat	2014-07-02	1	-1/+1
\|/ / \| \| \| \| \| \|	the default, they don't get two defaults. Please revert when not needed/wanted.
* \|	fix 1 error in nl that somehow sneaked in	jeroenpraat	2014-07-01	2	-3/+3
\| \|
* \|	update/approve nl to 98%git status	jeroenpraat	2014-07-01	2	-99/+99
\| \|
* \|	update nl	jeroenpraat	2014-07-01	2	-117/+117
\| \|
* \|	Merge pull request #520 from pixelroot/master	RedMatrix	2014-07-01	2	-694/+769
\|\ \ \| \| \| \| \| \|	Updated Russian translation
\| * \|	Updated Russian translation	pixelroot	2014-06-30	2	-694/+769
\| \| \|
* \| \|	Merge pull request #521 from tuscanhobbit/master	RedMatrix	2014-07-01	1	-22/+30
\|\ \ \ \| \| \|/ \| \|/\|	Changed the lock icon behaviour
\| * \|	Changed the lock icon behaviour	Paolo Tacconi	2014-06-30	1	-22/+30
\| \| \|
* \| \|	update nl	jeroenpraat	2014-06-30	2	-35/+35
\| \| \|
* \| \|	update nl	jeroenpraat	2014-06-29	2	-566/+641
\| \| \|
* \| \|	Merge pull request #516 from dawnbreak/master	RedMatrix	2014-06-30	1	-14/+9
\|\ \ \ \| \| \| \| \| \| \| \|	Fixed a wrong timestamp update when adding a file.
\| * \| \|	Fixed some more timestamp bugs in RedDAV.	Klaus Weidenbach	2014-06-29	1	-14/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed an SQL-query in RedFile::put(), where parameters where in wrong order.
* \| \| \|	Remove Remove Account link from account settings	Christian Vogeley	2014-06-29	2	-4/+4
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	because it doesn’t remove the account. Move channel removal link to channel page
* \| \|	Merge pull request #515 from tuscanhobbit/master	Paolo T	2014-06-29	2	-488/+563
\|\\| \| \| \| \| \| \| \|	IT:updated strings
\| * \|	IT:updated strings	tuscanhobbit	2014-06-29	2	-488/+563
\| \| \|
* \| \|	Merge pull request #513 from dawnbreak/master	RedMatrix	2014-06-29	1	-0/+23
\|\ \ \ \| \| \| \| \| \| \| \|	Some documentation for include/reddav.php and a new tpl-file.
\| * \| \|	Some documentation for include/reddav.php and a new tpl-file.	Klaus Weidenbach	2014-06-29	1	-0/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documented include/reddav.php a bit more to understand what it is about to try to clean up some parts. Still a lot to be done here. I put serveral @todo markers that need to be checked. Moved some more HTML to template file. Changed getETag() return format according to documentation. (ETag MUST be surrounded by double-quotes)
* \| \| \|	Merge pull request #514 from tuscanhobbit/master	RedMatrix	2014-06-29	4	-37/+27
\|\ \ \ \ \| \|/ / / \|/\| / / \| \|/ /	Checkboxes were not aligned in connedit, added a table and removed orphaned filestorage.tpl
\| * \|	Checkboxes were not aligned in connedit, added a table	tuscanhobbit	2014-06-28	4	-37/+27
\| \| \|
* \| \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-06-26	2	-1947/+1939
\|\ \ \
\| * \| \|	update nl	jeroenpraat	2014-06-27	2	-1947/+1939
\| \| \| \|
* \| \| \|	still trying to sort out the liveupdate issues. This was getting overly ↵	friendica	2014-06-26	1	-31/+20
\|/ / / \| \| \| \| \| \| \| \| \|	complicated with all the different ways we've tried to fix this issue so let's step back and simplify it a bit.
* \| \|	make it a div to prevent extra borders in some browsers after click	marijus	2014-06-26	1	-0/+4
\| \| \|
* \| \|	Templified cloud's directory listing.	Klaus Weidenbach	2014-06-26	1	-0/+48
\|/ / \| \| \| \| \| \| \| \| \| \|	Moved HTML for the directory listing from include/reddav.php to it's own template file. Still need to clean it up bit more, but should be useable already.
* \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-06-24	5	-5551/+5759
\|\ \
\| * \	Merge pull request #506 from dawnbreak/master	RedMatrix	2014-06-25	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \|	Set backlink to the parent folder, not cloud's root.
\| \| * \|	Set backlink to the parent folder, not cloud's root.	Klaus Weidenbach	2014-06-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If you edit a file and click on the backlink you always returned to the root folder of your cloud. This patch sets the correct parent folder as backlink. Bit messy, but looks like it works.
\| * \| \|	Merge pull request #504 from HaakonME/master	RedMatrix	2014-06-25	2	-5540/+5748
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Updated Norwegian bokmål translation
\| \| * \|	Updated Norwegian bokmål translation	Haakon Meland Eriksen	2014-06-24	2	-5540/+5748
\| \| \| \|
\| * \| \|	IT: updated strings & fixed readme img link	tuscanhobbit	2014-06-24	2	-10/+10
\| \|/ /
\| * \|	Fixes to links and forward URLs in filestorage	tuscanhobbit	2014-06-24	1	-1/+1
\| \| \|
* \| \|	Events show up as notifications about a week in advance so you know they're ↵	friendica	2014-06-24	1	-4/+4
\|/ / \| \| \| \| \| \|	coming. But let's put an indicator next to the notification count when there's an event that is actually happening today -- so you don't have to look at the calendar or notification detail every day for a week to figure out if the day has finally arrived yet.
* \|	Merge pull request #501 from pixelroot/master	RedMatrix	2014-06-24	2	-1723/+1714
\|\\| \| \| \| \|	modified: view/ru/messages.po
\| *	modified: view/ru/messages.po	pixelroot	2014-06-23	2	-1723/+1714
\| \| \| \| \| \| \| \|	modified: view/ru/strings.php
* \|	move the reset of "in_progress" to after the page and structures have ↵	friendica	2014-06-23	1	-1/+2
\| \| \| \| \| \| \| \|	completed updating
* \|	ability to like things	friendica	2014-06-23	3	-3/+24
\|/
*	profile likes	friendica	2014-06-22	3	-0/+34
\|
*	Merge https://github.com/friendica/red into pending_merge	friendica	2014-06-22	2	-1669/+1661
\|\
\| *	Merge pull request #500 from tuscanhobbit/master	Paolo T	2014-06-22	2	-1669/+1661
\| \|\ \| \| \| \| \| \|	IT: strings updated
\| \| *	IT: strings updated	tuscanhobbit	2014-06-22	2	-1669/+1661
\| \| \|
* \| \|	give the admin a link to view channels from the channel admin page	friendica	2014-06-22	1	-1/+1
\|/ /
* \|	Add HTML5 datalist to edit photo album field.	Klaus Weidenbach	2014-06-22	1	-14/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \|	correct a tiny syntax error	Klaus	2014-06-22	1	-3/+1
\| \| \| \| \| \|	there was a space missing between two values
* \|	Implements a new permission level PERMS_PENDING	Alexandre Hannud Abdo	2014-06-19	1	-72/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.