Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1131 from owncloud/more_translations | Lukas Reschke | 2013-01-09 | 2 | -5/+6 |
|\ | | | | | translate move and rename error messages | ||||
| * | more translations | Jörn Friedrich Dreyer | 2013-01-09 | 2 | -5/+6 |
| | | |||||
* | | Merge pull request #1124 from schiesbn/sabredav2 | Lukas Reschke | 2013-01-09 | 1 | -1/+1 |
|\ \ | |/ |/| | OC_Connector_Sabre_Client no longer needed | ||||
| * | Upstream merged my patch to add additional ssl root certificates to the ↵ | Björn Schießle | 2013-01-08 | 1 | -1/+1 |
| | | | | | | | | | | | | webdav client. This means that OC_Connector_Sabre_Client is no longer needed | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-09 | 40 | -41/+13 |
| | | |||||
* | | Merge pull request #938 from owncloud/fix_minor_files_annoyances | Thomas Tanghus | 2013-01-08 | 4 | -52/+72 |
|\ \ | |/ |/| | Fix minor files annoyances | ||||
| * | fixing string concatenation in javascript | Thomas Mueller | 2013-01-08 | 1 | -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 Dreyer | 2013-01-07 | 2 | -3/+7 |
| | | | | | | | | to new z-index | ||||
| * | remove aborted uploads | Jörn Friedrich Dreyer | 2013-01-07 | 1 | -0/+3 |
| | | |||||
| * | adapt to isFileNameValid, whitespace cleanup | Jörn Friedrich Dreyer | 2013-01-07 | 2 | -28/+19 |
| | | |||||
| * | Merge branch 'master' into fix_minor_files_annoyances | Thomas Mueller | 2013-01-06 | 55 | -18/+158 |
| |\ | | | | | | | | | | | | | Conflicts: apps/files/js/files.js | ||||
| * | | reverse z-index of a and input to make upload work again in ie8/9 | Jörn Friedrich Dreyer | 2013-01-04 | 1 | -2/+2 |
| | | | |||||
| * | | remove initial iframe, is added automatically by jquery upload mechanism | Jörn Friedrich Dreyer | 2013-01-04 | 1 | -2/+0 |
| | | | |||||
| * | | input/form switching cleanup | Jörn Friedrich Dreyer | 2013-01-02 | 2 | -3/+3 |
| | | | |||||
| * | | abort rename on ESC keyup | Jörn Friedrich Dreyer | 2013-01-02 | 1 | -0/+7 |
| | | | |||||
| * | | show notification when renaming a file to '' | Jörn Friedrich Dreyer | 2013-01-02 | 1 | -0/+4 |
| | | | |||||
| * | | enable enter in ie by using .submit()+form instead of .change(), use ↵ | Jörn Friedrich Dreyer | 2013-01-02 | 1 | -12/+25 |
| | | | | | | | | | | | | notifications when name is empty | ||||
| * | | whitespace cleanup | Jörn Friedrich Dreyer | 2013-01-02 | 1 | -14/+14 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-08 | 11 | -1/+28 |
| | | | |||||
* | | | Update apps/user_webdavauth/user_webdavauth.php | Frank Karlitschek | 2013-01-07 | 1 | -1/+1 |
| | | | | | | | | | Fixing wrong documentation. Fixes https://github.com/owncloud/core/issues/1110 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-07 | 4 | -0/+8 |
| |/ |/| | |||||
* | | rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has ↵ | Thomas Mueller | 2013-01-06 | 2 | -5/+17 |
| | | | | | | | | | | | | changed! adding file name checks and notifications to isFileNameValid() for . and empty file name | ||||
* | | Files: prevent people from renaming files to '.' | Robin Appelman | 2013-01-05 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #1053 from owncloud/ocs_api | Michael Gapczynski | 2013-01-04 | 1 | -1/+1 |
|\ \ | | | | | | | External API for ownCloud based on OCS | ||||
| * | | Remove the WIP external sharing api | Tom Needham | 2012-12-31 | 4 | -84/+0 |
| | | | |||||
| * | | Merge branch 'master' into ocs_api | Tom Needham | 2012-12-31 | 100 | -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 admin | Frank Karlitschek | 2012-12-29 | 4 | -1/+10 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-29 | 1 | -0/+2 |
| | | | | |||||
| * | | | Change post_write hook to write to prevent creating a duplicate of the ↵ | Michael Gapczynski | 2012-12-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | original file on upload | ||||
| * | | | prevent keyboardshortcuts from catching events outside the main doc - e.g. ↵ | Thomas Mueller | 2012-12-29 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | the share popup | ||||
| * | | | Merge branch 'master' into ocs_api | Tom Needham | 2012-12-16 | 18 | -28/+45 |
| |\ \ \ | |||||
| * \ \ \ | Merge master into ocs_api, fix conflicts. | Tom Needham | 2012-12-14 | 248 | -1940/+3296 |
| |\ \ \ \ | |||||
| * | | | | | External Share API: Move url down one level in response | Tom Needham | 2012-10-31 | 3 | -2/+15 |
| | | | | | | |||||
| * | | | | | Fix url generated for public shared files | Tom Needham | 2012-10-28 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge master into ocs_api | Tom Needham | 2012-10-28 | 264 | -1195/+3585 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add API method for sharing a file, currently only via a link. | Tom Needham | 2012-10-28 | 3 | -1/+72 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-05 | 42 | -0/+58 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-04 | 2 | -1/+3 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1063 from owncloud/translate_not_enough_space_available | Thomas Müller | 2013-01-03 | 1 | -5/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | add translation call for 'Not enough space available' upload error | ||||
| * | | | | | | | fix error when wrong dir was specified | Jörn Friedrich Dreyer | 2013-01-03 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | move $l to top | Jörn Friedrich Dreyer | 2013-01-03 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | fixing undefined variable $l | Thomas Mueller | 2013-01-02 | 1 | -1/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | also translate 'No file was uploaded. Unknown error' | Jörn Friedrich Dreyer | 2013-01-03 | 1 | -2/+2 |
| |/ / / / / / / | |||||
| * | | | | | / | add translation call for 'Not enough space available' upload error | Jörn Friedrich Dreyer | 2013-01-02 | 1 | -1/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-03 | 5 | -0/+65 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1041 from owncloud/fixing-856-master | Thomas Müller | 2013-01-02 | 2 | -5/+7 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fixing #856 master | ||||
| * | | | | | | only show the max possible upload of 2GB on a 32 bit system. | Thomas Mueller | 2012-12-28 | 2 | -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 Mueller | 2012-12-28 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7f2208b9a11f608e7d726bf426fe4c2a672e058a. Conflicts: apps/files/admin.php | ||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-02 | 1 | -1/+2 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-01 | 3 | -4/+9 |
| |_|_|_|_|/ |/| | | | | |