aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
Commit message (Expand)AuthorAgeFilesLines
* Fix merge conflictStefan Parviainen2014-11-0814-189/+345
|\
| * provide lockstate for photo editmarijus2014-11-071-1/+1
| * Provide a way to mark photos as adult and hide them from the default album vi...friendica2014-11-061-1/+3
| * crude skeleton for location manager and the UI sucks but at least it's on a w...friendica2014-11-051-0/+26
| * Merge pull request #674 from pafcu/masterRedMatrix2014-11-061-1/+1
| |\
| * | minor adjustments to make the form work as designedfriendica2014-11-041-6/+9
| * | ok heads up - potentially destabilising change. I've tried to sort out all th...friendica2014-11-041-0/+3
| * | configurable visual alerts/notificationsfriendica2014-11-041-0/+23
| * | class > id mixupmarijus2014-11-041-1/+1
| * | missing </div>marijus2014-11-041-2/+3
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-032-86/+81
| |\ \
| | * | one </div> to much and css fixesmarijus2014-11-031-79/+74
| | * | if deleting a photo go away to albummarijus2014-11-031-7/+7
| * | | various UI issues related to having an enormous number of entries in the post...friendica2014-11-031-1/+27
| |/ /
| * | css fixesmarijus2014-11-023-14/+14
| * | even more photos workmarijus2014-11-014-91/+90
| * | close the eventual open tool if the other opensmarijus2014-11-011-2/+2
| * | do not reload page for photo uploadmarijus2014-10-316-19/+11
| * | Smarty3 now lives in storeThomas Willingham2014-10-311-4/+0
| * | more work on photo uploadmarijus2014-10-311-15/+26
| * | some work on photo uploadmarijus2014-10-302-36/+49
| * | change the way tagrm works to allow tag removal on the flymarijus2014-10-281-1/+1
| * | several unrelated things - auto_follow wasn't working for new accounts, error...friendica2014-10-271-8/+8
| * | do not reload page for edit album and some minor cleanupmarijus2014-10-274-17/+16
| * | put privacy role selector in settings page. Change visibility of various perm...friendica2014-10-261-24/+22
| * | wrong vars in templatemarijus2014-10-261-2/+2
| * | some work on photos like/dislikemarijus2014-10-252-11/+77
| * | don't offer forum (@name+) completion in comments, since it won't do anything.friendica2014-10-231-2/+2
| * | Merge pull request #655 from pafcu/masterRedMatrix2014-10-221-0/+1
| |\ \
| * | | fix nav double dropdownmarijus2014-10-211-4/+8
| * | | minor correction and typomarijus2014-10-201-4/+3
* | | | Fix highlighting of login buttonStefan Parviainen2014-11-081-2/+2
| |_|/ |/| |
* | | Fix duplicate element idStefan Parviainen2014-11-051-1/+1
| |/ |/|
* | If entered event info is not valid, let user try again with the old info stil...Stefan Parviainen2014-10-211-0/+1
|/
* not quite there yet but getting closermarijus2014-10-201-79/+81
* more work on photosmarijus2014-10-201-34/+41
* link tag closed prematurelyfriendica2014-10-192-3/+3
* merge madnessfriendica2014-10-193-93/+17
* mark signature forgeriesfriendica2014-10-162-2/+2
* Merge branch 'master' of https://github.com/pafcu/redStefan Parviainen2014-10-164-21/+31
|\
| * missing event permissionsfriendica2014-10-152-3/+4
| * some work on single photo view commentsmarijus2014-10-152-18/+27
* | Login menuStefan Parviainen2014-10-161-7/+8
|/
* Merge branch 'master' of https://github.com/friendica/redmarijus2014-10-131-2/+2
|\
| * bring back PM upload functionality and why oh why are we still loading tinymce?friendica2014-10-131-2/+2
* | really fix connedit > collection > checkboxmarijus2014-10-131-7/+3
|/
* fix connedit > collection > checkbox positionmarijus2014-10-121-6/+8
* Show tag in siteinfo. Not useful for us, quite useful for admins.Thomas Willingham2014-10-111-0/+3
* Also that doesn't work anymore - prettyPhoto relicThomas Willingham2014-10-111-1/+1
* Give Redbasic the -styled backThomas Willingham2014-10-111-1/+1