summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* fix wrong conflict resolutionMorris Jobke2014-05-191-1/+1
|
* Correctly set expiration dates when adding additional sharesJoas Schilling2014-05-191-4/+31
|
* Automatically copy the share expiration date when new shares are createdJoas Schilling2014-05-191-1/+2
| | | | Fix #4823
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-187-3/+50
|
* Merge pull request #8609 from owncloud/ie8-svgfallbackforiconsVincent Petry2014-05-171-0/+15
|\ | | | | SVG fallback for a few icons
| * SVG fallback for settings iconVincent Petry2014-05-161-0/+5
| |
| * Fallback for triangle iconsVincent Petry2014-05-161-0/+10
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1774-88/+117
| |
* | Merge pull request #8604 from owncloud/sharing_encforce_passwordBjörn Schießle2014-05-162-19/+34
|\ \ | | | | | | allow admin to enforce passwords for public link shares
| * | allow admin to enforce passwords for public link sharesBjoern Schiessle2014-05-162-19/+34
| | |
* | | Merge pull request #6260 from owncloud/jan-navigation-filesidebarVincent Petry2014-05-163-1/+117
|\ \ \ | |_|/ |/| | Files app navigation sidebar
| * | Fixed many issues, clean upVincent Petry2014-05-151-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 appVincent Petry2014-05-151-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 switchVincent Petry2014-05-151-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 appVincent Petry2014-05-152-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 DIVVincent Petry2014-05-151-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1614-6/+63
|/ /
* | 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
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1566-103/+104
| | |
* | | 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-143-2/+37
|\ \ \ | | | | | | | | 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
| | | |
* | | | 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
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-141-1/+40
| | | | |
* | | | | Merge pull request #8524 from owncloud/prompt-dialogThomas Müller2014-05-131-1/+60
|\ \ \ \ \ | | | | | | | | | | | | Add prompt dialog to OC.dialogs
| * | | | | Fix Typo, define $ as globalLukas Reschke2014-05-111-2/+2
| | | | | |
| * | | | | Add prompt dialog to OC.dialogsRobin Appelman2014-05-091-0/+59
| | | | | |
* | | | | | Merge pull request #8550 from owncloud/fix-sticky-footerMorris Jobke2014-05-131-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix sticky footer on log in page
| * | | | | | fix sticky footer on log in pageJan-Christoph Borchardt2014-05-121-2/+2
| | | | | | |
* | | | | | | Merge pull request #8526 from owncloud/escape-share-emails-masterVincent Petry2014-05-131-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | escape display name and email
| * | | | | | fix styleThomas Müller2014-05-121-2/+2
| | | | | | |
| * | | | | | escape display name and emailThomas Müller2014-05-091-1/+1
| | |/ / / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-131-0/+3
| | | | | |
* | | | | | remove legacy aka deprecated code: OC_CacheThomas Müller2014-05-121-4/+4
| |/ / / / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-123-17/+30
| | | | |
* | | | | Merge pull request #8518 from owncloud/multiselect-width-fixMorris Jobke2014-05-111-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 spaceJan-Christoph Borchardt2014-05-091-1/+1
| | |_|/ / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-112-1/+26
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-106-6/+44
| |/ / / |/| | |
* | | | Merge pull request #8496 from owncloud/fix-folder-iconJan-Christoph Borchardt2014-05-091-5/+4
|\ \ \ \ | |/ / / |/| | | fix folder icon (file had a big background rectangle before)