Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #236 from nextcloud/master-sync-upstream | Morris Jobke | 2016-06-28 | 2 | -26/+6 |
|\ | | | | | [Master] sync upstream | ||||
| * | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-27 | 2 | -26/+6 |
| |\ | |||||
| | * | Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadperms | Vincent Petry | 2016-06-27 | 1 | -1/+1 |
| | |\ | | | | | | | | | Add explicit delete permission to link shares | ||||
| | | * | Add explicit delete permission to link shares | Vincent Petry | 2016-06-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link shares always allowed deletion, however internally the permissions were stored as 7 which lacked delete permissions. This created an inconsistency in the Webdav permissions. This fix makes sure we include delete permissions in the share permissions, which now become 15. In case a client is still passing 7 for legacy reasons, it gets converted automatically to 15. | ||||
| | * | | Merge pull request #25129 from owncloud/remove-ie | Vincent Petry | 2016-06-27 | 1 | -25/+5 |
| | |\ \ | | | |/ | | |/| | Remove ie8+9 support | ||||
| | | * | remove ie8+9 support | Hendrik Leppelsack | 2016-06-23 | 1 | -25/+5 |
| | | | | |||||
* | | | | Migrate logic to dynamic controller | Lukas Reschke | 2016-06-27 | 1 | -1/+1 |
|/ / / | | | | | | | | | | Also adds support for having custom login backgrounds | ||||
* | | | Merge remote-tracking branch 'upstream/master' into master-upstream-sync | Lukas Reschke | 2016-06-26 | 2 | -2/+5 |
|\| | | |||||
| * | | Merge pull request #25239 from owncloud/setupchecks-preventreload | Vincent Petry | 2016-06-24 | 1 | -2/+4 |
| |\ \ | | |/ | |/| | Don't reload page in case of auth errors during setup checks | ||||
| | * | Don't reload page in case of auth errors during setup checks | Vincent Petry | 2016-06-23 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | If an error occurs during setup checks, do not let the global ajax error handler reload the page. | ||||
| * | | Init the headers in iedavclient.js | Vincent Petry | 2016-06-22 | 1 | -0/+1 |
| |/ | |||||
* | | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-21 | 1 | -1/+2 |
|\| | |||||
| * | Prevent the advanced options toggle in the setup from acting as a link | Robin Appelman | 2016-06-16 | 1 | -1/+2 |
| | | |||||
* | | fix setup page strengthify | Morris Jobke | 2016-06-15 | 1 | -1/+2 |
| | | | | | | | | * fixes #105 | ||||
* | | Change name of the product in update message | Morris Jobke | 2016-06-14 | 1 | -2/+2 |
| | | | | | | | | | | * also update all german translations * fixes #96 | ||||
* | | smaller files drop fixes | Arthur Schiwon | 2016-06-11 | 1 | -2/+2 |
| | | | | | | | | | | | | * fix infinite spinner on blacklisted files * move HTML to template * indentation | ||||
* | | Merge pull request #19 from nextcloud/files-drop | Lukas Reschke | 2016-06-10 | 3 | -3/+57 |
|\ \ | |/ |/| | add "hide file list" option | ||||
| * | Fix indentation | Lukas Reschke | 2016-06-09 | 1 | -16/+16 |
| | | |||||
| * | Add fancy layout | Lukas Reschke | 2016-06-09 | 1 | -1/+0 |
| | | |||||
| * | add hide file list option | Bjoern Schiessle | 2016-06-09 | 2 | -5/+60 |
| | | |||||
* | | Use temporary htaccesstest.txt for data dir security check | Vincent Petry | 2016-06-07 | 2 | -3/+3 |
|/ | |||||
* | Update license headers | Lukas Reschke | 2016-05-26 | 1 | -2/+2 |
| | |||||
* | Rename "not-assignble" to "restricted" | Vincent Petry | 2016-05-20 | 3 | -3/+3 |
| | |||||
* | Act on effective system tag canAssign permission | Vincent Petry | 2016-05-20 | 3 | -25/+64 |
| | | | | | | | | | Whenever the server returns true for the can-assign Webdav property of a system tag, it means the current user is allowed to assign, regardless of the value of user-assignable. This commit brings the proper logic to the web UI to make it possible for users to assign when they have the permission. | ||||
* | Merge pull request #24397 from owncloud/sort-share-links | Morris Jobke | 2016-05-10 | 1 | -9/+9 |
|\ | | | | | Reordered share link settings | ||||
| * | Reordered share link settings | Vincent Chan | 2016-05-02 | 1 | -9/+9 |
| | | | | | | | | closes #24122 | ||||
* | | Merge pull request #24434 from owncloud/permalinks | Lukas Reschke | 2016-05-10 | 1 | -3/+39 |
|\ \ | | | | | | | Permalinks | ||||
| * | | Do not encode slashes in "dir" URL param in files JS | Vincent Petry | 2016-05-06 | 1 | -1/+6 |
| | | | |||||
| * | | Auto-add fileid in URL for currently displayed folder | Vincent Petry | 2016-05-06 | 1 | -2/+33 |
| |/ | |||||
* / | New animated loader | skjnldsv | 2016-05-09 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #23918 from owncloud/cruds-for-federated-shares | Björn Schießle | 2016-04-22 | 2 | -34/+16 |
|\ | | | | | bring back CRUDS permissions for federated shares | ||||
| * | always share with same default permissions, no special handling for remote ↵ | Björn Schießle | 2016-04-20 | 1 | -15/+11 |
| | | | | | | | | shares | ||||
| * | bring back CRUDS permissions for federated shares | Bjoern Schiessle | 2016-04-18 | 2 | -19/+5 |
| | | |||||
* | | Merge pull request #24126 from owncloud/err-reload-delay | Lukas Reschke | 2016-04-22 | 2 | -4/+17 |
|\ \ | | | | | | | Delay reloading the page if an ajax error occurs, show notification | ||||
| * | | Add test for reload delay | Robin McCorkell | 2016-04-20 | 1 | -3/+15 |
| | | | |||||
| * | | Delay reloading the page if an ajax error occurs, show notification | Robin McCorkell | 2016-04-20 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #23990 from owncloud/heartbeat-debounce | Morris Jobke | 2016-04-20 | 2 | -4/+12 |
|\ \ \ | | | | | | | | | Debounce heartbeat ajax calls to lower the number of requests | ||||
| * | | | Debounce heartbeat ajax calls to lower the number of requests | Christoph Wurst | 2016-04-18 | 2 | -4/+12 |
| | | | | | | | | | | | | | | | | fixes #22397 | ||||
* | | | | Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions | Thomas Müller | 2016-04-20 | 4 | -14/+15 |
|\ \ \ \ | |_|/ / |/| | | | migrate deprecated jQuery 1.x functions | ||||
| * | | | replace $().attr('checked') by $().prop('checked', state) or $().is(':checked') | Christoph Wurst | 2016-04-19 | 4 | -8/+8 |
| | | | | |||||
| * | | | replace $.parseJSON() by JSON.parse() | Christoph Wurst | 2016-04-19 | 2 | -4/+1 |
| | | | | |||||
| * | | | remove deprecated jQuery.browser | Christoph Wurst | 2016-04-19 | 1 | -4/+8 |
| | | | | |||||
* | | | | extract mail view for sending share invitations | Christoph Wurst | 2016-04-19 | 4 | -70/+186 |
|/ / / | | | | | | | | | | fixes #22947 | ||||
* | | | Merge pull request #23993 from owncloud/update-to-jquery2 | Thomas Müller | 2016-04-19 | 2 | -2/+3 |
|\ \ \ | | | | | | | | | Update jquery to version 2.2.3 | ||||
| * | | | Turn off jQuery animations when testing | Christoph Wurst | 2016-04-18 | 1 | -0/+2 |
| | | | | |||||
| * | | | downgrade jquery, update jquery-migrate | Christoph Wurst | 2016-04-15 | 1 | -1/+0 |
| | | | | |||||
| * | | | update jquery to version 2.2.3 | Christoph Wurst | 2016-04-14 | 1 | -1/+1 |
| | |/ | |/| | |||||
* / | | Fix rgb values | John Molakvoæ | 2016-04-18 | 1 | -1/+7 |
|/ / | | | | | | | | | Fix was required because values was too big for rgb and breaking the brightness calculation. Now we have the initial sat (70%) and the reduction to 60 if too bright working again. | ||||
* | | close navigation menu when opening app in new tab (#23914) | Christoph Wurst | 2016-04-14 | 1 | -0/+4 |
| | | |||||
* | | add loading feedback to user menu entries (#23916) | Christoph Wurst | 2016-04-14 | 1 | -0/+15 |
|/ | | | fixes #19857 |