Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 80 | -518/+588 |
|\ | |||||
| * | remove ru_RU - fixes #3135 | Thomas Müller | 2013-08-17 | 1 | -18/+0 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-16 | 62 | -134/+88 |
| * | Merge pull request #4113 from owncloud/delete-fix | Jan-Christoph Borchardt | 2013-08-15 | 3 | -15/+10 |
| |\ | |||||
| | * | fix loading.gif size for both upload and deletion, force visiblity | Jan-Christoph Borchardt | 2013-07-30 | 1 | -1/+1 |
| | * | Replace delete icon with spinner | Victor Dubiniuk | 2013-07-29 | 1 | -5/+3 |
| | * | Merge branch 'master' into delete-fix | Thomas Müller | 2013-07-23 | 29 | -87/+65 |
| | |\ | |||||
| | * | | fix delete button not showing in IE8 | Jan-Christoph Borchardt | 2013-07-22 | 1 | -4/+4 |
| | * | | use new delete icon for deleted files as well | Jan-Christoph Borchardt | 2013-07-18 | 1 | -1/+1 |
| | * | | remove unnecessary tipsy for Files delete | Jan-Christoph Borchardt | 2013-07-18 | 1 | -1/+1 |
| | * | | use background image instead of img for Files delete icon | Jan-Christoph Borchardt | 2013-07-18 | 1 | -4/+1 |
| * | | | Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_fir... | Thomas Müller | 2013-08-15 | 1 | -2/+3 |
| |\ \ \ | |||||
| | * | | | fix #2711 using a custom event, also use css selectors over filterAttr | Jörn Friedrich Dreyer | 2013-08-08 | 1 | -2/+3 |
| * | | | | fixing all broken translation files | Thomas Müller | 2013-08-15 | 68 | -204/+204 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-15 | 68 | -263/+204 |
| * | | | | Merge pull request #4376 from owncloud/use_plurals | Jörn Friedrich Dreyer | 2013-08-14 | 2 | -13/+6 |
| |\ \ \ \ | |||||
| | * | | | | Reword a phrase | kondou | 2013-08-14 | 1 | -1/+1 |
| | * | | | | Use plural translations | kondou | 2013-08-09 | 2 | -13/+6 |
| * | | | | | Merge pull request #4363 from owncloud/fix-4355 | Thomas Müller | 2013-08-14 | 1 | -11/+16 |
| |\ \ \ \ \ | |||||
| | * | | | | | Use multiple lines for the JSON data array. | Andreas Fischer | 2013-08-08 | 1 | -1/+5 |
| | * | | | | | Adjust JSON code to stable5. | Andreas Fischer | 2013-08-08 | 1 | -1/+2 |
| | * | | | | | Do not repeat JSON success code. | Andreas Fischer | 2013-08-08 | 1 | -8/+7 |
| | * | | | | | Do not repeat definition of $target. | Andreas Fischer | 2013-08-08 | 1 | -5/+6 |
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-11 | 1 | -0/+3 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-09 | 71 | -71/+213 |
| |/ / / / | |||||
| * | | | | Merge pull request #3912 from owncloud/css_cleanup_kondou | Jan-Christoph Borchardt | 2013-08-08 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into css_cleanup_kondou | kondou | 2013-07-24 | 33 | -95/+199 |
| | |\ \ \ \ | |||||
| | * | | | | | General CSS cleanup | kondou | 2013-07-09 | 1 | -1/+1 |
| * | | | | | | Merge pull request #4340 from owncloud/true-false-as-filename | Thomas Müller | 2013-08-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Check expected type after JSON decode instead of checking what is not expected. | Andreas Fischer | 2013-08-07 | 1 | -1/+1 |
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-07 | 1 | -0/+3 |
| | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #4285 from owncloud/scan-files-script-master | Thomas Müller | 2013-08-05 | 1 | -0/+31 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | remove cli check | Thomas Müller | 2013-08-02 | 1 | -4/+0 |
| | * | | | | | adjust usage text | Thomas Müller | 2013-08-02 | 1 | -2/+2 |
| | * | | | | | Use console.php entry point for file scanning from console | Bart Visscher | 2013-08-02 | 1 | -0/+35 |
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-02 | 1 | -12/+12 |
| |/ / / / / | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-31 | 1 | -0/+3 |
| * | | | | | Merge pull request #4203 from owncloud/trashbin_improvements | Björn Schießle | 2013-07-29 | 5 | -6/+20 |
| |\ \ \ \ \ | |||||
| | * | | | | | remove whitespaces | Bjoern Schiessle | 2013-07-29 | 1 | -1/+1 |
| | * | | | | | fix typo | Björn Schießle | 2013-07-26 | 1 | -1/+1 |
| | * | | | | | disable "deleted files" button if trash bin is empty | Björn Schießle | 2013-07-26 | 5 | -7/+21 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-29 | 1 | -0/+3 |
* | | | | | | remove whitespaces and some leftover code from testing | Bjoern Schiessle | 2013-08-15 | 1 | -1/+1 |
* | | | | | | check if some encrypted files are left after the app was disabled and warn th... | Bjoern Schiessle | 2013-08-12 | 3 | -0/+16 |
|/ / / / / | |||||
* / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-27 | 1 | -0/+2 |
|/ / / / | |||||
* | | | | Merge branch 'master' into sabre-objecttree | Robin Appelman | 2013-07-24 | 70 | -212/+480 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into more-themable-strings | Thomas Müller | 2013-07-24 | 18 | -69/+120 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge branch 'master' into disable-anon-upload-master | Thomas Müller | 2013-07-22 | 22 | -78/+100 |
| | |\ \ \ | |||||
| | | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-22 | 23 | -22/+3 |
| | | * | | | Merge pull request #4131 from owncloud/scanner-split | Bart Visscher | 2013-07-21 | 1 | -45/+29 |
| | | |\ \ \ |