Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | endless scroll on connections page | friendica | 2014-09-10 | 2 | -3/+6 |
| | | |||||
* | | make verify_email the default for new installs (at least English installs), ↵ | friendica | 2014-09-10 | 1 | -0/+1 |
| | | | | | | | | and provide a setting on the admin page for it. | ||||
* | | Revert "Merge pull request #583 from git-marijus/master" | friendica | 2014-09-10 | 3 | -7/+14 |
| | | | | | | | | | | | | | | autoload broken - even after clearing cache and retrying. This reverts commit 13e7a8f123b283a096af302b0366255355ba8439, reversing changes made to 4712b78e520ca10b34e3e9b99c2752b10d811b42. | ||||
* | | photo justification | marijus | 2014-09-10 | 3 | -14/+7 |
| | | |||||
* | | wrap photo albums (albums and top level) in a div id=photo-album-contents | friendica | 2014-09-08 | 1 | -1/+1 |
| | | |||||
* | | add categories to events | friendica | 2014-09-07 | 1 | -3/+1 |
| | | |||||
* | | Diaspora actually puts the account full name into the "nickname" field of ↵ | friendica | 2014-09-07 | 1 | -1/+1 |
| | | | | | | | | the vcard. They don't put the nickname into the vcard at all. One wonders why even have a nickname field since the fullname is already presented in the next line. This hasn't caused us a problem with Friendica because I'm guessing nobody actually uses this line, though the number of class tags on it makes it seem somewhat important. | ||||
* | | ajax work | friendica | 2014-09-06 | 2 | -0/+7 |
| | | |||||
* | | more work on the event edit form | friendica | 2014-09-05 | 1 | -4/+16 |
| | | |||||
* | | put a date and time picker on events | friendica | 2014-09-04 | 1 | -1/+87 |
| | | |||||
* | | outbound feed issue | friendica | 2014-09-03 | 1 | -0/+1 |
| | | |||||
* | | Don't forget the ifs. Now we just need to write some blurb, find some | Thomas Willingham | 2014-09-02 | 1 | -4/+4 |
| | | | | | | | | | | images, add a link, and decide what to do with non-earned badges...basically all of it. | ||||
* | | Move achievements on, but just a tad. | Thomas Willingham | 2014-09-02 | 1 | -0/+9 |
| | | |||||
* | | consistency: the diaspora post plugin uses "diaspora_enable". The protocol ↵ | friendica | 2014-08-28 | 1 | -1/+1 |
| | | | | | | | | driver uses "diaspora_enabled" with a 'd'. They got mixed up in a couple of places. | ||||
* | | ability to create/edit/delete custom profile field definitions - read the ↵ | friendica | 2014-08-27 | 1 | -0/+16 |
| | | | | | | | | source. Currently the created entries aren't added to the allowed fields arrays, but this can be done by hand until that bit is made available. Only choice for input type at the moment is 'text' or a text input, not a textarea. Multiple choice will be added later. | ||||
* | | Admin setting for Diaspora Protocol enable. We may want to have this also at ↵ | friendica | 2014-08-27 | 1 | -0/+1 |
| | | | | | | | | a channel level since there are privacy issues and quirks and trade-offs. | ||||
* | | Merge pull request #574 from tuscanhobbit/master | RedMatrix | 2014-08-27 | 6 | -6/+6 |
|\ \ | | | | | | | Notifications links load on the same window(tab) | ||||
| * | | notifications open in the same window(tab) | tuscanhobbit | 2014-08-27 | 6 | -6/+6 |
| | | | |||||
* | | | make vcard and contact block widget look-alike | marijus | 2014-08-27 | 1 | -2/+2 |
| | | | |||||
* | | | get rid of template "auto generated" warnings | friendica | 2014-08-25 | 15 | -75/+0 |
| | | | |||||
* | | | more diaspora stuff - most of the basic bits are there except queueing and ↵ | friendica | 2014-08-25 | 15 | -0/+262 |
| | | | | | | | | | | | | physical delivery (I'm keeping delivery turned off until some of the bugs are fixed so we don't cause inifinite loops or network meltdowns) - now it's just a matter of going through and methodically finding all the bugs | ||||
* | | | notifications/system not marking all notifications seen | friendica | 2014-08-25 | 1 | -1/+1 |
| | | | |||||
* | | | missing template file | friendica | 2014-08-21 | 1 | -0/+57 |
| | | | |||||
* | | | the rest of the diaspora local discovery stuff | friendica | 2014-08-21 | 1 | -0/+3 |
| | | | |||||
* | | | make the old personal xrd interface (old webfinger) work again | friendica | 2014-08-21 | 2 | -1/+17 |
| | | | |||||
* | | | profile edit - missing visibility and drop link on non-default profiles, ↵ | friendica | 2014-08-21 | 1 | -2/+2 |
| | | | | | | | | | | | | re-arrange order of replacing red#matrix smilie so it works correctly, accept a post with body content of '0' which was interpreted by x() as nothing (was treated as integer). | ||||
* | | | abook-edit-me class lost during some edit - we need this to reset the ↵ | friendica | 2014-08-21 | 1 | -1/+1 |
| | | | | | | | | | | | | permission fields |