summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1131 from owncloud/more_translationsLukas Reschke2013-01-092-5/+6
|\ | | | | translate move and rename error messages
| * more translationsJörn Friedrich Dreyer2013-01-092-5/+6
| |
* | Merge pull request #1124 from schiesbn/sabredav2Lukas Reschke2013-01-091-1/+1
|\ \ | |/ |/| OC_Connector_Sabre_Client no longer needed
| * Upstream merged my patch to add additional ssl root certificates to the ↵Björn Schießle2013-01-081-1/+1
| | | | | | | | | | | | webdav client. This means that OC_Connector_Sabre_Client is no longer needed
* | [tx-robot] updated from transifexJenkins for ownCloud2013-01-0940-41/+13
| |
* | Merge pull request #938 from owncloud/fix_minor_files_annoyancesThomas Tanghus2013-01-084-52/+72
|\ \ | |/ |/| Fix minor files annoyances
| * fixing string concatenation in javascriptThomas Mueller2013-01-081-1/+1
| | | | | | | | refs https://github.com/owncloud/core/commit/ae54364d7c8baf5138d166855db6431190963886
| * attach max upload tipsy to div instead of a to fix tooltip not showing due ↵Jörn Friedrich Dreyer2013-01-072-3/+7
| | | | | | | | to new z-index
| * remove aborted uploadsJörn Friedrich Dreyer2013-01-071-0/+3
| |
| * adapt to isFileNameValid, whitespace cleanupJörn Friedrich Dreyer2013-01-072-28/+19
| |
| * Merge branch 'master' into fix_minor_files_annoyancesThomas Mueller2013-01-0655-18/+158
| |\ | | | | | | | | | | | | Conflicts: apps/files/js/files.js
| * | reverse z-index of a and input to make upload work again in ie8/9Jörn Friedrich Dreyer2013-01-041-2/+2
| | |
| * | remove initial iframe, is added automatically by jquery upload mechanismJörn Friedrich Dreyer2013-01-041-2/+0
| | |
| * | input/form switching cleanupJörn Friedrich Dreyer2013-01-022-3/+3
| | |
| * | abort rename on ESC keyupJörn Friedrich Dreyer2013-01-021-0/+7
| | |
| * | show notification when renaming a file to ''Jörn Friedrich Dreyer2013-01-021-0/+4
| | |
| * | enable enter in ie by using .submit()+form instead of .change(), use ↵Jörn Friedrich Dreyer2013-01-021-12/+25
| | | | | | | | | | | | notifications when name is empty
| * | whitespace cleanupJörn Friedrich Dreyer2013-01-021-14/+14
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-0811-1/+28
| | |
* | | Update apps/user_webdavauth/user_webdavauth.phpFrank Karlitschek2013-01-071-1/+1
| | | | | | | | | Fixing wrong documentation. Fixes https://github.com/owncloud/core/issues/1110 
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-074-0/+8
| |/ |/|
* | rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has ↵Thomas Mueller2013-01-062-5/+17
| | | | | | | | | | | | changed! adding file name checks and notifications to isFileNameValid() for . and empty file name
* | Files: prevent people from renaming files to '.'Robin Appelman2013-01-052-2/+2
| |
* | Merge pull request #1053 from owncloud/ocs_apiMichael Gapczynski2013-01-041-1/+1
|\ \ | | | | | | External API for ownCloud based on OCS
| * | Remove the WIP external sharing apiTom Needham2012-12-314-84/+0
| | |
| * | Merge branch 'master' into ocs_apiTom Needham2012-12-31100-202/+704
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: l10n/templates/core.pot l10n/templates/files.pot l10n/templates/files_encryption.pot l10n/templates/files_external.pot l10n/templates/files_sharing.pot l10n/templates/files_versions.pot l10n/templates/lib.pot l10n/templates/settings.pot l10n/templates/user_ldap.pot l10n/templates/user_webdavauth.pot
| * | | check if adminFrank Karlitschek2012-12-294-1/+10
| | | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-291-0/+2
| | | |
| * | | Change post_write hook to write to prevent creating a duplicate of the ↵Michael Gapczynski2012-12-291-1/+1
| | | | | | | | | | | | | | | | original file on upload
| * | | prevent keyboardshortcuts from catching events outside the main doc - e.g. ↵Thomas Mueller2012-12-291-0/+3
| | | | | | | | | | | | | | | | the share popup
| * | | Merge branch 'master' into ocs_apiTom Needham2012-12-1618-28/+45
| |\ \ \
| * \ \ \ Merge master into ocs_api, fix conflicts.Tom Needham2012-12-14248-1940/+3296
| |\ \ \ \
| * | | | | External Share API: Move url down one level in responseTom Needham2012-10-313-2/+15
| | | | | |
| * | | | | Fix url generated for public shared filesTom Needham2012-10-281-2/+2
| | | | | |
| * | | | | Merge master into ocs_apiTom Needham2012-10-28264-1195/+3585
| |\ \ \ \ \
| * | | | | | Add API method for sharing a file, currently only via a link.Tom Needham2012-10-283-1/+72
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-0542-0/+58
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-042-1/+3
| | | | | | |
* | | | | | | Merge pull request #1063 from owncloud/translate_not_enough_space_availableThomas Müller2013-01-031-5/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add translation call for 'Not enough space available' upload error
| * | | | | | | 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-035-0/+65
| | | | | | |
* | | | | | | Merge pull request #1041 from owncloud/fixing-856-masterThomas Müller2013-01-022-5/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fixing #856 master
| * | | | | | only show the max possible upload of 2GB on a 32 bit system.Thomas Mueller2012-12-282-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for a 64 bit system we have no such limitation refs #856 Conflicts: apps/files/templates/admin.php
| * | | | | | Revert "fixed max possible upload size for files app in admin screen"Thomas Mueller2012-12-281-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7f2208b9a11f608e7d726bf426fe4c2a672e058a. Conflicts: apps/files/admin.php
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-021-1/+2
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-013-4/+9
| |_|_|_|_|/ |/| | | | |