Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-31 | 2 | -181/+187 |
|\ | | | | | | | | | | | | | | | Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po | ||||
| * | Removed redmatrix.nl as a fallback server (directory mode to normal) + ↵ | jeroenpraat | 2015-08-29 | 2 | -55/+55 |
| | | | | | | | | update strings ES | ||||
| * | Update es and nl strings | jeroenpraat | 2015-08-28 | 2 | -155/+161 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-23 | 2 | -743/+743 |
|\| | | | | | | | | | | | | | Conflicts: include/zot.php install/update.php util/messages.po | ||||
| * | Final (temporary I suppose) Spanish string update | jeroenpraat | 2015-08-22 | 2 | -743/+743 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-20 | 2 | -105/+105 |
|\| | |||||
| * | Another Spanish strings update | jeroenpraat | 2015-08-20 | 2 | -105/+105 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-17 | 2 | -297/+297 |
|\| | | | | | | | | | Conflicts: view/nl/messages.po | ||||
| * | Final Spanish strings for now | jeroenpraat | 2015-08-17 | 2 | -297/+297 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-14 | 2 | -17/+17 |
|\| | | | | | | | | | | | Conflicts: include/zot.php util/messages.po | ||||
| * | update spanish | jeroenpraat | 2015-08-14 | 2 | -17/+17 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-12 | 9 | -5282/+9945 |
|\| | | | | | | | | | | | Conflicts: view/es/htconfig.tpl view/es/update_fail_eml.tpl | ||||
| * | Some corrections of Spanish strings. | jeroenpraat | 2015-08-12 | 2 | -135/+136 |
| | | |||||
| * | Thanks to Manuel. Updated Spanish to 100 procent. | jeroenpraat | 2015-08-12 | 9 | -5281/+9942 |
| | | |||||
* | | second pass name change | redmatrix | 2015-05-05 | 2 | -2/+2 |
|/ | |||||
* | raise the default upload limit for the application. We eliminated this in ↵ | friendica | 2015-03-01 | 1 | -1/+1 |
| | | | | English long ago, but several of the translated htconfig files still have the old limit. | ||||
* | remove unused email template files | zottel | 2014-10-10 | 8 | -144/+0 |
| | |||||
* | missing paren | friendica | 2014-05-13 | 1 | -1/+1 |
| | |||||
* | forbid redefinition of language plural_select function | friendica | 2014-05-13 | 1 | -1/+2 |
| | |||||
* | Clean up legacy smarty3 | Thomas Willingham | 2014-04-19 | 12 | -291/+0 |
| | |||||
* | reset email templates to English | friendica | 2013-06-16 | 10 | -88/+180 |
| | |||||
* | global rename viewcontacts to viewconnections | friendica | 2013-02-19 | 1 | -5/+5 |
| | |||||
* | add newline at end of header | Zach Prezkuta | 2013-01-11 | 12 | -2/+14 |
| | |||||
* | add warning messae about automatically generated templates | Zach Prezkuta | 2013-01-11 | 12 | -12/+60 |
| | |||||
* | add Smarty templates for international templates | Zach Prezkuta | 2013-01-10 | 12 | -0/+231 |
| | |||||
* | use a single language config until all the new options are in place | friendica | 2012-10-17 | 1 | -68/+0 |
| | |||||
* | relocate register policy setting in language htconfig templates | friendica | 2012-10-07 | 1 | -2/+2 |
| | |||||
* | fix silly abandonded typo. shouldn't affect translations | Simon L'nu | 2012-04-18 | 2 | -2/+2 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 15 | -0/+0 |
| | | | | | | Conflicts: include/config.php update.php | ||||
* | htconfig.tpl - Friendika -> Friendica | Abinoam P. Marques Jr | 2012-02-20 | 1 | -2/+2 |
| | |||||
* | add remove_user hook (it looks like dreamhost changed all my file ↵ | friendica | 2012-01-18 | 15 | -0/+0 |
| | | | | permissions, this will make a nasty commit) | ||||
* | remove all plugins from default config | friendica | 2011-12-12 | 1 | -5/+0 |
| | |||||
* | little stuff - name change, live updates, new network types | friendica | 2011-11-23 | 1 | -1/+1 |
| | |||||
* | string update es,fr | friendica | 2011-11-22 | 2 | -4213/+4575 |
| | |||||
* | bug #159 multiple definition of string_plural_form function when changing ↵ | Friendika | 2011-09-21 | 1 | -10/+526 |
| | | | | languages | ||||
* | saved searches on search page, templates: Invalid argument supplied for ↵ | Friendika | 2011-09-08 | 1 | -344/+2765 |
| | | | | foreach() on line 167 | ||||
* | input the admin email address during install/setup. | Friendika | 2011-07-07 | 1 | -1/+1 |
| | |||||
* | Added backslash to $name so it doesn't throws an error. | bufalo1973 | 2011-06-18 | 1 | -6/+6 |
| | | | Añadida una barra a $name para que no dé error. | ||||
* | issues with private photos - hitting internal size limits | Friendika | 2011-05-04 | 1 | -1/+1 |
| | |||||
* | spanish fix | Friendika | 2011-04-14 | 1 | -1/+1 |
| | |||||
* | spanish translation update | Friendika | 2011-04-14 | 13 | -0/+304 |
| | |||||
* | initial spanish translation | Friendika | 2011-04-14 | 2 | -0/+3215 |