summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2013-01-0746-9/+87
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-074-0/+8
| * rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has ...Thomas Mueller2013-01-062-5/+17
| * Files: prevent people from renaming files to '.'Robin Appelman2013-01-052-2/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-0542-0/+58
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-041-1/+1
* | merge master into filesystemRobin Appelman2013-01-0311-34/+195
|\|
| * Merge pull request #1063 from owncloud/translate_not_enough_space_availableThomas Müller2013-01-031-5/+6
| |\
| | * fix error when wrong dir was specifiedJörn Friedrich Dreyer2013-01-031-2/+2
| | * move $l to topJörn Friedrich Dreyer2013-01-031-0/+1
| | |\
| | | * fixing undefined variable $lThomas Mueller2013-01-021-1/+3
| | * | also translate 'No file was uploaded. Unknown error'Jörn Friedrich Dreyer2013-01-031-2/+2
| | |/
| | * add translation call for 'Not enough space available' upload errorJörn Friedrich Dreyer2013-01-021-1/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-031-0/+46
| * | Merge pull request #1041 from owncloud/fixing-856-masterThomas Müller2013-01-022-5/+7
| |\ \ | | |/ | |/|
| | * only show the max possible upload of 2GB on a 32 bit system.Thomas Mueller2012-12-282-1/+6
| | * Revert "fixed max possible upload size for files app in admin screen"Thomas Mueller2012-12-281-4/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-12-312-21/+103
| * | Merge pull request #1043 from owncloud/fix_breadcrumb_slashesLukas Reschke2012-12-301-2/+3
| |\ \
| | * | Replace %2F with / in breadcrumbsMichael Gapczynski2012-12-281-2/+3
| | |/
| * / [tx-robot] updated from transifexJenkins for ownCloud2012-12-301-0/+3
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-283-2/+28
* | merge master into filesystemRobin Appelman2012-12-2513-99/+138
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-241-0/+4
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-221-0/+1
| * Merge pull request #869 from owncloud/files-stylesJan-Christoph Borchardt2012-12-203-25/+36
| |\
| | * fix switched values from previous commitJan-Christoph Borchardt2012-12-201-2/+2
| | * fix Firefox issues with file actions position and multiselect bar widthJan-Christoph Borchardt2012-12-201-1/+2
| | * use slightly darker color for file actions background, fix fugly look for sel...Jan-Christoph Borchardt2012-12-201-1/+4
| | * fix file actions messing with file row height on narrower screensJan-Christoph Borchardt2012-12-201-1/+9
| | * move CSS from JS to CSSJan-Christoph Borchardt2012-12-202-13/+10
| | * bring back fixed multiselect bar so it’s visible when scrolled down, fix #746Jan-Christoph Borchardt2012-12-132-6/+8
| | * fix new button popup looking blurryJan-Christoph Borchardt2012-12-132-5/+5
| * | Merge pull request #974 from owncloud/fixing-120-masterJan-Christoph Borchardt2012-12-203-93/+76
| |\ \
| | * | remove timezone.jsThomas Müller2012-12-201-12/+0
| | * | setting the timezone is now part of the login process and true part of the core.Thomas Müller2012-12-202-81/+76
| * | | Merge pull request #925 from owncloud/fix_issue_918Bart Visscher2012-12-201-0/+6
| |\ \ \ | | |/ / | |/| |
| | * | Trigger last action before continuing with creating a new file/folder/from linkMichael Gapczynski2012-12-161-0/+3
| | * | Trigger the last action before continuing with a file upload, fixes issue #918Michael Gapczynski2012-12-161-0/+3
| * | | Merge pull request #913 from owncloud/fix_settingsFrank Karlitschek2012-12-181-3/+3
| |\ \ \
| | * | | cleaning up the settings. standardize the format, add missing I10N and other ...Frank Karlitschek2012-12-151-3/+3
| | |/ /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-191-0/+1
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-181-0/+24
| * | | Merge pull request #929 from owncloud/fix_utf8_filenames_in_ie_downloadThomas Müller2012-12-171-1/+6
| |\ \ \
| | * | | fix utf8 filenames in ie download response header according to rfc5987, see h...Jörn Friedrich Dreyer2012-12-171-1/+6
| | |/ /
| * | | Merge pull request #842 from owncloud/restrict_keyboard_shortcutsThomas Müller2012-12-171-0/+3
| |\ \ \ | | |/ / | |/| |
| | * | prevent keyboardshortcuts from catching events outside the main doc - e.g. th...Thomas Mueller2012-12-121-0/+3
* | | | merge master into filesystemRobin Appelman2012-12-158-15/+9
|\| | |
| * | | Merge pull request #875 from owncloud/multiplefiles_jsonBart Visscher2012-12-142-2/+2
| |\ \ \
| | * | | remove unneeded lineRobin Appelman2012-12-131-1/+0