Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Revert "update nl - attempt 2"" | friendica | 2014-09-10 | 2 | -3/+3 |
| | | | | This reverts commit 8e179aa73495f93151943293df32cde9f2c3848f. | ||||
* | Revert "update nl - attempt 2" | friendica | 2014-09-10 | 2 | -3/+3 |
| | | | | This reverts commit 4712b78e520ca10b34e3e9b99c2752b10d811b42. | ||||
* | Merge pull request #583 from git-marijus/master | RedMatrix | 2014-09-11 | 5 | -19/+36 |
|\ | | | | | photo justification | ||||
| * | without this check we kill the directory autoload | marijus | 2014-09-10 | 1 | -15/+17 |
| | | |||||
| * | photo justification | marijus | 2014-09-10 | 5 | -19/+34 |
| | | |||||
* | | update nl - attempt 2 | Jeroen | 2014-09-10 | 2 | -3/+3 |
| | | |||||
* | | update nl | Jeroen | 2014-09-10 | 3 | -373/+389 |
|/ | |||||
* | 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 | 2 | -3/+15 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-07 | 3 | -5/+14 |
|\ | |||||
| * | Added abook-changed background colour to dark schema | Jeroen | 2014-09-07 | 3 | -5/+14 |
| | | |||||
* | | 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. | ||||
* | hook photos scroll to page down | friendica | 2014-09-06 | 1 | -1/+1 |
| | |||||
* | ajax work | friendica | 2014-09-06 | 4 | -1/+45 |
| | |||||
* | 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 |
| | |||||
* | this improves the photos even more | friendica | 2014-09-04 | 1 | -3/+3 |
| | |||||
* | constrain photos to a fixed block regardless of aspect ratio | friendica | 2014-09-04 | 1 | -1/+23 |
| | |||||
* | 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 |
| | |||||
* | Merge pull request #577 from tuscanhobbit/master | Paolo T | 2014-09-01 | 2 | -1337/+1389 |
|\ | | | | | Italian strings updated | ||||
| * | Italian strings updated | Paolo Tacconi | 2014-09-01 | 2 | -3/+3 |
| | | |||||
| * | Italian strings updated | Paolo Tacconi | 2014-09-01 | 2 | -1335/+1387 |
| | | |||||
* | | update nl + Friendica>RedMatrix in two text files | Jeroen | 2014-08-30 | 2 | -907/+970 |
| | | |||||
* | | minor css fixes and cleanup | marijus | 2014-08-28 | 1 | -10/+2 |
| | | |||||
* | | 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 | 2 | -0/+27 |
| | | | | | | | | 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 | 2 | -46/+38 |
| | | |||||
* | | add background color to widgets | marijus | 2014-08-26 | 4 | -31/+9 |
| | | |||||
* | | 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 |
| | | |||||
* | | fix nl | Jeroen | 2014-08-23 | 2 | -13/+13 |
| | | |||||
* | | Minor adjustment photo view + update nl (at 100\%\!) | Jeroen | 2014-08-23 | 11 | -726/+739 |
| | | |||||
* | | fix nl | Jeroen | 2014-08-22 | 2 | -5/+5 |
| | | |||||
* | | 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 | ||||
* | | extensible profiles - add the input form elements. Still needs styling and ↵ | friendica | 2014-08-20 | 1 | -0/+5 |
| | | | | | | | | we're not yet storing the results. And right now we're ignoring the type and only doing type=string. Oh yeah - and I split off starting the second delivery chain into its own function in tag_deliver since it was largely duplicate code. | ||||
* | | move Friendica photo migrator to addons, bring back a few XML scraping ↵ | friendica | 2014-08-20 | 1 | -13/+0 |
| | | | | | | | | functions that we're going to require (unfortunately) | ||||
* | | provide admin option for allowing rss/atom feed connections. Need to do this ↵ | friendica | 2014-08-20 | 1 | -0/+1 |
| | | | | | | | | now before the feature is complete so that public sites don't get borked. We also will need a service class for this. | ||||
* | | fix nl | Jeroen | 2014-08-19 | 2 | -3/+3 |
| | | |||||
* | | Update nl | Jeroen | 2014-08-19 | 2 | -5927/+6256 |
| | | |||||
* | | provide an overt indication that a post/comment was edited. | friendica | 2014-08-18 | 2 | -2/+2 |
| | |