summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Collapse)AuthorAgeFilesLines
* prefix 'tbody tr' to separate app/core css errorspetemcfarlane2013-08-301-1/+1
| | | | For specific details see: https://github.com/owncloud/core/pull/4536/files#r6082305
* Reimplement filesummary in JSkondou2013-08-283-40/+125
| | | | Fix #993
* backport of #4357 to masterThomas Müller2013-08-272-24/+26
|
* Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacementMorris Jobke2013-08-271-1/+1
|\ | | | | Fix "select all" checkbox displacement when checked, fix #4571
| * Fix "select all" checkbox displacement when checkedPellaeon Lin2013-08-261-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-08-2745-48/+4
| |
* | Merge pull request #4586 from owncloud/fixing-3431-masterMorris Jobke2013-08-271-80/+0
|\ \ | | | | | | kill zh_CN.GB2312
| * | kill zh_CN.GB2312Thomas Müller2013-08-271-80/+0
| | |
* | | storage information is path specificThomas Müller2013-08-272-2/+2
|/ /
* | Merge pull request #4542 from owncloud/fixing-4504-masterMorris Jobke2013-08-262-198/+7
|\ \ | |/ |/| remove duplicate code
| * remove duplicate codeThomas Müller2013-08-222-198/+7
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-08-253-7/+9
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-08-232-0/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-08-222-6/+8
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-08-219-3/+12
|
* Merge pull request #4262 from owncloud/fix_jslint_kondouChristopher2013-08-203-10/+11
|\ | | | | Fix some JSLint warnings
| * Merge branch 'master' into fix_jslint_kondoukondou2013-08-1880-830/+894
| |\ | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js
| * | Fix a syntax error & have if-conds in an own linekondou2013-08-012-2/+6
| | |
| * | Fix some JSLint warningskondou2013-07-313-15/+14
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-198-25/+34
| | |
* | | adding file templates for ods, odt and odpThomas Müller2013-08-181-1/+3
| | |
* | | Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-183-0/+16
|\ \ \ | | | | | | | | Enable user to decrypt files again after encryption app was disabled
| * \ \ Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-1780-518/+588
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php
| * | | | remove whitespaces and some leftover code from testingBjoern Schiessle2013-08-151-1/+1
| | | | |
| * | | | check if some encrypted files are left after the app was disabled and warn ↵Bjoern Schiessle2013-08-123-0/+16
| | | | | | | | | | | | | | | | | | | | the user
* | | | | Merge pull request #4498 from owncloud/uploadprogress-near-uploadbuttonChristopher2013-08-181-4/+14
|\ \ \ \ \ | | | | | | | | | | | | move upload progress bar near upload button, more contextual
| * | | | | remove unneeded extra ID selectorsJan-Christoph Borchardt2013-08-181-2/+2
| | | | | |
| * | | | | move upload progress bar near upload button, more contextualJan-Christoph Borchardt2013-08-181-3/+13
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondouKondou2013-08-186-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Add newlines at the end of files
| * | | | | Add _many_ newlines at the end of fileskondou2013-08-186-6/+6
| |/ / / /
* | | | | Merge pull request #4483 from owncloud/compare-true-falseBart Visscher2013-08-182-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Compare result are already true/false
| * | | | Fix spacing of all touched lines.Andreas Fischer2013-08-171-1/+1
| | | | |
| * | | | Compare result are already true/falseBart Visscher2013-08-172-2/+2
| | |/ / | |/| |
* | | | Merge pull request #4339 from owncloud/mimetype-defaultsThomas Müller2013-08-174-315/+331
|\ \ \ \ | |/ / / |/| | | Add the option to provide templates for newly created files
| * | | communicate size of newly created file back and update UIThomas Müller2013-08-163-310/+316
| | | |
| * | | Merge branch 'master' into mimetype-defaultsThomas Müller2013-08-1677-392/+482
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/newfile.php
| * | | | actually register html templateRobin Appelman2013-08-071-5/+9
| | | | |
| * | | | add the option to have templates for newly created filesRobin Appelman2013-08-071-34/+38
| | | | |
* | | | | remove ru_RU - fixes #3135Thomas Müller2013-08-171-18/+0
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1662-134/+88
| | | | |
* | | | | Merge pull request #4113 from owncloud/delete-fixJan-Christoph Borchardt2013-08-153-15/+10
|\ \ \ \ \ | |_|/ / / |/| | | | Delete icon fix
| * | | | fix loading.gif size for both upload and deletion, force visiblityJan-Christoph Borchardt2013-07-301-1/+1
| | | | |
| * | | | Replace delete icon with spinnerVictor Dubiniuk2013-07-291-5/+3
| | | | |
| * | | | Merge branch 'master' into delete-fixThomas Müller2013-07-2329-87/+65
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/css/styles.css
| * | | | | fix delete button not showing in IE8Jan-Christoph Borchardt2013-07-221-4/+4
| | | | | |
| * | | | | use new delete icon for deleted files as wellJan-Christoph Borchardt2013-07-181-1/+1
| | | | | |
| * | | | | remove unnecessary tipsy for Files deleteJan-Christoph Borchardt2013-07-181-1/+1
| | | | | |
| * | | | | use background image instead of img for Files delete iconJan-Christoph Borchardt2013-07-181-4/+1
| | | | | |
* | | | | | Merge pull request #4354 from ↵Thomas Müller2013-08-151-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix_2711_shared_icon_disappears_on_firefox fix #2711 using a custom event, also use css selectors over filterAttr
| * | | | | | fix #2711 using a custom event, also use css selectors over filterAttrJörn Friedrich Dreyer2013-08-081-2/+3
| | |_|/ / / | |/| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-31 06:43:53 +0000