summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-17967-19151/+24007
|
* Merge pull request #8555 from owncloud/sharing_default_expire_only_public_linksBjörn Schießle2014-05-163-8/+66
|\ | | | | use default expire date only for link shares
| * use default expire date only for link sharesBjoern Schiessle2014-05-163-8/+66
| |
* | Merge pull request #8604 from owncloud/sharing_encforce_passwordBjörn Schießle2014-05-169-29/+132
|\ \ | | | | | | allow admin to enforce passwords for public link shares
| * | allow admin to enforce passwords for public link sharesBjoern Schiessle2014-05-169-29/+132
| | |
* | | Merge pull request #8610 from owncloud/ie8-filesdndbugVincent Petry2014-05-161-1/+1
|\ \ \ | | | | | | | | Fix drag and drop in IE8
| * | | Fix drag and drop in IE8Vincent Petry2014-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | For some reason IE8 didn't like the sort function, so using the one from underscore instead.
* | | | Merge pull request #6260 from owncloud/jan-navigation-filesidebarVincent Petry2014-05-1646-3032/+4323
|\ \ \ \ | |/ / / |/| | | Files app navigation sidebar
| * | | Fixed many issues, clean upVincent Petry2014-05-1529-276/+540
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed upload and storage statistics - fixed infinite scroll to use the correct contain for scroll detection - fixed unit test that sometimes fail for rename case - controls are now sticky again - fixed selection overlay to be aligned with the table - fixed "select all" checkbox that had id conflicts - fixed public page - fixed global actions permissions detection - fix when URL contains an invalid view id - viewer mode now hides the sidebar (ex: text editor) - added unit tests for trashbin - clean up storage info in template (most is retrieved via ajax call now)
| * | | Namespacing for FileList, FileActions and trashbin appVincent Petry2014-05-1537-2941/+3796
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - FileList is now an instantiable class - FileActions is now in namespace - added App class for trashbin app - moved trashbin overrides into classes extending FileList - replaced many static calls with "this." or "self." to make the classes reusable/extendable - new URL parameter "view" to specify which view is shown, for example "files" or "trashbin" - added OC.Util.History utility class in core for handling history - moved URL handling/routing to OCA.Files.App - popstate will correctly update the current view and notify the view of the URL change so it can update the current dir - added JS unitt tests for the trashbin app - fixed public app to work with the new namespaces
| * | | Files app navigation can now switchVincent Petry2014-05-159-7/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added new OCA.Files namespace for files classes - the sidebar can now switch between views/containers - the trashbin renders in its own container but currently doesn't work due to overrides - added app.js as entry point for JS code (ideally all other files should only contain classes and not trigger anything)
| * | | Added navigation manager in files app for the sidebarVincent Petry2014-05-157-60/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps can now register navigation items into the sidebar of the files app. For every sidebar item there is a container. The container's content is rendered based on the script name given at registration time.
| * | | Added app navigation for files appVincent Petry2014-05-1510-14/+55
| | | | | | | | | | | | | | | | | | | | | | | | - Added links to trashbin and shared dir - Moved "WebDAV" settings block to the app nav's settings section - Added sidebar support in trashbin app as well
| * | | Now settings CSS class with appid in content DIVVincent Petry2014-05-153-3/+7
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-16365-2177/+2831
|/ / /
* | | Merge pull request #8603 from owncloud/trashbinfixVincent Petry2014-05-151-1/+1
|\ \ \ | |_|/ |/| | [regression] Fixed trashbin to use correct class
| * | Fixed trashbin to use correct classVincent Petry2014-05-151-1/+1
|/ / | | | | | | | | It seems that \OC_Filesystemview has been removed. Now using the correct class \OC\Files\View()
* | Merge pull request #8140 from owncloud/login-valignJan-Christoph Borchardt2014-05-152-6/+28
|\ \ | | | | | | Vertically align public layout to better fit small mobile screens
| * | Move vertical alignment of public layout to mobile. Refs #8140jbtbnl2014-05-042-16/+22
| | |
| * | Vertically align public layout to better fit small mobile screensjbtbnl2014-04-102-7/+23
| | |
* | | Merge pull request #8589 from fibsifan/files_external_sftp_portRobin McCorkell2014-05-151-4/+4
|\ \ \ | | | | | | | | rename URL-fields to Host for SFTP/FTP and SMB external Storage backends
| * | | changing label "URL" to "Host"fibsifan2014-05-151-4/+4
| | | |
* | | | Merge pull request #8587 from Raydiation/masterThomas Müller2014-05-155-7/+38
|\ \ \ \ | | | | | | | | | | Small cleanup and language detection for apps
| * | | | use registerService method instead of array accessBernhard Posselt2014-05-141-1/+1
| | | | |
| * | | | use fetch method instead of fetchRow because fetchRow is only an owncloud ↵Bernhard Posselt2014-05-142-6/+6
| | | | | | | | | | | | | | | | | | | | internal alias that exists purely for compability
| * | | | provide a way to detect the language that is being used (e.g. for clientside ↵Bernhard Posselt2014-05-142-0/+31
| | | | | | | | | | | | | | | | | | | | javascript language selection
* | | | | Merge pull request #8597 from owncloud/l10n-fix-typoVincent Petry2014-05-151-2/+2
|\ \ \ \ \ | | | | | | | | | | | | fix typo encryption
| * | | | | fix typo encryptionVolkan Gezer2014-05-151-2/+2
| | |_|_|/ | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-15344-12260/+12326
| | | | |
* | | | | Merge pull request #8567 from owncloud/test-ocshareunittestsThomas Müller2014-05-143-0/+101
|\ \ \ \ \ | |/ / / / |/| | | | Added ground work for OC.Share unit tests
| * | | | Added ground work for OC.Share unit testsVincent Petry2014-05-133-0/+101
| | | | |
* | | | | Merge pull request #8522 from owncloud/sharing_ux_improvementsBjörn Schießle2014-05-146-25/+69
|\ \ \ \ \ | | | | | | | | | | | | Sharing ux improvements
| * | | | | move expire message to the bottomBjoern Schiessle2014-05-131-1/+2
| | | | | |
| * | | | | hide default expire message if user sets expire dateBjoern Schiessle2014-05-131-0/+7
| | | | | |
| * | | | | increase width of share dialogBjoern Schiessle2014-05-131-1/+1
| | | | | |
| * | | | | add information about default expire date to the share dialogBjoern Schiessle2014-05-133-2/+29
| | | | | |
| * | | | | hide input field if default expire date isn't activatedBjoern Schiessle2014-05-133-23/+32
| | | | | |
* | | | | | Merge pull request #8403 from owncloud/fix-oc-dialogicewind19912014-05-141-6/+12
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | fix oc dialog because the body isn't 100% x 100% in dimensions anymore
| * | | | | Use jquery to get the window widthRobin Appelman2014-05-131-2/+2
| | | | | |
| * | | | | Don't set the dialog content height to a zero or negative valueRobin Appelman2014-05-131-4/+10
| | | | | |
| * | | | | Dont use absolute positioning for buttonrowRobin Appelman2014-05-131-3/+4
| | | | | |
| * | | | | fix oc dialog because the body isn't 100% x 100% in dimensions anymoreMorris Jobke2014-04-292-6/+5
| | | | | |
* | | | | | Merge pull request #8584 from Bagera/masterjbtbnl2014-05-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | avoid row resize on filename edit
| * | | | | | Set row height in files tableBagera2014-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets row height to avoid resize when name is edited
| * | | | | | fixes #7949Bagera2014-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets height to form to avoid resizing when filename link is not shown
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-14131-2033/+6816
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #8582 from owncloud/remove-outdated-update-scLukas Reschke2014-05-141-46/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | We do not support updates from 4.5 > 7.0 or even 3.0 > 7.0
| * | | | | | We do not support updates from 4.5 > 7.0Lukas Reschke2014-05-131-46/+0
| |/ / / / /
* | | | | | Merge pull request #8542 from owncloud/phpdoc-improvementsThomas Müller2014-05-13121-487/+543
|\ \ \ \ \ \ | | | | | | | | | | | | | | PHPDoc Improvements
| * | | | | | fixing variable namingThomas Müller2014-05-131-24/+24
| | | | | | |