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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'dev' into sabre32	Mario Vavti	2016-06-14	11	-75/+101
\|\
\| *	some work to provide propagation and honouring of the item_notshown flag.	redmatrix	2016-06-13	2	-8/+23
\| \|
\| *	missing iconfig conversion	redmatrix	2016-06-13	1	-3/+6
\| \|
\| *	deprecate the item_id table - replace with iconfig. A possibly useful ↵	redmatrix	2016-06-13	10	-65/+73
\| \| \| \| \| \| \| \|	function in the iconfig class would be a search which takes a service id and type and uid, matches against an item and returns the iid. That could save a bit of code duplication.
* \|	Merge branch 'dev' into sabre32	Mario Vavti	2016-06-13	4	-24/+61
\|\\|
\| *	Merge pull request #416 from anaqreon/embedphotos	hubzilla	2016-06-13	1	-0/+12
\| \|\ \| \| \| \| \| \|	Add embed photos button with album browser to new post editor
\| \| *	Merge remote-tracking branch 'upstream/dev' into embedphotos	Andrew Manning	2016-06-12	5	-12/+499
\| \| \|\
\| \| * \|	Stashing changes. Not a functional state.	Andrew Manning	2016-06-09	1	-0/+12
\| \| \| \|
\| * \| \|	DB schema issue with import	redmatrix	2016-06-12	1	-12/+26
\| \| \| \|
\| * \| \|	Apply purify_html to page content before preview and save to prevent ↵	Andrew Manning	2016-06-12	1	-1/+1
\| \| \|/ \| \|/\| \| \| \| \| \| \|	JavaScript code injection.
\| * \|	remove debugging	redmatrix	2016-06-11	1	-1/+0
\| \| \|
\| * \|	Work supporting issue #411, add an optional priority (int) as a second arg ↵	redmatrix	2016-06-11	1	-11/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to head_add_js to affect the load ordering, larger numbered priorities will be included after lower numbered ones. Default priority is 0.Note that we treat main.js differently and always add main.js to the page last, regardless of any other ordering.
* \| \|	Merge branch 'dev' into sabre32	Mario Vavti	2016-06-11	1	-1/+1
\|\\| \|
\| * \|	iconfig sharing not set correctly	redmatrix	2016-06-10	1	-1/+1
\| \| \|
* \| \|	Merge branch 'dev' into sabre32	Mario Vavti	2016-06-10	2	-0/+471
\|\\| \|
\| * \|	Merge remote-tracking branch 'upstream/dev' into wiki	Andrew Manning	2016-06-09	1	-0/+5
\| \|\ \
\| * \| \|	Revised permissions checks across API and enabled collaborative editing ↵	Andrew Manning	2016-06-08	1	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	using the write_pages per-channel permission.
\| * \| \|	Merge remote-tracking branch 'upstream/dev' into wiki	Andrew Manning	2016-06-08	2	-369/+20
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge remote-tracking branch 'upstream/dev' into wiki	Andrew Manning	2016-06-07	3	-191/+23
\| \|\ \ \
\| * \| \| \|	Remove debugging logger statements	Andrew Manning	2016-06-05	2	-4/+0
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'upstream/dev' into wiki	Andrew Manning	2016-06-05	3	-20/+19
\| \|\ \ \ \
\| * \| \| \| \|	Basic page reversion implemented. The revert button on the history view ↵	Andrew Manning	2016-06-05	1	-1/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	replaces the editor text but does not save the page.
\| * \| \| \| \|	Page deletion implemented. Hide the delete button and disallow for Home page.	Andrew Manning	2016-06-04	1	-0/+18
\| \| \| \| \| \|
\| * \| \| \| \|	Wiki and page filenames are abstracted from their displayed names. Special ↵	Andrew Manning	2016-06-04	2	-24/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	characters do not seem to break things.
\| * \| \| \| \|	Created three distinct names for wiki and page that are suitable for URL, ↵	Andrew Manning	2016-06-04	1	-14/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	HTML, and raw display. Implemented in new wiki POST activity only so far.
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/dev' into wiki	Andrew Manning	2016-06-04	3	-1/+16
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge remote-tracking branch 'upstream/dev' into wiki	Andrew Manning	2016-06-02	27	-659/+420
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Major corrections to access control and page construction.	Andrew Manning	2016-06-02	2	-18/+19
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Created page history widget to dynamically fetch and display the git commit ↵	Andrew Manning	2016-05-30	2	-6/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	history for wiki pages.
\| * \| \| \| \| \| \|	Replaced wiki item record object field with ActivityStreams information. ↵	Andrew Manning	2016-05-30	1	-49/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wiki git repo path is stored in iconfig instead.
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/dev' into wiki	Andrew Manning	2016-05-29	1	-0/+2
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fixed bug in access control. Hide new wiki/page buttons if not channel owner.	Andrew Manning	2016-05-29	1	-5/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Only show wiki delete control if channel owner	Andrew Manning	2016-05-29	2	-7/+13
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed bug where page file was not loaded because of urlencoding/urldecoding	Andrew Manning	2016-05-29	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Git commit made for the page edits when the page is saved.	Andrew Manning	2016-05-29	1	-3/+40
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Wiki pages can be saved.	Andrew Manning	2016-05-28	1	-0/+22
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Page content is loaded from the file on disk	Andrew Manning	2016-05-28	1	-0/+23
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Wiki page list links work. File content is not yet loaded into the editor. ↵	Andrew Manning	2016-05-28	1	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed some logger calls.
\| * \| \| \| \| \| \| \|	Wiki page list is fetched and the page widget is updated	Andrew Manning	2016-05-28	2	-10/+47
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add new page to wiki and redirect to editor page.	Andrew Manning	2016-05-27	1	-6/+49
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Check if wiki exists and redirect if it does not	Andrew Manning	2016-05-27	1	-0/+13
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Wiki deletion works	Andrew Manning	2016-05-27	1	-6/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/dev' into wiki	Andrew Manning	2016-05-27	36	-1953/+285
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Delete wiki (in progress)	Andrew Manning	2016-05-24	1	-9/+20
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	List of wikis populates with links according to observer permissions.	Andrew Manning	2016-05-21	2	-6/+20
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Successful new wiki git repo and item table record	Andrew Manning	2016-05-21	1	-54/+75
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Trying to fix wiki branch starting fresh from dev	Andrew Manning	2016-05-21	2	-0/+109
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	more style work	Mario Vavti	2016-06-09	1	-1/+1
\| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	potential fix to hubzilla-addons issue 16	redmatrix	2016-06-08	1	-0/+5
\| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	block random_profile from accessing sys channels	redmatrix	2016-06-07	1	-1/+2
\| \| \| \| \| \| \| \|