summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |_|_|_|_|/ |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-3114-27/+206
| | | | | |
* | | | | | Merge pull request #1043 from owncloud/fix_breadcrumb_slashesLukas Reschke2012-12-301-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Replace %2F with / in breadcrumbs
| * | | | | | Replace %2F with / in breadcrumbsMichael Gapczynski2012-12-281-2/+3
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-307-7/+49
|/ / / / / /
* / / / / / [tx-robot] updated from transifexJenkins for ownCloud2012-12-295-1/+40
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2814-7/+89
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-275-1/+21
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-263-1/+18
| | | | |
* | | | | [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
|\ \ \ \ \ | | | | | | | | | | | | Files styles
| * | | | | 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 ↵Jan-Christoph Borchardt2012-12-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | selected rows
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | setting the timezone is now part of the login process
| * | | | | | remove timezone.jsThomas Müller2012-12-201-12/+0
| | | | | | |