Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use share initiator as fall back to access the file | Björn Schießle | 2016-05-20 | 5 | -10/+72 |
| | | | | | in case of federated re-shares the owner can be a remote user. Therefore we can't always use to owner to access the local file | ||||
* | close cursor after select to avoid db lock | Björn Schießle | 2016-05-20 | 1 | -0/+1 |
| | |||||
* | create re-share by owner and propagate unshare and unshare-from self request | Björn Schießle | 2016-05-20 | 14 | -124/+774 |
| | | | | correctly accross share owner and share initiator | ||||
* | use query builder for getShare and add tests | Björn Schießle | 2016-05-20 | 2 | -10/+99 |
| | |||||
* | move request handler for federated shares to the federated sharing app | Björn Schießle | 2016-05-20 | 3 | -10/+155 |
| | |||||
* | Merge pull request #22576 from owncloud/folder_scroll_fix | Vincent Petry | 2016-05-20 | 1 | -0/+21 |
|\ | | | | | Add scrolling when dragging files. Fixes #12329 | ||||
| * | added back the jquery animations | Erik Pellikka | 2016-05-13 | 1 | -6/+11 |
| | | |||||
| * | code style fix | Erik Pellikka | 2016-05-13 | 1 | -11/+3 |
| | | |||||
| * | code style fix | Erik Pellikka | 2016-05-13 | 1 | -3/+2 |
| | | |||||
| * | code style fix | Erik Pellikka | 2016-05-13 | 1 | -2/+6 |
| | | |||||
| * | added elseif | Erik Pellikka | 2016-05-13 | 1 | -1/+1 |
| | | |||||
| * | fixed to work with share links as well | Erik Pellikka | 2016-05-13 | 1 | -3/+4 |
| | | |||||
| * | typo fix | Erik Pellikka | 2016-05-13 | 1 | -2/+2 |
| | | |||||
| * | Tweaking | Erik Pellikka | 2016-05-13 | 1 | -7/+7 |
| | | |||||
| * | Avoids jumping if window is smaller than 300 pixels in height | Morris Jobke | 2016-05-13 | 1 | -2/+3 |
| | | | | | | | | | | * divides the area where the scroll should be triggered by 2 * uses the minimum value of the above and 300 | ||||
| * | Add scrolling when dragging files | Erik Pellikka | 2016-05-13 | 1 | -0/+19 |
| | | |||||
* | | Merge pull request #24702 from owncloud/background-scan-occ | Vincent Petry | 2016-05-20 | 1 | -3/+12 |
|\ \ | | | | | | | add --unscanned option to files:scan to triger a background scan | ||||
| * | | add "unscanned" option to files:scan to triger a background scan | Robin Appelman | 2016-05-19 | 1 | -3/+12 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-20 | 8 | -2/+34 |
| | | | |||||
* | | | Merge pull request #24585 from owncloud/files_external_lazy | Vincent Petry | 2016-05-19 | 5 | -16/+224 |
|\ \ \ | | | | | | | | | Load external storage backends/auth mechanisms lazily | ||||
| * | | | Add tests for backend/auth mechanism providers | Robin McCorkell | 2016-05-11 | 1 | -0/+76 |
| | | | | |||||
| * | | | Use backend/auth mechanism providers in files_external | Robin McCorkell | 2016-05-11 | 1 | -16/+22 |
| | | | | |||||
| * | | | Introduce backend/auth mechanism providers | Robin McCorkell | 2016-05-11 | 3 | -0/+126 |
| | | | | | | | | | | | | | | | | Direct registration of backends/auth mechanisms is now deprecated | ||||
* | | | | Fix more failures | Joas Schilling | 2016-05-19 | 2 | -2/+2 |
| |/ / |/| | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-19 | 12 | -4/+62 |
| | | | |||||
* | | | Move FederatedFileSharing to PSR-4 | Joas Schilling | 2016-05-18 | 12 | -3/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-18 | 10 | -0/+16 |
| | | | |||||
* | | | Fixed dynamic group ldap access (#23450) | blizzz | 2016-05-17 | 1 | -9/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed dynamic group ldap access getUserGroups: Using $userDN instead of $uid to query LDAP Converting groupDN to group name using API instead of substring Removing cache processing at the end of the method * Fixing group handling added back the cache processing and fixed * fixed possible indention problem spaces -> tab conversion * formatting, white-space changes only | ||||
* | | | Group fixup (#24621) | Roeland Douma | 2016-05-17 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Move used OC_Group_xx to \OC\Group * Add (deprecated) legacy wrapper in legacy, OC_Group_xx * Replace deprecated use of OC_Group_xx with \OC\Group\xx | ||||
* | | | Merge pull request #24630 from owncloud/one-shall-adjust-the-path | Vincent Petry | 2016-05-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Use proper path | ||||
| * | | | Use proper path | Lukas Reschke | 2016-05-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/24407 | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-17 | 16 | -0/+152 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-16 | 30 | -2/+112 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-15 | 148 | -26/+360 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-14 | 256 | -262/+24 |
| |_|/ |/| | | |||||
* | | | Merge pull request #22341 from ↵ | Vincent Petry | 2016-05-13 | 2 | -0/+19 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/pellaeon-pr-breadcrumb-filelist-overlap-drop Handle case when breadcrumb and filelist item overlap and both receive a drop | ||||
| * | | | Handle case when breadcrumb and filelist item overlap | Pellaeon Lin | 2016-03-17 | 2 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and both receive a drop. Build breadcrumb over and out callback in filelist.js and pass them as options to utilize local selectors of filelist Re-enable td elements after drop to bread crumb Fix# drop handler still being called after enable, it seems that waiting for a short time before re-enabling solves the problem * Add explanations for setTimeout re-enable td.filename drop handler | ||||
* | | | | Merge pull request #22214 from owncloud/ext-better-dropbox-gdrive | Vincent Petry | 2016-05-13 | 15 | -29/+111 |
|\ \ \ \ | | | | | | | | | | | Direct links to Google Drive/Dropbox configuration pages from external storage config | ||||
| * | | | | Move Dropbox/GDrive link to icon | Robin McCorkell | 2016-05-03 | 3 | -8/+17 |
| | | | | | |||||
| * | | | | Change colour of input fields instead of printing 'Access granted' | Robin McCorkell | 2016-05-03 | 3 | -11/+16 |
| | | | | | |||||
| * | | | | Add links to load GDrive/Dropbox configuration pages | Robin McCorkell | 2016-05-03 | 6 | -4/+58 |
| | | | | | |||||
| * | | | | Allow multiple custom JS files | Robin McCorkell | 2016-05-03 | 8 | -18/+32 |
| | | | | | |||||
* | | | | | Merge pull request #24605 from ↵ | Vincent Petry | 2016-05-13 | 4 | -9/+120 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/luckydonald-Superduper-Progressbar-branch-thingie Luckydonald superduper progressbar branch thingie | ||||
| * \ \ \ \ | Merge branch 'Superduper-Progressbar-branch-thingie' of ↵ | Vincent Petry | 2016-05-12 | 4 | -9/+120 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | https://github.com/luckydonald/core into luckydonald-Superduper-Progressbar-branch-thingie | ||||
| | * | | | | | Optimized time formatting, optimized time smoothing. | luckydonald | 2014-08-14 | 1 | -11/+8 |
| | | | | | | | |||||
| | * | | | | | Changes for scrutinizer. Yay! | luckydonald | 2014-08-13 | 1 | -15/+29 |
| | | | | | | | |||||
| | * | | | | | fixed browser showing the tipsy tooltip as default tooltip twice. | luckydonald | 2014-08-13 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Fixed "Any minute now" staying because of undefined buffer. Also increased ↵ | luckydonald | 2014-08-13 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffer size to 20 to be less jittery. | ||||
| | * | | | | | Updated String formatting. Label font-weight was already normal. | luckydonald | 2014-08-13 | 2 | -11/+11 |
| | | | | | | | |||||
| | * | | | | | Fixed Positioning, fixed formatting for both mobile and desktop. | luckydonald | 2014-08-13 | 2 | -9/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tooltips still frustrate me- And the updated code with tabs nicely. yay. |