Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into movejs | friendica | 2014-01-06 | 8 | -2873/+2914 |
|\ | | | | | | | | | Conflicts: version.inc | ||||
| * | likes to comments getting indented an extra 50px | friendica | 2014-01-05 | 1 | -5/+0 |
| | | |||||
| * | make plink href visible | friendica | 2014-01-04 | 1 | -2/+2 |
| | | |||||
| * | Merge pull request #255 from tuscanhobbit/master | Paolo T | 2014-01-04 | 2 | -2863/+2909 |
| |\ | | | | | | | Updated Italian translation | ||||
| | * | Updated Italian translation | tuscanhobbit | 2014-01-04 | 2 | -2863/+2909 |
| | | | |||||
* | | | move js files from core | friendica | 2014-01-04 | 15 | -11/+4091 |
|/ / | |||||
* | | Merge pull request #254 from cvogeley/master | cvogeley | 2014-01-03 | 1 | -4/+3 |
|\ \ | | | | | | | Webpage fixes for the moment without the fix for page not found after editing a webpage | ||||
| * | | Confirm webpage deletion prompt | Christian Vogeley | 2014-01-01 | 1 | -4/+3 |
| | | | |||||
* | | | expose profile things in the UI | friendica | 2013-12-30 | 3 | -10/+14 |
| | | | |||||
* | | | basic edit and delete for things | friendica | 2013-12-30 | 3 | -0/+42 |
| | | | |||||
* | | | display_thing: it ain't much, but it's implemented. | friendica | 2013-12-29 | 1 | -0/+8 |
| | | | |||||
* | | | a bit more backend work on things | friendica | 2013-12-28 | 1 | -0/+13 |
| | | | |||||
* | | | remove prettyphoto from core - this will affect the enhanced photo albums ↵ | friendica | 2013-12-26 | 4 | -12/+1 |
| | | | | | | | | | | | | feature on the short term which has been disabled until we figure out how to make the setting per-theme instead of a core option. The library is still available in core (library/prettyphoto) currently but needs to be moved to theme js and loaded/accessed from there [for themes which use it]. Then the library will be removed. It appears that other lightboxes commonly use rel= to group photo albums. So we may provide a generic rel= tag in photo album templates so that the choice of lightbox or album viewer is not only a theme option but could also be accomplished with plugins. | ||||
* | | | missing end div | friendica | 2013-12-25 | 1 | -1/+1 |
| | | | |||||
* | | | and add a border for delineation | friendica | 2013-12-25 | 1 | -0/+2 |
| | | | |||||
* | | | improve the register text until the new register page is finished | friendica | 2013-12-25 | 2 | -2/+13 |
| | | | |||||
* | | | try again | friendica | 2013-12-25 | 1 | -3/+3 |
| | | | |||||
* | | | extend the directory profiles a bit more | friendica | 2013-12-25 | 1 | -0/+9 |
| | | | |||||
* | | | use colorbox for single photo viewing (replacing prettyPhoto, which may have ↵ | friendica | 2013-12-25 | 2 | -2/+2 |
| | | | | | | | | | | | | license incompatibilities). Also set maximum size of a directory popup and let it scroll after that in case somebody set their profile keywords to the content of Webster's dictionary. | ||||
* | | | get around size limit | friendica | 2013-12-23 | 1 | -3/+3 |
| | | | |||||
* | | | set the height so colorbox can set its size correctly | friendica | 2013-12-23 | 2 | -3/+2 |
| | | | |||||
* | | | make sure resize fires | friendica | 2013-12-23 | 1 | -1/+2 |
| | | | |||||
* | | | improve the directory popup a bit | friendica | 2013-12-23 | 1 | -1/+10 |
| | | | |||||
* | | | first thing to make it less annoying is to only popup if you click. Will ↵ | friendica | 2013-12-23 | 1 | -1/+1 |
| | | | | | | | | | | | | improve on it later - but this gives us something we can test to improve the popup contents. | ||||
* | | | first cut at a directory popup. It's a bit annoying at the moment, so we'll ↵ | friendica | 2013-12-23 | 5 | -2/+28 |
| | | | | | | | | | | | | have to make it less so. Also had second thoughts about the project homepage changes made yesterday. Just because a bunch of Reddit trolls can't get social networking out of their brain long enough to explore other technologies or even read the project page doesn't mean we should pander to them and explain how or why we either are or aren't a social network. | ||||
* | | | Merge pull request #253 from cvogeley/master | friendica | 2013-12-23 | 1 | -1/+1 |
|\| | | | | | | | | Show expire date in post tooltip | ||||
| * | | Show expire date in post tooltip | Christian Vogeley | 2013-12-23 | 1 | -1/+1 |
| | | | |||||
* | | | s/zrl/zid | Thomas Willingham | 2013-12-23 | 1 | -1/+1 |
| | | | |||||
* | | | You'll probably be wanting the actual template too. | Thomas Willingham | 2013-12-23 | 1 | -1/+1 |
| | | | |||||
* | | | DE: update to the strings | Tobias Diekershoff | 2013-12-23 | 2 | -3273/+3014 |
| | | | |||||
* | | | add ability to set created date/time from the api | friendica | 2013-12-22 | 1 | -1/+0 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2013-12-22 | 3 | -4/+67 |
|\| | | |||||
| * | | Use the red matrix icons | Christian Vogeley | 2013-12-22 | 1 | -2/+9 |
| | | | |||||
| * | | Merge correction | Christian Vogeley | 2013-12-22 | 2 | -4/+0 |
| | | | |||||
| * | | Correction | Christian Vogeley | 2013-12-22 | 3 | -166/+0 |
| | | | |||||
| * | | Merge | Christian Vogeley | 2013-12-22 | 1 | -0/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' into bootstrap | Christian Vogeley | 2013-12-22 | 104 | -6149/+7021 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: view/php/theme_init.php | ||||
| * | | | New modal dialog for item expiry | Christian Vogeley | 2013-12-22 | 3 | -4/+63 |
| | | | | |||||
* | | | | js functions behind quick permission links were lost in comanchification ↵ | friendica | 2013-12-22 | 2 | -82/+82 |
| |/ / |/| | | | | | | | | process - because the js didn't get relocated to the new connedit module | ||||
* | | | last remaining files to be Comanchified with the exception of mod_admin. ↵ | friendica | 2013-12-22 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | | Though I should probably take a third look to see if anything else uses widgets. In fact - it appears that the flattrwidget does. | ||||
* | | | appears that I missed a few files for Comanchification. so here's mitem. | friendica | 2013-12-22 | 1 | -0/+4 |
| | | | |||||
* | | | split private messages into two modules - "message" is just for message ↵ | friendica | 2013-12-21 | 6 | -4/+120 |
| | | | | | | | | | | | | lists, "mail" is for reading and writing conversations. This is so we can Comanchify it cleanly. | ||||
* | | | comanchify mod_directory. Two modules remaining. Actually three because ↵ | friendica | 2013-12-20 | 1 | -0/+7 |
| | | | | | | | | | | | | message needs to be split. | ||||
* | | | comanchify mod_search - we've got three modules left to Comanchify: admin, ↵ | friendica | 2013-12-20 | 1 | -0/+3 |
| | | | | | | | | | | | | directory and message - each of which introduces "interesting challenges" | ||||
* | | | comanchify connedit, group | friendica | 2013-12-19 | 2 | -0/+9 |
| | | | |||||
* | | | default photo issue, and connections page showing deleted accounts. Also ↵ | friendica | 2013-12-19 | 1 | -0/+4 |
| | | | | | | | | | | | | show last updated on connedit page | ||||
* | | | comanchificate mod_photos | friendica | 2013-12-19 | 1 | -0/+4 |
| | | | |||||
* | | | more comanche | friendica | 2013-12-19 | 1 | -0/+5 |
| | | | |||||
* | | | more comanche | friendica | 2013-12-19 | 1 | -0/+4 |
| | | | |||||
* | | | more comanche migration | friendica | 2013-12-19 | 6 | -0/+18 |
| | | |