Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix wrong conflict resolution | Morris Jobke | 2014-05-19 | 1 | -1/+1 |
| | |||||
* | Correctly set expiration dates when adding additional shares | Joas Schilling | 2014-05-19 | 1 | -4/+31 |
| | |||||
* | Automatically copy the share expiration date when new shares are created | Joas Schilling | 2014-05-19 | 1 | -1/+2 |
| | | | | Fix #4823 | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-18 | 7 | -3/+50 |
| | |||||
* | Merge pull request #8609 from owncloud/ie8-svgfallbackforicons | Vincent Petry | 2014-05-17 | 1 | -0/+15 |
|\ | | | | | SVG fallback for a few icons | ||||
| * | SVG fallback for settings icon | Vincent Petry | 2014-05-16 | 1 | -0/+5 |
| | | |||||
| * | Fallback for triangle icons | Vincent Petry | 2014-05-16 | 1 | -0/+10 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-17 | 74 | -88/+117 |
| | | |||||
* | | Merge pull request #8604 from owncloud/sharing_encforce_password | Björn Schießle | 2014-05-16 | 2 | -19/+34 |
|\ \ | | | | | | | allow admin to enforce passwords for public link shares | ||||
| * | | allow admin to enforce passwords for public link shares | Bjoern Schiessle | 2014-05-16 | 2 | -19/+34 |
| | | | |||||
* | | | Merge pull request #6260 from owncloud/jan-navigation-filesidebar | Vincent Petry | 2014-05-16 | 3 | -1/+117 |
|\ \ \ | |_|/ |/| | | Files app navigation sidebar | ||||
| * | | Fixed many issues, clean up | Vincent Petry | 2014-05-15 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 | 1 | -0/+108 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 app navigation for files app | Vincent Petry | 2014-05-15 | 2 | -5/+3 |
| | | | | | | | | | | | | | | | | | | - 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 | 1 | -1/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-16 | 14 | -6/+63 |
|/ / | |||||
* | | 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 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-15 | 66 | -103/+104 |
| | | | |||||
* | | | 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 | 3 | -2/+37 |
|\ \ \ | | | | | | | | | 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 |
| | | | | |||||
* | | | | 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 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-14 | 1 | -1/+40 |
| | | | | | |||||
* | | | | | Merge pull request #8524 from owncloud/prompt-dialog | Thomas Müller | 2014-05-13 | 1 | -1/+60 |
|\ \ \ \ \ | | | | | | | | | | | | | Add prompt dialog to OC.dialogs | ||||
| * | | | | | Fix Typo, define $ as global | Lukas Reschke | 2014-05-11 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Add prompt dialog to OC.dialogs | Robin Appelman | 2014-05-09 | 1 | -0/+59 |
| | | | | | | |||||
* | | | | | | Merge pull request #8550 from owncloud/fix-sticky-footer | Morris Jobke | 2014-05-13 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix sticky footer on log in page | ||||
| * | | | | | | fix sticky footer on log in page | Jan-Christoph Borchardt | 2014-05-12 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #8526 from owncloud/escape-share-emails-master | Vincent Petry | 2014-05-13 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | escape display name and email | ||||
| * | | | | | | fix style | Thomas Müller | 2014-05-12 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | escape display name and email | Thomas Müller | 2014-05-09 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-13 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | remove legacy aka deprecated code: OC_Cache | Thomas Müller | 2014-05-12 | 1 | -4/+4 |
| |/ / / / |/| | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-12 | 3 | -17/+30 |
| | | | | | |||||
* | | | | | Merge pull request #8518 from owncloud/multiselect-width-fix | Morris Jobke | 2014-05-11 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | reduce multiselect max-width from 400 to 200px to not take too much space | ||||
| * | | | | | reduce multiselect max-width from 400 to 200px to not take too much space | Jan-Christoph Borchardt | 2014-05-09 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-11 | 2 | -1/+26 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-10 | 6 | -6/+44 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #8496 from owncloud/fix-folder-icon | Jan-Christoph Borchardt | 2014-05-09 | 1 | -5/+4 |
|\ \ \ \ | |/ / / |/| | | | fix folder icon (file had a big background rectangle before) |