3824 commits

Author	SHA1	Message	Date
marijus	dc5e05d334	even more photos work	2014-11-01 23:55:36 +01:00
marijus	30281b161c	close the eventual open tool if the other opens	2014-11-01 20:30:13 +01:00
marijus	5d151b9886	do not reload page for photo upload	2014-10-31 20:25:43 +01:00
Thomas Willingham	5d1bb1b685	Smarty3 now lives in store	2014-10-31 16:09:46 +00:00
marijus	2982212797	more work on photo upload	2014-10-31 14:33:41 +01:00
marijus	4495a30b88	removing this was not a good idea...	2014-10-30 18:55:24 +01:00
marijus	0ff4d9015b	some work on photo upload	2014-10-30 14:10:55 +01:00
marijus	ec8bab7784	change the way tagrm works to allow tag removal on the fly	2014-10-28 11:56:00 +01:00
friendica	9cc76cb33d	several unrelated things - auto_follow wasn't working for new accounts, error returned in private mention to a collection, and added auto-completion to photo tags; though it only matches people so the hover text is now wrong. Also made the photo edit form XHTML (XML) compliant.	2014-10-27 19:23:40 -07:00
marijus	d192bcad65	do not reload page for edit album and some minor cleanup	2014-10-27 21:31:54 +01:00
Jeroen	eec0a67dde	update nl + Terms of Service more prominent in the help files.	2014-10-27 15:05:59 +00:00
friendica	655c3e1b47	put privacy role selector in settings page. Change visibility of various permissions items accordingly.	2014-10-26 19:32:12 -07:00
marijus	f2ccd37c8b	wrong vars in template	2014-10-26 21:50:20 +01:00
marijus	6497e78956	some work on photos like/dislike	2014-10-25 15:23:20 +02:00
friendica	1a9b8d4f0c	don't offer forum (@name+) completion in comments, since it won't do anything.	2014-10-23 22:00:16 -07:00
Jeroen	bfdf5fd15c	upd nl 2	2014-10-23 15:15:28 +00:00
Jeroen	da98c7c534	upd nl	2014-10-23 14:06:46 +00:00
zottel	53ee9f664f	update to German strings	2014-10-23 13:59:49 +02:00
RedMatrix	3fb0354a55	Merge pull request #655 from pafcu/master ... Better handling of incorrect info entered in event	2014-10-22 12:02:22 +11:00
Stefan Parviainen	c8666b9076	If entered event info is not valid, let user try again with the old info still there. Closes friendica/red#648	2014-10-21 18:28:47 +02:00
marijus	a03c3d5480	fix nav double dropdown	2014-10-21 13:43:14 +02:00
marijus	d02162ee83	minor correction and typo	2014-10-20 23:01:58 +02:00
marijus	c080c420ba	not quite there yet but getting closer	2014-10-20 22:46:14 +02:00
marijus	11e8fe3085	more work on photos	2014-10-20 15:05:33 +02:00
friendica	e414ed7782	link tag closed prematurely	2014-10-19 21:34:31 -07:00
friendica	bae3029c63	merge madness	2014-10-19 16:12:05 -07:00
friendica	7bbe700f3f	mark signature forgeries	2014-10-16 16:19:19 -07:00
Stefan Parviainen	e425def2a2	Merge branch 'master' of https://github.com/pafcu/red	2014-10-16 21:37:14 +02:00
Stefan Parviainen	6867a8a7f6	Login menu	2014-10-16 17:21:37 +02:00
friendica	ae9e1fa688	missing event permissions	2014-10-15 18:35:56 -07:00
marijus	04a254d94a	some work on single photo view comments	2014-10-15 22:23:38 +02:00
marijus	a7aa4efc08	Merge branch 'master' of https://github.com/friendica/red	2014-10-13 12:52:41 +02:00
marijus	c41f314302	really fix connedit > collection > checkbox	2014-10-13 12:52:21 +02:00
friendica	a512d1a4aa	tinymce still seems to be referenced. Can't quite get rid of it.	2014-10-13 03:15:03 -07:00
friendica	8d27482374	Merge https://github.com/friendica/red into pending_merge	2014-10-13 03:08:58 -07:00
friendica	7abaccaf7f	bring back PM upload functionality and why oh why are we still loading tinymce?	2014-10-13 03:07:36 -07:00
marijus	8406046c5b	fix connedit > collection > checkbox position also for webkit - this will need a better solution though	2014-10-13 11:58:49 +02:00
marijus	030175bde6	fix connedit > collection > checkbox position	2014-10-12 14:31:51 +02:00
Thomas Willingham	82232c6916	Show tag in siteinfo. Not useful for us, quite useful for admins.	2014-10-11 17:24:58 +01:00
Thomas Willingham	d196e71962	Also that doesn't work anymore - prettyPhoto relic	2014-10-11 15:48:30 +01:00
Thomas Willingham	2b472b2b48	Give Redbasic the -styled back	2014-10-11 15:45:00 +01:00
Thomas Willingham	d54d62b601	Merge branch 'master' of https://github.com/friendica/red	2014-10-11 15:42:52 +01:00
Thomas Willingham	d132646915	Unbreak webpages	2014-10-11 15:42:31 +01:00
Jeroen	2ddd022540	+1	2014-10-11 14:39:56 +00:00
marijus	f8aabd376b	and more missing wrappers	2014-10-10 16:54:12 +02:00
marijus	d5ceb33f6d	found more missing wrappers	2014-10-10 16:13:44 +02:00
marijus	92cc5673cc	one more oups...	2014-10-10 16:01:14 +02:00
marijus	675f5caded	oups... that was weired...	2014-10-10 15:57:10 +02:00
marijus	4e9bd8b8f0	This is a fix to not interfere the ongoing adding of .generic-content-wrapper with the ongoing styling of redbasic theme. ... adding of .generic-content-wrapper is needed and useful for derivative themes but it should not contain any styling information for redbasic theme. therefor i added .generic-content-wrapper-styled as a quickfix for spots where redbasic is not finished yet. Sidenote: please avoid opening a div in one *.tpl and close it in another or (even worse) open a div in a *.tpl and close it in an already templatified mod/*.php. This will really make the code and templates very, very confusing.	2014-10-10 15:52:56 +02:00
Jeroen	053e606108	Merge branch 'master' of https://github.com/friendica/red	2014-10-10 13:37:09 +00:00