aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #655 from pafcu/masterRedMatrix2014-10-221-0/+1
|\
| * If entered event info is not valid, let user try again with the old info stil...Stefan Parviainen2014-10-211-0/+1
* | fix nav double dropdownmarijus2014-10-211-4/+8
* | minor correction and typomarijus2014-10-202-5/+5
|/
* not quite there yet but getting closermarijus2014-10-203-114/+95
* more work on photosmarijus2014-10-202-46/+43
* link tag closed prematurelyfriendica2014-10-192-3/+3
* merge madnessfriendica2014-10-193-93/+17
* mark signature forgeriesfriendica2014-10-163-2/+7
* 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
|\
| * tinymce still seems to be referenced. Can't quite get rid of it.friendica2014-10-131-1/+1
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-10-131-0/+2
| |\
| * | bring back PM upload functionality and why oh why are we still loading tinymce?friendica2014-10-132-3/+3
* | | really fix connedit > collection > checkboxmarijus2014-10-133-13/+5
| |/ |/|
* | fix connedit > collection > checkbox position also for webkit - this will nee...marijus2014-10-131-0/+2
|/
* fix connedit > collection > checkbox positionmarijus2014-10-122-7/+15
* 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
* Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-10-111-1/+2
|\
| * +1Jeroen2014-10-111-1/+2
* | Unbreak webpagesThomas Willingham2014-10-111-0/+1
|/
* and more missing wrappersmarijus2014-10-1018-20/+28
* found more missing wrappersmarijus2014-10-102-2/+3
* one more oups...marijus2014-10-101-2/+2
* oups... that was weired...marijus2014-10-101-2/+1
* This is a fix to not interfere the ongoing adding of .generic-content-wrapper...marijus2014-10-1015-15/+23
* Merge branch 'master' of https://github.com/friendica/redJeroen2014-10-10111-8184/+6868
|\
| * more updates to German strings plus email templateszottel2014-10-108-1321/+1385
| * remove unused email template fileszottel2014-10-10102-1885/+0
| * update to German stringszottel2014-10-102-6172/+6675
| * allow (our own) ajax urls to pass through bbcode intact.friendica2014-10-091-4/+6
* | Good compromise I think. Remove display setting . Set the default (light) sch...Jeroen2014-10-104-10/+5
|/
* Added the display setting for generic (other) content wrapper. Also did set t...Jeroen2014-10-098-6/+22
* Added and changed on some places div class generic-content-wrapper. And added...Jeroen2014-10-0918-26/+40
* remove some cruft - revert if you find any regressionsmarijus2014-10-091-112/+0
* fix css for [code]marijus2014-10-093-8/+12
* more css fixesmarijus2014-10-092-0/+5
* css fixesmarijus2014-10-092-15/+14
* Merge pull request #622 from solstag/masterRedMatrix2014-10-092-3276/+3679
|\
| * update pt-br translationAlexandre Hannud Abdo2014-10-072-3276/+3679
* | Small fix so search field and search buttons fit well.Jeroen2014-10-081-1/+5
* | css fixmarijus2014-10-081-1/+1
* | make nav-pills a bit smaller in heightmarijus2014-10-082-3/+7
* | template for searchbox and some more work on saved searchesmarijus2014-10-085-48/+25
* | nav pills for apps asidemarijus2014-10-081-1/+1