Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge master into oc_preview | Georg Ehrke | 2013-08-29 | 2 | -14/+122 |
|\ | |||||
| * | Reimplement filesummary in JS | kondou | 2013-08-28 | 1 | -0/+110 |
| * | backport of #4357 to master | Thomas Müller | 2013-08-27 | 1 | -14/+12 |
* | | use random string as id for checkbox | Georg Ehrke | 2013-08-26 | 1 | -1/+2 |
* | | fix background size in filelist.js | Georg Ehrke | 2013-08-26 | 1 | -1/+1 |
* | | Merge master into oc_preview | Georg Ehrke | 2013-08-26 | 2 | -204/+13 |
|\| | |||||
| * | remove duplicate code | Thomas Müller | 2013-08-22 | 2 | -198/+7 |
* | | fix preview issue when uploading a file with parentheses | Georg Ehrke | 2013-08-26 | 1 | -1/+3 |
* | | move path generation for previews to dedicated function | Georg Ehrke | 2013-08-23 | 2 | -3/+8 |
* | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-08-23 | 3 | -10/+11 |
|\| | |||||
| * | Merge pull request #4262 from owncloud/fix_jslint_kondou | Christopher | 2013-08-20 | 3 | -10/+11 |
| |\ | |||||
| | * | Merge branch 'master' into fix_jslint_kondou | kondou | 2013-08-18 | 4 | -338/+329 |
| | |\ | |||||
| | * | | Fix a syntax error & have if-conds in an own line | kondou | 2013-08-01 | 2 | -2/+6 |
| | * | | Fix some JSLint warnings | kondou | 2013-07-31 | 3 | -15/+14 |
* | | | | Merge master into oc_preview | Georg Ehrke | 2013-08-19 | 5 | -324/+338 |
|\| | | | |||||
| * | | | Merge pull request #4239 from owncloud/decrypt_files_again | Björn Schießle | 2013-08-18 | 1 | -0/+14 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 3 | -26/+24 |
| | |\ \ \ | |||||
| | * | | | | 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 | 1 | -0/+14 |
| * | | | | | Add _many_ newlines at the end of files | kondou | 2013-08-18 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #4339 from owncloud/mimetype-defaults | Thomas Müller | 2013-08-17 | 2 | -310/+314 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | communicate size of newly created file back and update UI | Thomas Müller | 2013-08-16 | 2 | -310/+314 |
| * | | | | Merge pull request #4113 from owncloud/delete-fix | Jan-Christoph Borchardt | 2013-08-15 | 2 | -11/+6 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | 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 | 2 | -5/+2 |
| | |\| | | |||||
| | * | | | 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 |
| | | |_|/ | | |/| | | |||||
* | | | | | vertically center rename input box | Jan-Christoph Borchardt | 2013-08-17 | 1 | -1/+1 |
* | | | | | use jQuery.get instead of jQuery.ajax | Georg Ehrke | 2013-08-16 | 1 | -6/+2 |
* | | | | | adjust New file dialog for new styles | Jan-Christoph Borchardt | 2013-08-15 | 1 | -1/+1 |
* | | | | | Merge master into oc_preview | Georg Ehrke | 2013-08-14 | 2 | -12/+5 |
|\| | | | | |||||
| * | | | | Reword a phrase | kondou | 2013-08-14 | 1 | -1/+1 |
| * | | | | Use plural translations | kondou | 2013-08-09 | 2 | -13/+6 |
| |/ / / | |||||
* | | | | increase row height to 50px, properly position everything, checkboxes, action... | Jan-Christoph Borchardt | 2013-08-14 | 1 | -1/+1 |
* | | | | lazy load preview icons | Georg Ehrke | 2013-08-14 | 2 | -7/+15 |
* | | | | don't use hardcoded size for preview | Georg Ehrke | 2013-08-14 | 1 | -1/+3 |
* | | | | style fixes | Georg Ehrke | 2013-07-30 | 1 | -1/+1 |
* | | | | Merge branch 'master' into oc_preview | Thomas Müller | 2013-07-30 | 2 | -6/+14 |
|\| | | | |||||
| * | | | remove whitespaces | Bjoern Schiessle | 2013-07-29 | 1 | -1/+1 |
| * | | | disable "deleted files" button if trash bin is empty | Björn Schießle | 2013-07-26 | 2 | -2/+11 |
| | |/ | |/| | |||||
| * | | finally remove the file size obfuscation as it had more disadvantages. I was ... | Jan-Christoph Borchardt | 2013-07-18 | 2 | -5/+2 |
| |/ | |||||
| * | add new file above summary if it is the first file in the list | Björn Schießle | 2013-07-12 | 1 | -0/+2 |
* | | merge conflicts ... | Georg Ehrke | 2013-07-10 | 4 | -160/+421 |
|\| | |||||
| * | Merge pull request #3903 from owncloud/nonpublic-uploading | Thomas Müller | 2013-07-01 | 1 | -1/+1 |
| |\ | |||||
| | * | fix detection of public upload in filelist.js | Robin Appelman | 2013-07-01 | 1 | -1/+1 |
| * | | Merge pull request #3223 from owncloud/fix-2820 | Morris Jobke | 2013-07-01 | 1 | -5/+36 |
| |\ \ | | |/ | |/| |