Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4239 from owncloud/decrypt_files_again | Björn Schießle | 2013-08-18 | 3 | -1/+36 |
|\ | |||||
| * | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 109 | -1018/+1679 |
| |\ | |||||
| * | | throw exception if encryption was disabled but files are still encrypted to p... | Bjoern Schiessle | 2013-08-14 | 1 | -1/+11 |
| * | | check if some encrypted files are left after the app was disabled and warn th... | Bjoern Schiessle | 2013-08-12 | 2 | -0/+25 |
| * | | fix searchUsers() call in group.php | Bjoern Schiessle | 2013-07-31 | 1 | -1/+1 |
* | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondou | Kondou | 2013-08-18 | 9 | -9/+9 |
|\ \ \ | |||||
| * | | | Add _many_ newlines at the end of files | kondou | 2013-08-18 | 9 | -9/+9 |
* | | | | Port DAV groupMemberSet fix to master #4458 | Thomas Tanghus | 2013-08-18 | 1 | -6/+8 |
* | | | | Merge pull request #4485 from guruz/class_autoloader_optimization | Markus Goetz | 2013-08-18 | 2 | -1/+54 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Class Auto Loader: Cache paths in APC | Markus Goetz | 2013-08-18 | 2 | -1/+54 |
* | | | | Merge pull request #4339 from owncloud/mimetype-defaults | Thomas Müller | 2013-08-17 | 3 | -236/+375 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Merge branch 'master' into mimetype-defaults | Thomas Müller | 2013-08-16 | 99 | -850/+1360 |
| |\ \ \ | |||||
| * | | | | use === | Robin Appelman | 2013-08-07 | 1 | -4/+4 |
| * | | | | add the option to have templates for newly created files | Robin Appelman | 2013-08-07 | 2 | -0/+60 |
| * | | | | split of mimetype detection code from OC_Helper, adding the option for apps t... | Robin Appelman | 2013-08-07 | 2 | -236/+315 |
* | | | | | remove ru_RU - fixes #3135 | Thomas Müller | 2013-08-17 | 1 | -6/+0 |
* | | | | | Merge pull request #4314 from owncloud/css-fixes | Jan-Christoph Borchardt | 2013-08-16 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | merge master into css-fixes | Jan-Christoph Borchardt | 2013-08-16 | 109 | -1008/+1661 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | change long couldn't be determined string to question mark again | Jan-Christoph Borchardt | 2013-08-04 | 1 | -1/+1 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-16 | 8 | -29/+34 |
| |/ / / / |/| | | | | |||||
* | | | | | fixing all broken translation files | Thomas Müller | 2013-08-15 | 78 | -312/+312 |
* | | | | | Cache OC_Util::checkServer() result in session | Markus Goetz | 2013-08-15 | 1 | -0/+7 |
| |_|/ / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-15 | 78 | -339/+357 |
* | | | | Merge pull request #4376 from owncloud/use_plurals | Jörn Friedrich Dreyer | 2013-08-14 | 1 | -6/+4 |
|\ \ \ \ | |||||
| * | | | | Use plural translations | kondou | 2013-08-09 | 1 | -6/+4 |
* | | | | | Scanner: correctly pass trough reuse options when doing a recursive scan | Robin Appelman | 2013-08-12 | 1 | -1/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-11 | 66 | -67/+1 |
* | | | | | Changing elseif statement to what the PEAR coding guidelines say. | Andreas Fischer | 2013-08-09 | 1 | -2/+1 |
* | | | | | Do not pass numeric strings to strtotime() when formatting dates. | Andreas Fischer | 2013-08-09 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #4344 from owncloud/appmgmt-in-navigation | Jan-Christoph Borchardt | 2013-08-09 | 1 | -9/+1 |
|\ \ \ \ | |||||
| * | | | | show 'More apps' link to app administration directly in app navigation | Jan-Christoph Borchardt | 2013-08-07 | 1 | -9/+1 |
| | |/ / | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-09 | 72 | -71/+280 |
* | | | | Merge pull request #4271 from owncloud/plural_translations | Owen Winkler | 2013-08-08 | 2 | -9/+198 |
|\ \ \ \ | |||||
| * | | | | initialize $plural_form_string with English default | Thomas Müller | 2013-08-03 | 1 | -1/+1 |
| * | | | | unit tests for plural translations added | Thomas Müller | 2013-08-02 | 2 | -6/+36 |
| * | | | | PHPDoc comments adjusted *partially* - fixing call to createPluralFormFunction | Thomas Müller | 2013-08-02 | 1 | -11/+18 |
| * | | | | Fix syntax error. | Jakob Sack | 2013-08-01 | 1 | -1/+2 |
| * | | | | Fix copy and paste errors in l10n.php | Jakob Sack | 2013-08-01 | 2 | -2/+2 |
| * | | | | Create plural functions on the fly | Jakob Sack | 2013-08-01 | 2 | -7/+86 |
| * | | | | Update l10n.php to read plural_forms string | Jakob Sack | 2013-08-01 | 1 | -8/+22 |
| * | | | | Fix an error jenkins found | Jakob Sack | 2013-07-16 | 1 | -1/+1 |
| * | | | | Add multiple plural forms to the php part | Jakob Sack | 2013-07-16 | 2 | -5/+38 |
| * | | | | make l10n libs capable of handling plural translations | Jakob Sack | 2013-07-07 | 2 | -3/+28 |
* | | | | | Merge pull request #4151 from owncloud/doctrine-object | Jörn Friedrich Dreyer | 2013-08-08 | 9 | -335/+488 |
|\ \ \ \ \ | |||||
| * | | | | | More style fixes | Bart Visscher | 2013-08-07 | 2 | -15/+15 |
| * | | | | | Fix stupid bug | Bart Visscher | 2013-08-07 | 1 | -1/+2 |
| * | | | | | Move query processing after the check for prepared statement cache | Bart Visscher | 2013-08-07 | 1 | -4/+4 |
| * | | | | | Style fixes | Bart Visscher | 2013-08-07 | 4 | -6/+8 |
| * | | | | | merge master into doctrine-object | Robin Appelman | 2013-08-06 | 8 | -82/+99 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | merge master into doctrine-object | Robin Appelman | 2013-08-02 | 62 | -699/+1559 |
| |\ \ \ \ \ |