Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | missing event permissions | friendica | 2014-10-15 | 2 | -3/+4 |
| | |||||
* | some work on single photo view comments | marijus | 2014-10-15 | 2 | -18/+27 |
| | |||||
* | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-10-13 | 1 | -2/+2 |
|\ | |||||
| * | bring back PM upload functionality and why oh why are we still loading tinymce? | friendica | 2014-10-13 | 1 | -2/+2 |
| | | |||||
* | | really fix connedit > collection > checkbox | marijus | 2014-10-13 | 1 | -7/+3 |
|/ | |||||
* | fix connedit > collection > checkbox position | marijus | 2014-10-12 | 1 | -6/+8 |
| | |||||
* | Show tag in siteinfo. Not useful for us, quite useful for admins. | Thomas Willingham | 2014-10-11 | 1 | -0/+3 |
| | |||||
* | Also that doesn't work anymore - prettyPhoto relic | Thomas Willingham | 2014-10-11 | 1 | -1/+1 |
| | |||||
* | Give Redbasic the -styled back | Thomas Willingham | 2014-10-11 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-10-11 | 1 | -1/+2 |
|\ | |||||
| * | +1 | Jeroen | 2014-10-11 | 1 | -1/+2 |
| | | |||||
* | | Unbreak webpages | Thomas Willingham | 2014-10-11 | 1 | -0/+1 |
|/ | |||||
* | and more missing wrappers | marijus | 2014-10-10 | 18 | -20/+28 |
| | |||||
* | found more missing wrappers | marijus | 2014-10-10 | 2 | -2/+3 |
| | |||||
* | This is a fix to not interfere the ongoing adding of ↵ | marijus | 2014-10-10 | 13 | -12/+19 |
| | | | | | | | .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. | ||||
* | Added and changed on some places div class generic-content-wrapper. And ↵ | Jeroen | 2014-10-09 | 17 | -22/+33 |
| | | | | added to redbasic. Other thems can now also theme backgrounds of a lot of pages. I'm not completely done, but till now - this is it. | ||||
* | make nav-pills a bit smaller in height | marijus | 2014-10-08 | 1 | -2/+2 |
| | |||||
* | template for searchbox and some more work on saved searches | marijus | 2014-10-08 | 2 | -2/+14 |
| | |||||
* | nav pills for apps aside | marijus | 2014-10-08 | 1 | -1/+1 |
| | |||||
* | css fixes | marijus | 2014-10-08 | 2 | -5/+5 |
| | |||||
* | add "stacked pills" to saved search term list (the delete icon is still a ↵ | friendica | 2014-10-07 | 2 | -4/+4 |
| | | | | bit funky) | ||||
* | porting more widgets to bs nav-pills | marijus | 2014-10-07 | 6 | -46/+53 |
| | |||||
* | take away some boldness, some css fixes and some photo work | marijus | 2014-10-07 | 2 | -26/+24 |
| | |||||
* | datetimepicker data-format now data-date-format | Alexandre Hannud Abdo | 2014-10-07 | 2 | -3/+3 |
| | |||||
* | remove the privacy macros in settings and connedit now that we have privacy ↵ | friendica | 2014-10-03 | 2 | -30/+0 |
| | | | | roles attached to the channel. One can still use the advanced permission dialogues, but they shouldn't have a reason to if they created the channel with a suitable channel type - plus it's just a bunch of extra permissions settings to confuse people. | ||||
* | more work on photos | marijus | 2014-10-02 | 2 | -4/+24 |
| | |||||
* | implement a "powered-by" but leave it turned off until somebody with a good ↵ | friendica | 2014-09-29 | 1 | -0/+3 |
| | | | | eye for layout can figure out where best to put it. | ||||
* | some more work on photos | marijus | 2014-09-28 | 2 | -2/+7 |
| | |||||
* | upload first but not inside another {{if}} | marijus | 2014-09-26 | 1 | -1/+1 |
| | |||||
* | upload should be first | marijus | 2014-09-26 | 1 | -3/+3 |
| | |||||
* | fix blockquote | marijus | 2014-09-26 | 1 | -1/+1 |
| | |||||
* | some more work on photos - work in progress | marijus | 2014-09-26 | 2 | -22/+21 |
| | |||||
* | doc updates, clean up buttons on PM edit template to match other edit buttons | friendica | 2014-09-26 | 2 | -11/+11 |
| | |||||
* | optionally include wall items (posts) in import/export | friendica | 2014-09-25 | 1 | -0/+5 |
| | |||||
* | Navbar notifications: don't show "nothing new here" unless we've checked and ↵ | friendica | 2014-09-20 | 1 | -0/+1 |
| | | | | there's nothing. Until we know for sure, display "Loading...". | ||||
* | update jg to latest preview release and try once more to really justify the ↵ | marijus | 2014-09-20 | 2 | -9/+4 |
| | | | | whole gallery | ||||
* | closing tag | friendica | 2014-09-19 | 1 | -1/+1 |
| | |||||
* | repeated content collapse on update from display page under rare conditions ↵ | friendica | 2014-09-18 | 1 | -1/+0 |
| | | | | (when the conversation hasn't changed) | ||||
* | add a spinner or two to the new channel page so folks have a clue that we're ↵ | friendica | 2014-09-17 | 1 | -0/+2 |
| | | | | doing something in the background - trying to complete the nick field for them (and then check it before they submit). | ||||
* | channel permission roles | friendica | 2014-09-17 | 1 | -0/+7 |
| | |||||
* | Fix name attribute of button elements so jquery '.submit()' doesn't break | Alexandre Hannud Abdo | 2014-09-16 | 2 | -2/+2 |
| | | | | | | | | According to "Additional notes" in: http://api.jquery.com/submit/ Not fixing buttons created with 'input' tags. | ||||
* | Deprecate site channel. The sys channel should be doing this. Will fix | Thomas Willingham | 2014-09-15 | 1 | -1/+0 |
| | | | | shortly. | ||||
* | Made link post titles to source optional in display settings. Hopefully I ↵ | Jeroen | 2014-09-14 | 2 | -2/+4 |
| | | | | did a right. | ||||
* | Merge pull request #592 from jeroenpraat/master | RedMatrix | 2014-09-13 | 1 | -1/+1 |
|\ | | | | | Issue #590: Linked conversation titles to source. | ||||
| * | Issue #590: Linked conversation titles to source. | jeroenpraat | 2014-09-12 | 1 | -1/+1 |
| | | | | | | If a theme wants to have it different, it can always copy this .tpl file to ../theme/tpl/. I didn't commit this directly, because it's a little bit controversial. But I like it! | ||||
* | | define justifiedGalleryActive in head.tpl to not break other pages autoload | marijus | 2014-09-12 | 1 | -0/+1 |
| | | |||||
* | | issue #588 can't add feeds to collections using connedit page group sidebar ↵ | friendica | 2014-09-11 | 1 | -1/+1 |
| | | | | | | | | widget | ||||
* | | another day another concept - hope this works better | marijus | 2014-09-11 | 2 | -2/+7 |
| | | |||||
* | | Revert "Revert "Merge pull request #583 from git-marijus/master"" | marijus | 2014-09-11 | 3 | -14/+7 |
| | | | | | | | | This reverts commit 08638f3ec88e86def618ff89bdedb9ae9696d218. | ||||
* | | make sure we add the file | friendica | 2014-09-10 | 1 | -0/+3 |
| | |