Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview | Jan-Christoph Borchardt | 2013-08-14 | 1 | -2/+6 |
|\ | |||||
| * | fix adding preview-icon to clss attribute | Georg Ehrke | 2013-08-14 | 1 | -2/+6 |
* | | increase row height to 50px, properly position everything, checkboxes, action... | Jan-Christoph Borchardt | 2013-08-14 | 4 | -44/+131 |
|/ | |||||
* | fix breaking error due to ... a wrong icon link. Seriously? | Jan-Christoph Borchardt | 2013-08-14 | 1 | -1/+1 |
* | lazy load preview icons | Georg Ehrke | 2013-08-14 | 2 | -7/+15 |
* | use web.svg instead of web.png | Georg Ehrke | 2013-08-14 | 1 | -1/+1 |
* | don't use hardcoded size for preview | Georg Ehrke | 2013-08-14 | 2 | -2/+4 |
* | fix js error | Georg Ehrke | 2013-08-07 | 1 | -1/+1 |
* | implement previews of single shared files | Georg Ehrke | 2013-08-07 | 2 | -1/+5 |
* | fix merge conflicts | Georg Ehrke | 2013-08-05 | 68 | -57/+340 |
|\ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-05 | 2 | -1/+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-04 | 4 | -1/+8 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-03 | 8 | -1/+22 |
| * | | Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-app | Jörn Friedrich Dreyer | 2013-08-02 | 8 | -27/+27 |
| |\ \ | |||||
| | * | | Use isIgnoredDir() | kondou | 2013-07-10 | 1 | -1/+1 |
| | * | | Use !== and === in files_trashbin-app | kondou | 2013-07-10 | 8 | -27/+27 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-02 | 5 | -12/+26 |
| | |/ | |/| | |||||
| * | | Merge pull request #4270 from owncloud/fix_4253 | Björn Schießle | 2013-08-01 | 2 | -11/+14 |
| |\ \ | |||||
| | * | | fix test and make warning translatable | Bjoern Schiessle | 2013-08-01 | 2 | -3/+9 |
| | * | | cancel sharing if some users doesn't have a working encryption set-up. | Bjoern Schiessle | 2013-08-01 | 1 | -9/+6 |
| * | | | Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdoc | Jörn Friedrich Dreyer | 2013-08-01 | 1 | -0/+15 |
| |\ \ \ | |||||
| | * | | | added @var tags | Christian Berendt | 2013-08-01 | 1 | -0/+15 |
| * | | | | Merge pull request #4266 from berendt/OC_Files_Storage_AmazonS3_logging | Jörn Friedrich Dreyer | 2013-08-01 | 1 | -0/+14 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | write all catched exception messages to the log | Christian Berendt | 2013-08-01 | 1 | -0/+14 |
| | |/ / | |||||
| * / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-01 | 23 | -3/+90 |
| |/ / | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-31 | 11 | -1/+46 |
| * | | Merge pull request #4225 from owncloud/better-404 | Thomas Müller | 2013-07-30 | 3 | -0/+30 |
| |\ \ | |||||
| | * | | Use default cursor for list items | Victor Dubiniuk | 2013-07-30 | 1 | -1/+1 |
| | * | | Rewording | Victor Dubiniuk | 2013-07-29 | 1 | -1/+1 |
| | * | | Move styles from core to app | Victor Dubiniuk | 2013-07-29 | 2 | -0/+13 |
| | * | | Allow apps to have own 404 content, closes #3225 | Victor Dubiniuk | 2013-07-29 | 2 | -0/+17 |
| * | | | added missing isEmpty ajax file | Bjoern Schiessle | 2013-07-30 | 1 | -0/+14 |
* | | | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-07-30 | 10 | -5/+70 |
|\| | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-30 | 10 | -5/+70 |
* | | | | style fixes | Georg Ehrke | 2013-07-30 | 3 | -3/+3 |
* | | | | Merge branch 'master' into oc_preview | Thomas Müller | 2013-07-30 | 958 | -1821/+80173 |
|\| | | | |||||
| * | | | Merge pull request #4203 from owncloud/trashbin_improvements | Björn Schießle | 2013-07-29 | 8 | -48/+133 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | remove whitespaces | Bjoern Schiessle | 2013-07-29 | 1 | -1/+1 |
| | * | | reduce time for auto expire to 30 days by default | Björn Schießle | 2013-07-26 | 1 | -1/+1 |
| | * | | found some more places where we can disable buttons while performing a action | Björn Schießle | 2013-07-26 | 1 | -6/+18 |
| | * | | Hide Delete Permanently button when Restore happens | Björn Schießle | 2013-07-26 | 1 | -0/+4 |
| | * | | make 'restored' extension translatable | Björn Schießle | 2013-07-26 | 1 | -2/+3 |
| | * | | fix typo | Björn Schießle | 2013-07-26 | 1 | -1/+1 |
| | * | | expire trash bin if trash bin exceeds max size after a new file was added to ... | Björn Schießle | 2013-07-26 | 2 | -7/+34 |
| | * | | disable "deleted files" button if trash bin is empty | Björn Schießle | 2013-07-26 | 6 | -7/+36 |
| | * | | don't move empty folders to the trash bin | Björn Schießle | 2013-07-25 | 1 | -0/+5 |