Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-31 | 14 | -27/+206 |
| | | | | | | |||||
* | | | | | | Merge pull request #1043 from owncloud/fix_breadcrumb_slashes | Lukas Reschke | 2012-12-30 | 1 | -2/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Replace %2F with / in breadcrumbs | ||||
| * | | | | | | Replace %2F with / in breadcrumbs | Michael Gapczynski | 2012-12-28 | 1 | -2/+3 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-30 | 7 | -7/+49 |
|/ / / / / / | |||||
* / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-29 | 5 | -1/+40 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-28 | 14 | -7/+89 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-27 | 5 | -1/+21 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-26 | 3 | -1/+18 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-25 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-24 | 6 | -2/+14 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-23 | 10 | -9/+32 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-22 | 8 | -6/+13 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-21 | 9 | -6/+14 |
| | | | | | |||||
* | | | | | Merge pull request #869 from owncloud/files-styles | Jan-Christoph Borchardt | 2012-12-20 | 3 | -25/+36 |
|\ \ \ \ \ | | | | | | | | | | | | | Files styles | ||||
| * | | | | | fix switched values from previous commit | Jan-Christoph Borchardt | 2012-12-20 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | fix Firefox issues with file actions position and multiselect bar width | Jan-Christoph Borchardt | 2012-12-20 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | use slightly darker color for file actions background, fix fugly look for ↵ | Jan-Christoph Borchardt | 2012-12-20 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | selected rows | ||||
| * | | | | | fix file actions messing with file row height on narrower screens | Jan-Christoph Borchardt | 2012-12-20 | 1 | -1/+9 |
| | | | | | | |||||
| * | | | | | move CSS from JS to CSS | Jan-Christoph Borchardt | 2012-12-20 | 2 | -13/+10 |
| | | | | | | |||||
| * | | | | | bring back fixed multiselect bar so it’s visible when scrolled down, fix #746 | Jan-Christoph Borchardt | 2012-12-13 | 2 | -6/+8 |
| | | | | | | |||||
| * | | | | | fix new button popup looking blurry | Jan-Christoph Borchardt | 2012-12-13 | 2 | -5/+5 |
| | | | | | | |||||
* | | | | | | Merge pull request #974 from owncloud/fixing-120-master | Jan-Christoph Borchardt | 2012-12-20 | 3 | -93/+76 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | setting the timezone is now part of the login process | ||||
| * | | | | | | remove timezone.js | Thomas Müller | 2012-12-20 | 1 | -12/+0 |
| | | | | | | |