summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-2734-31/+87
|
* Merge pull request #9051 from owncloud/Bagera-masterFrank Karlitschek2014-06-263-23/+36
|\ | | | | Fix delete action height
| * fix padding for last cell in summary of trashbinMorris Jobke2014-06-261-0/+4
| |
| * Aligning in the table header as wellBagera2014-06-162-15/+26
| | | | | | | | Aligning the columns and in the rows
| * Aligning with line heightBagera2014-06-161-10/+5
| | | | | | | | | | Remove "top:" in favour of setting "line-height" and fixing the resulting problem with the input field being positioned wrongly.
| * Fix delete action heightBagera2014-06-161-5/+8
| | | | | | | | Fix #8530 and align the all actions in the row
* | Merge pull request #9236 from owncloud/sharing-settingswordingicewind19912014-06-261-1/+1
|\ \ | | | | | | Fix wording for remote shares in settings page
| * | Fix wording for remote shares in settings pageVincent Petry2014-06-261-1/+1
| | |
* | | Merge pull request #9234 from owncloud/fix-ellipsis-for-foldersRaghu Nayyar2014-06-261-2/+2
|\ \ \ | | | | | | | | Fix ellipsis for folders on mobile screens
| * | | Fix ellipsis for folders on mobile screensMorris Jobke2014-06-261-2/+2
| | | | | | | | | | | | | | | | * fixes #9162
* | | | Merge pull request #9206 from owncloud/occ-scan-userVincent Petry2014-06-261-13/+18
|\ \ \ \ | | | | | | | | | | Prevent running the files:scan command as the wrong user
| * | | | Prevent running the files:scan command as the wrong userRobin Appelman2014-06-251-13/+18
| | | | |
* | | | | Merge pull request #9223 from owncloud/occ-scan-argumentsicewind19912014-06-261-0/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | Add error message when no users specified to files:scan command
| * | | | Add error message when no users specified to files:scan commandVincent Petry2014-06-261-0/+5
| | |/ / | |/| |
* | | | Merge pull request #9171 from owncloud/enc_always_use_oc_viewBjörn Schießle2014-06-265-109/+98
|\ \ \ \ | |/ / / |/| | | [encryption] always use oc view
| * | | fix unit testsBjoern Schiessle2014-06-251-2/+2
| | | |
| * | | always use a \OC\Files\ViewBjoern Schiessle2014-06-254-77/+59
| | | |
| * | | always use oc filesystem for rename operationBjoern Schiessle2014-06-252-34/+41
| | | |
* | | | Merge pull request #9193 from owncloud/sharing_etag_propagationBjörn Schießle2014-06-264-10/+191
|\ \ \ \ | | | | | | | | | | make sure that the etags get propagated correctly
| * | | | make sure that hooks are registered for the testsBjoern Schiessle2014-06-253-14/+23
| | | | |
| * | | | make sure that during share and unshare the etags get propagated correctlyBjoern Schiessle2014-06-253-0/+172
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-263-10/+19
| | | |
* | | | Merge pull request #9205 from owncloud/remoteshare-fixurlpathVincent Petry2014-06-252-2/+93
|\ \ \ \ | | | | | | | | | | Fix parsing of remote URL when mounting remote shares
| * | | | Fix parsing of remote URL when mounting remote sharesVincent Petry2014-06-252-2/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix allows for having the remote ownCloud instance live in a subpath like "http://example.com/basedir/subdir/owncloud". Such URLs are now parsed correctly. Added unit test for URL parsing.
* | | | | Merge pull request #9202 from owncloud/urlhashfixMorris Jobke2014-06-251-23/+23
|\ \ \ \ \ | | | | | | | | | | | | Do not clear URL hash when no external mount params given
| * | | | | Do not clear URL hash when no external mount params givenVincent Petry2014-06-251-23/+23
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever external share parameters were passed through the URL hash, the URL hash will now be cleared. In other cases, the hash needs to be left alone because it is used as workaround for the lack of history API in IE8 / IE9 Removed getParamterByName() and use OC.Util.History.parseUrlQuery() that does the same, including replacing the "+" with spaces.
* | | | | Merge pull request #9189 from owncloud/sharing_fix_permissionsicewind19912014-06-253-6/+36
|\ \ \ \ \ | |_|_|/ / |/| | | | Sharing fix permissions
| * | | | add/update unit testsBjoern Schiessle2014-06-242-3/+33
| | | | |
| * | | | make sure that we always return the correct permissionsBjoern Schiessle2014-06-241-3/+3
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-257-14/+48
| |_|/ / |/| | |
* | | | adjust access constructor to masterArthur Schiwon2014-06-252-2/+10
| | | |
* | | | Port of LDAP Wizard: get correct total no of users, groups and complete ↵Arthur Schiwon2014-06-254-70/+130
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list of groups on big setups #9002 fix PHPdoc Conflicts: apps/user_ldap/lib/connection.php add method to count groups on LDAP Conflicts: apps/user_ldap/lib/access.php LDAP Wizard: count users and groups with the power of paged search Conflicts: apps/user_ldap/lib/wizard.php consolidate requirement check fix PHPdoc Conflicts: apps/user_ldap/lib/access.php Wizard: get really all groups from LDAP by power of Paged Search Conflicts: apps/user_ldap/lib/wizard.php make all this work in an early configuration state in the wizard by marking the config active and ignoring the validation state. Conflicts: apps/user_ldap/lib/connection.php simplify two methods a bit, because they are not used for group search anymore Conflicts: apps/user_ldap/lib/wizard.php remove unused vars; increase scrutinizer happiness
* | | Merge pull request #9168 from owncloud/files-phpwarningondeleteVincent Petry2014-06-241-5/+2
|\ \ \ | | | | | | | | Remove warning when deleting all entries
| * | | Merge if statementsJoas Schilling2014-06-231-6/+2
| | | |
| * | | Remove warning when deleting all entriesVincent Petry2014-06-231-1/+2
| | | | | | | | | | | | | | | | | | | | When deleting all entries, only "allfiles" is defined but not "file" or "files", which caused a PHP warning to be logged.
* | | | add unit testsBjoern Schiessle2014-06-242-2/+30
| | | |
* | | | always use '/' as directory seperatorBjoern Schiessle2014-06-241-1/+1
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-246-3/+34
| | |
* | | Merge pull request #9074 from geez0x1/masterMorris Jobke2014-06-231-1/+1
|\ \ \ | | | | | | | | Update the modified date in UI on file reversion
| * | | Update the modified date in UI on file reversiongeez0x12014-06-171-1/+1
| | | |
* | | | Merge pull request #9170 from owncloud/files-renamevalidationblurLukas Reschke2014-06-232-4/+53
|\ \ \ \ | | | | | | | | | | Fix blurring of invalid file name on rename
| * | | | Fix blurring of invalid file name on renameVincent Petry2014-06-232-4/+53
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | When renaming to an existing file name, blurring the field should not remove it. This fix keeps the field until escape is pressed instead of replacing it with a broken empty space.
* | | | Merge pull request #9124 from owncloud/move-permissionsVincent Petry2014-06-231-0/+6
|\ \ \ \ | | | | | | | | | | Fix moving files into read only public shares
| * | | | Dont allow opening writable streams on a read only dav mountRobin Appelman2014-06-231-0/+6
| | | | |
* | | | | Merge pull request #8931 from owncloud/filelist-usepathforactionVincent Petry2014-06-234-4/+9
|\ \ \ \ \ | |_|/ / / |/| | | | [master] Use actual file path on rename/delete
| * | | | Use actual file path on rename/deleteVincent Petry2014-06-064-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When renaming or deleting a file that is in a subdirectory, performing the action from the sharing overview or another file list view, the actual directory of the file must be used instead of the current directory.
* | | | | Merge pull request #9153 from owncloud/files-unselectafterdeleteicewind19912014-06-232-1/+35
|\ \ \ \ \ | | | | | | | | | | | | Clear file selection when list is repopulated
| * | | | | Clear file selection when list is repopulatedVincent Petry2014-06-232-1/+35
| | |/ / / | |/| | | | | | | | | | | | | | | | | | When calling FileList.setFiles() the current selection needs to be cleared.
* / | | | Setup the external share manager in a hookVincent Petry2014-06-232-9/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | To make sure the external shares are initialized in the right order and make sure the session is correctly initialized before, the external share manager is now set up in a filesystem setup hook.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-234-4/+12
| | | |