Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master | friendica | 2014-06-14 | 2 | -7/+8 |
|\ | |||||
| * | modified: view/ru/strings.php | pixelroot | 2014-06-14 | 1 | -0/+1 |
| | | |||||
| * | modified: .htaccess | pixelroot | 2014-06-14 | 1 | -3/+3 |
| | | | | | | | | modified: view/ru/strings.php | ||||
| * | modified: view/ru/messages.po | pixelroot | 2014-06-14 | 2 | -2/+2 |
| | | | | | | | | modified: view/ru/strings.php | ||||
| * | modified: view/ru/messages.po | pixelroot | 2014-06-14 | 2 | -3/+3 |
| | | | | | | | | modified: view/ru/strings.php | ||||
* | | Merge pull request #486 from pixelroot/master | RedMatrix | 2014-06-13 | 2 | -2134/+2307 |
|\| | | | | | modified: view/ru/messages.po | ||||
| * | modified: view/ru/messages.po | pixelroot | 2014-06-12 | 2 | -2134/+2307 |
| | | | | | | | | modified: view/ru/strings.php | ||||
* | | missing paren | friendica | 2014-05-13 | 1 | -1/+1 |
| | | |||||
* | | forbid redefinition of language plural_select function | friendica | 2014-05-13 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #458 from pixelroot/master | RedMatrix | 2014-05-12 | 2 | -5308/+5945 |
|\| | | | | | modified: view/ru/messages.po | ||||
| * | modified: view/ru/messages.po | pixelroot | 2014-05-12 | 2 | -5308/+5945 |
| | | | | | | | | modified: view/ru/strings.php | ||||
* | | Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master | friendica | 2014-01-15 | 2 | -4537/+5082 |
|\| | | | | | | | | | Conflicts: view/ru/strings.php | ||||
| * | modified: view/ru/messages.po | pixelroot | 2014-01-13 | 2 | -1922/+1599 |
| | | | | | | | | modified: view/ru/strings.php | ||||
| * | modified: view/ru/messages.po | pixelroot | 2014-01-13 | 1 | -3661/+4094 |
| | | |||||
* | | update ru strings | friendica | 2013-09-22 | 1 | -282/+365 |
| | | |||||
* | | Merge pull request #138 from pixelroot/master | friendica | 2013-09-18 | 1 | -406/+468 |
|\| | | | | | modified: view/ru/messages.po | ||||
| * | modified: view/ru/messages.po | pixelroot | 2013-09-16 | 1 | -406/+468 |
| | | |||||
* | | Merge pull request #132 from pixelroot/master | Olaf Conradi | 2013-09-14 | 1 | -1303/+1611 |
|\| | | | | | modified: view/ru/messages.po | ||||
| * | modified: view/ru/messages.po | pixelroot | 2013-09-13 | 1 | -1303/+1611 |
| | | |||||
* | | ru strings updated | friendica | 2013-08-14 | 1 | -154/+158 |
| | | |||||
* | | Merge pull request #95 from pixelroot/master | friendica | 2013-08-14 | 1 | -301/+317 |
|\| | | | | | modified: view/ru/messages.po | ||||
| * | modified: view/ru/messages.po | pixelroot | 2013-08-12 | 1 | -11/+11 |
| | | |||||
| * | modified: view/ru/messages.po | pixelroot | 2013-08-12 | 1 | -297/+313 |
| | | |||||
* | | fix string horkage | friendica | 2013-08-09 | 2 | -109/+103 |
| | | |||||
* | | Merge pull request #92 from pixelroot/master | friendica | 2013-08-09 | 1 | -422/+379 |
|\| | | | | | modified: view/ru/messages.po | ||||
| * | modified: view/ru/messages.po | pixelroot | 2013-08-09 | 1 | -422/+379 |
| | | |||||
* | | malformed ru string file | friendica | 2013-08-08 | 1 | -532/+532 |
| | | |||||
* | | Merge pull request #91 from pixelroot/master | friendica | 2013-08-08 | 1 | -533/+533 |
|\| | | | | | modified: view/ru/messages.po | ||||
| * | modified: view/ru/messages.po | pixelroot | 2013-08-08 | 1 | -533/+533 |
| | | |||||
* | | Add a site access policy (to determine if this is really a public site or ↵ | friendica | 2013-08-06 | 1 | -1/+1 |
| | | | | | | | | just an open site) and add an orphan flag to xchans in case all their hublocs go away. Get rid of a couple of DO NOT EDIT template messages which were still lurking in the tree. | ||||
* | | ru string update | friendica | 2013-08-06 | 1 | -1901/+1385 |
| | | |||||
* | | Merge pull request #89 from pixelroot/master | friendica | 2013-08-06 | 1 | -6559/+4136 |
|\| | | | | | modified: view/ru/messages.po | ||||
| * | modified: view/ru/messages.po | pixelroot | 2013-08-06 | 1 | -10/+10 |
| | | |||||
| * | modified: view/ru/messages.po | pixelroot | 2013-08-06 | 1 | -6559/+4136 |
| | | |||||
* | | reset email templates to English | friendica | 2013-06-16 | 10 | -0/+254 |
|/ | |||||
* | global rename viewcontacts to viewconnections | friendica | 2013-02-19 | 1 | -5/+5 |
| | |||||
* | here's where the heavy lifting begins - everything is likely to be broken ↵ | friendica | 2012-10-01 | 2 | -2504/+7699 |
| | | | | for quite some time as we add location and db independence to items and conversations and work through the rest of the permissions and how to federate the buggers. | ||||
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 2 | -0/+0 |
| | | | | | | Conflicts: include/config.php update.php | ||||
* | add remove_user hook (it looks like dreamhost changed all my file ↵ | friendica | 2012-01-18 | 2 | -0/+0 |
| | | | | permissions, this will make a nasty commit) | ||||
* | little stuff - name change, live updates, new network types | friendica | 2011-11-23 | 1 | -1/+1 |
| | |||||
* | bug #159 multiple definition of string_plural_form function when changing ↵ | Friendika | 2011-09-21 | 1 | -1/+1 |
| | | | | languages | ||||
* | Russian translation (80% complete) | Friendika | 2011-09-06 | 2 | -0/+5604 |