summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2012-12-2572-137/+289
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-251-0/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-246-2/+14
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-2310-9/+32
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-228-6/+13
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-219-6/+14
| * 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-185-22/+16
| |\ \ \
| | * | | cleaning up the settings. standardize the format, add missing I10N and other ...Frank Karlitschek2012-12-155-22/+16
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-198-0/+14
| * | | | Merge pull request #905 from owncloud/fix_mountpointescapingThomas Müller2012-12-181-2/+2
| |\ \ \ \
| | * | | | proper escape the mountpoints. FixesFrank Karlitschek2012-12-141-2/+2
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-189-0/+57
| * | | | | 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
| * | | | | | check if adminFrank Karlitschek2012-12-174-1/+10
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-171-0/+2
| * | | | | | Change post_write hook to write to prevent creating a duplicate of the origin...Michael Gapczynski2012-12-161-1/+1
| | |_|_|/ / | |/| | | |
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-168-0/+15
| | |_|/ / | |/| | |
* | | | | Initial support for file sharing with filesystem branchMichael Gapczynski2012-12-157-153/+471
* | | | | merge master into filesystemRobin Appelman2012-12-1550-106/+263
|\| | | |
| * | | | Merge pull request #875 from owncloud/multiplefiles_jsonBart Visscher2012-12-142-2/+2
| |\ \ \ \
| | * | | | remove unneeded lineRobin Appelman2012-12-131-1/+0
| | * | | | use json encoding when deleting multiply files instead of using ; as delimiterRobin Appelman2012-12-132-1/+2
| | | |_|/ | | |/| |
| * | | | More style fixesBart Visscher2012-12-151-1/+1
| * | | | More whitespace fixesBart Visscher2012-12-151-9/+9
| * | | | Fix "There must be a single space between the closing parenthesis and the ope...Bart Visscher2012-12-151-1/+1
| * | | | Fix some of "Closing brace must be on a line by itself"Bart Visscher2012-12-151-1/+3
| * | | | Fix "Line indented incorrectly"Bart Visscher2012-12-154-10/+10
| * | | | Fix "No space found after comma in function call"Bart Visscher2012-12-153-3/+3
| | |_|/ | |/| |
| * | | Give also hint about possible conflicts in the user_webdavauth descriptionArthur Schiwon2012-12-141-1/+3
| * | | Also show a more prominent warning when php_ldap is not installedArthur Schiwon2012-12-141-0/+3
| * | | Show conflict warning when user_ldap and user_webdavauth are enabledArthur Schiwon2012-12-141-0/+4
| * | | Show conflict warning when user_ldap and user_webdavauth are enabledArthur Schiwon2012-12-143-1/+11
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-145-0/+8