Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | let file cache handle the versions size | Bjoern Schiessle | 2014-06-02 | 5 | -87/+14 |
* | Merge pull request #8676 from owncloud/encryption_improvements | Morris Jobke | 2014-06-02 | 4 | -155/+102 |
|\ | |||||
| * | ceanup encryption code, improved return codes | Bjoern Schiessle | 2014-06-02 | 4 | -155/+102 |
* | | Merge pull request #8613 from owncloud/filesize-alignment | Morris Jobke | 2014-06-02 | 4 | -3/+24 |
|\ \ | |||||
| * | | display "<1 kB" for really small files | Morris Jobke | 2014-06-02 | 4 | -3/+24 |
* | | | Merge pull request #8712 from owncloud/l10n-fully-translatable-webdav | Frank Karlitschek | 2014-06-02 | 4 | -5/+5 |
|\ \ \ | |||||
| * | | | document always links to the current version of OC | Volkan Gezer | 2014-05-29 | 2 | -2/+2 |
| * | | | fully translatable user_webdav | Volkan Gezer | 2014-05-29 | 4 | -5/+5 |
* | | | | Merge pull request #8784 from owncloud/fold-reshare-settings | Morris Jobke | 2014-06-02 | 2 | -10/+11 |
|\ \ \ \ | |||||
| * | | | | make reshare settings foldable | Volkan Gezer | 2014-05-29 | 2 | -10/+11 |
* | | | | | Port LDAP: fix filter can be reset and broken after upgrade from OC 5 #8579 | Arthur Schiwon | 2014-06-02 | 2 | -13/+31 |
* | | | | | Merge pull request #8718 from owncloud/share_icons_for_shared_by | Vincent Petry | 2014-06-02 | 1 | -13/+31 |
|\ \ \ \ \ | |||||
| * | | | | | add share icons for folders shared by the current user | Bjoern Schiessle | 2014-05-30 | 1 | -13/+31 |
* | | | | | | Merge pull request #8443 from owncloud/csrf-on-login-and-logout | Vincent Petry | 2014-06-02 | 3 | -1/+14 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into csrf-on-login-and-logout | Thomas Müller | 2014-05-19 | 1565 | -36600/+68630 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Redirect to index if the logout link is accessed without valid session | Lukas Reschke | 2014-05-11 | 1 | -0/+8 |
| * | | | | | | | Add CSRF check on login and logout | Lukas Reschke | 2014-05-04 | 3 | -1/+6 |
* | | | | | | | | Merge pull request #8807 from owncloud/add_filecache_index | Vincent Petry | 2014-06-02 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | add another index to the filecache to reduce the number of queries without a ... | Frank Karlitschek | 2014-05-31 | 1 | -0/+15 |
* | | | | | | | | | Merge pull request #8187 from owncloud/escape-more-character | Morris Jobke | 2014-06-02 | 2 | -1/+12 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | Fix typo | Lukas Reschke | 2014-05-31 | 1 | -1/+1 |
| * | | | | | | | | Add unit tests for escapeHTML | Lukas Reschke | 2014-05-28 | 1 | -0/+11 |
| * | | | | | | | | Also encode > and ' | Lukas Reschke | 2014-04-13 | 1 | -1/+1 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-02 | 49 | -95/+105 |
* | | | | | | | | | Merge pull request #8811 from owncloud/fix-phpdoc-ap | Bernhard Posselt | 2014-06-01 | 1 | -9/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix PHPDoc | Lukas Reschke | 2014-06-01 | 1 | -9/+1 |
|/ / / / / / / / / | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-01 | 367 | -2242/+2464 |
* | | | | | | | | | Merge pull request #8798 from owncloud/fix-corejs | Vincent Petry | 2014-05-31 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix undefined JS on login/setup page | Vincent Petry | 2014-05-30 | 1 | -3/+3 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-31 | 310 | -8947/+18171 |
* | | | | | | | | | Merge pull request #8800 from owncloud/db-changes-as-required-by-8483 | Thomas Müller | 2014-05-31 | 4 | -98/+65 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | - fix dropTable() and introduce tableExists() | Thomas Müller | 2014-05-30 | 4 | -98/+65 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #8444 from owncloud/cleanup-list-code | Thomas Müller | 2014-05-30 | 3 | -17/+14 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into cleanup-list-code | Thomas Müller | 2014-05-19 | 1565 | -36596/+68631 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Add missing \ | Lukas Reschke | 2014-05-04 | 1 | -1/+1 |
| * | | | | | | | | | Cleanup code a little bit | Lukas Reschke | 2014-05-04 | 3 | -23/+15 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #7614 from owncloud/test_annotations_working | Thomas Müller | 2014-05-30 | 3 | -0/+34 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | adding annotation check to checkServer() | Thomas Müller | 2014-05-19 | 1 | -0/+6 |
| * | | | | | | | | Merge branch 'master' into test_annotations_working | Thomas Müller | 2014-05-19 | 1535 | -35935/+67372 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | adopt new settings style | Thomas Müller | 2014-05-09 | 1 | -2/+2 |
| * | | | | | | | | Check if ReflectionMethod::getDocComment is working | Thomas Tanghus | 2014-05-09 | 3 | -0/+28 |
* | | | | | | | | | Merge pull request #8607 from owncloud/filescan_app_hook | Owen Winkler | 2014-05-30 | 2 | -9/+46 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Missed one. | ringmaster | 2014-05-30 | 1 | -1/+1 |
| * | | | | | | | | | Updates per comments on PR: | ringmaster | 2014-05-30 | 2 | -8/+22 |
| * | | | | | | | | | Prevent apps from affecting the scanner via hook. | ringmaster | 2014-05-28 | 1 | -16/+18 |
| * | | | | | | | | | Use 'filesystem_check_enable' as a config option. | ringmaster | 2014-05-27 | 2 | -5/+8 |
| * | | | | | | | | | Allow the default behavior to come from the config. | ringmaster | 2014-05-27 | 1 | -6/+12 |
| * | | | | | | | | | Rename variable to something more appropriate. | ringmaster | 2014-05-27 | 1 | -3/+3 |
| * | | | | | | | | | Allow apps to control via a hook to skip adding/removing a file during filescan | ringmaster | 2014-05-27 | 1 | -3/+15 |
* | | | | | | | | | | Merge pull request #8695 from owncloud/jserrorfixes | Lukas Reschke | 2014-05-30 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ |