Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-17 | 967 | -19151/+24007 |
| | |||||
* | Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links | Björn Schießle | 2014-05-16 | 3 | -8/+66 |
|\ | | | | | use default expire date only for link shares | ||||
| * | use default expire date only for link shares | Bjoern Schiessle | 2014-05-16 | 3 | -8/+66 |
| | | |||||
* | | Merge pull request #8604 from owncloud/sharing_encforce_password | Björn Schießle | 2014-05-16 | 9 | -29/+132 |
|\ \ | | | | | | | allow admin to enforce passwords for public link shares | ||||
| * | | allow admin to enforce passwords for public link shares | Bjoern Schiessle | 2014-05-16 | 9 | -29/+132 |
| | | | |||||
* | | | Merge pull request #8610 from owncloud/ie8-filesdndbug | Vincent Petry | 2014-05-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix drag and drop in IE8 | ||||
| * | | | Fix drag and drop in IE8 | Vincent Petry | 2014-05-16 | 1 | -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-filesidebar | Vincent Petry | 2014-05-16 | 46 | -3032/+4323 |
|\ \ \ \ | |/ / / |/| | | | Files app navigation sidebar | ||||
| * | | | Fixed many issues, clean up | Vincent Petry | 2014-05-15 | 29 | -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 app | Vincent Petry | 2014-05-15 | 37 | -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 switch | Vincent Petry | 2014-05-15 | 9 | -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 sidebar | Vincent Petry | 2014-05-15 | 7 | -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 app | Vincent Petry | 2014-05-15 | 10 | -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 DIV | Vincent Petry | 2014-05-15 | 3 | -3/+7 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-16 | 365 | -2177/+2831 |
|/ / / | |||||
* | | | Merge pull request #8603 from owncloud/trashbinfix | Vincent Petry | 2014-05-15 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | [regression] Fixed trashbin to use correct class | ||||
| * | | Fixed trashbin to use correct class | Vincent Petry | 2014-05-15 | 1 | -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-valign | Jan-Christoph Borchardt | 2014-05-15 | 2 | -6/+28 |
|\ \ | | | | | | | Vertically align public layout to better fit small mobile screens | ||||
| * | | Move vertical alignment of public layout to mobile. Refs #8140 | jbtbnl | 2014-05-04 | 2 | -16/+22 |
| | | | |||||
| * | | Vertically align public layout to better fit small mobile screens | jbtbnl | 2014-04-10 | 2 | -7/+23 |
| | | | |||||
* | | | Merge pull request #8589 from fibsifan/files_external_sftp_port | Robin McCorkell | 2014-05-15 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | rename URL-fields to Host for SFTP/FTP and SMB external Storage backends | ||||
| * | | | changing label "URL" to "Host" | fibsifan | 2014-05-15 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge pull request #8587 from Raydiation/master | Thomas Müller | 2014-05-15 | 5 | -7/+38 |
|\ \ \ \ | | | | | | | | | | | Small cleanup and language detection for apps | ||||
| * | | | | use registerService method instead of array access | Bernhard Posselt | 2014-05-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | use fetch method instead of fetchRow because fetchRow is only an owncloud ↵ | Bernhard Posselt | 2014-05-14 | 2 | -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 Posselt | 2014-05-14 | 2 | -0/+31 |
| | | | | | | | | | | | | | | | | | | | | javascript language selection | ||||
* | | | | | Merge pull request #8597 from owncloud/l10n-fix-typo | Vincent Petry | 2014-05-15 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | fix typo encryption | ||||
| * | | | | | fix typo encryption | Volkan Gezer | 2014-05-15 | 1 | -2/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-15 | 344 | -12260/+12326 |
| | | | | | |||||
* | | | | | Merge pull request #8567 from owncloud/test-ocshareunittests | Thomas Müller | 2014-05-14 | 3 | -0/+101 |
|\ \ \ \ \ | |/ / / / |/| | | | | Added ground work for OC.Share unit tests | ||||
| * | | | | Added ground work for OC.Share unit tests | Vincent Petry | 2014-05-13 | 3 | -0/+101 |
| | | | | | |||||
* | | | | | Merge pull request #8522 from owncloud/sharing_ux_improvements | Björn Schießle | 2014-05-14 | 6 | -25/+69 |
|\ \ \ \ \ | | | | | | | | | | | | | Sharing ux improvements | ||||
| * | | | | | move expire message to the bottom | Bjoern Schiessle | 2014-05-13 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | hide default expire message if user sets expire date | Bjoern Schiessle | 2014-05-13 | 1 | -0/+7 |
| | | | | | | |||||
| * | | | | | increase width of share dialog | Bjoern Schiessle | 2014-05-13 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | add information about default expire date to the share dialog | Bjoern Schiessle | 2014-05-13 | 3 | -2/+29 |
| | | | | | | |||||
| * | | | | | hide input field if default expire date isn't activated | Bjoern Schiessle | 2014-05-13 | 3 | -23/+32 |
| | | | | | | |||||
* | | | | | | Merge pull request #8403 from owncloud/fix-oc-dialog | icewind1991 | 2014-05-14 | 1 | -6/+12 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | fix oc dialog because the body isn't 100% x 100% in dimensions anymore | ||||
| * | | | | | Use jquery to get the window width | Robin Appelman | 2014-05-13 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Don't set the dialog content height to a zero or negative value | Robin Appelman | 2014-05-13 | 1 | -4/+10 |
| | | | | | | |||||
| * | | | | | Dont use absolute positioning for buttonrow | Robin Appelman | 2014-05-13 | 1 | -3/+4 |
| | | | | | | |||||
| * | | | | | fix oc dialog because the body isn't 100% x 100% in dimensions anymore | Morris Jobke | 2014-04-29 | 2 | -6/+5 |
| | | | | | | |||||
* | | | | | | Merge pull request #8584 from Bagera/master | jbtbnl | 2014-05-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | avoid row resize on filename edit | ||||
| * | | | | | | Set row height in files table | Bagera | 2014-05-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets row height to avoid resize when name is edited | ||||
| * | | | | | | fixes #7949 | Bagera | 2014-05-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets height to form to avoid resizing when filename link is not shown | ||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-14 | 131 | -2033/+6816 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge pull request #8582 from owncloud/remove-outdated-update-sc | Lukas Reschke | 2014-05-14 | 1 | -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.0 | Lukas Reschke | 2014-05-13 | 1 | -46/+0 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #8542 from owncloud/phpdoc-improvements | Thomas Müller | 2014-05-13 | 121 | -487/+543 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PHPDoc Improvements | ||||
| * | | | | | | fixing variable naming | Thomas Müller | 2014-05-13 | 1 | -24/+24 |
| | | | | | | |