summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* fix sidebar spinnerHendrik Leppelsack2015-09-251-3/+5
|
* Merge pull request #19360 from owncloud/move-filter-method-into-config-objectThomas Müller2015-09-251-39/+4
|\ | | | | Move the filtering of sensitive data to the config class
| * Move the filtering of sensitive data to the config classJoas Schilling2015-09-251-39/+4
| |
* | Merge pull request #13145 from owncloud/issue/11951-activity-sharing-emailThomas Müller2015-09-251-0/+31
|\ \ | |/ |/| Publish an activity when sending a share link via email
| * Publish an activity when sending a share link via emailJoas Schilling2015-09-221-0/+31
| |
* | fix multiselectHendrik Leppelsack2015-09-251-0/+3
| |
* | fix loginHendrik Leppelsack2015-09-252-3/+3
| |
* | add .checkbox class for new checkbox styleHendrik Leppelsack2015-09-252-14/+11
| |
* | Revert "Update apps.css (Scroll more smoothly for Webkit browser)"Jan-Christoph Borchardt2015-09-241-1/+0
| |
* | Merge pull request #19306 from owncloud/app-code-check-versionThomas Müller2015-09-242-2/+67
|\ \ | | | | | | [App Code Check] add check for version and mandatory fields
| * | encode arrays as stringMorris Jobke2015-09-241-3/+0
| | |
| * | [App Code Check] add check for version and mandatory fieldsMorris Jobke2015-09-242-2/+70
| | | | | | | | | | | | | | | * ref #17598 * including unit tests for mandatory fields/versions
* | | Merge pull request #18517 from owncloud/17753_to_masterThomas Müller2015-09-241-2/+2
|\ \ \ | | | | | | | | Fix preview of old file on public upload conflicts
| * | | Fix preview of old file on public upload conflictsOlivier Paroz2015-09-201-2/+2
| | | |
* | | | Merge pull request #19305 from owncloud/share-hasusersharesThomas Müller2015-09-242-2/+72
|\ \ \ \ | | | | | | | | | | Fix ShareItemModel.hasUserShares to only check shares of current item
| * | | | Fix ShareItemModel.hasUserShares to only check shares of current itemVincent Petry2015-09-232-2/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The shares array is based on what the server returns and can contain share info for parent folders. hasUserShares is now fixed to ignore parent folders and only checks for shares on the current item.
* | | | | Expiration date was always a stringVincent Petry2015-09-242-5/+5
| | | | |
* | | | | Merge pull request #19328 from owncloud/update-shipped-apps-listThomas Müller2015-09-241-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Update the list of shipped apps
| * | | | | Remove user_webdavauth which is now part of user_externalJoas Schilling2015-09-241-1/+0
| | | | | |
| * | | | | Update the list of shipped appsJoas Schilling2015-09-241-1/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #19292 from owncloud/close-iconThomas Müller2015-09-242-1/+8
|\ \ \ \ \ | | | | | | | | | | | | add slight shadow to close icon to make it visible on top of dark images
| * | | | | add slight shadow to close icon to make it visible on top of dark images, ↵Jan-Christoph Borchardt2015-09-232-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | fix #19291
* | | | | | Merge pull request #18352 from owncloud/ocs_api_sharees_autocomplete_blockerThomas Müller2015-09-241-0/+10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Implement the autocomplete blocker from #18341 into the OCS endpoint
| * | | | | Add option to disable autocomplete in share dialogMorris Jobke2015-09-231-0/+10
| | |/ / / | |/| | |
* | | | | fix wording of other search results to 'in other folders'Jan-Christoph Borchardt2015-09-231-2/+2
| |/ / / |/| | |
* | | | display checkboxes in ie8Hendrik Leppelsack2015-09-231-0/+5
|/ / /
* | | Fix parsing int attributes from share.php responseVincent Petry2015-09-232-7/+70
| | | | | | | | | | | | | | | | | | | | | Sometimes the attributes returned by share.php are integers but packaged as strings. This fix makes sure that such attributes are parsed as integers
* | | Merge pull request #19220 from individual-it/fix_19164Thomas Müller2015-09-231-0/+2
|\ \ \ | | | | | | | | re initialize OC.Share.currentShares OC.Share.itemShares
| * | | re initialize OC.Share.currentShares OC.Share.itemShares Individual IT Services2015-09-211-0/+2
| | | | | | | | | | | | | | | | otherwise old values are kept. fix for #19164
* | | | Merge pull request #19279 from owncloud/share-fixbogusentryThomas Müller2015-09-231-0/+3
|\ \ \ \ | | | | | | | | | | Fix bogus entry that appears when switching with arrow keys
| * | | | Fix bogus entry that appears when switching with arrow keysVincent Petry2015-09-221-0/+3
| | |_|/ | |/| |
* | | | implement builder pattern in tipsy shimHendrik Leppelsack2015-09-231-0/+1
| | | |
* | | | add style for disabled checkboxesHendrik Leppelsack2015-09-221-0/+2
| | | |
* | | | left align checkboxes in group dropdownHendrik Leppelsack2015-09-221-3/+2
| | | |
* | | | Update mimetypesLukas Reschke2015-09-221-34/+23
|/ / /
* | | improve description and help output for the encrypt-all and decrypt-all commandBjoern Schiessle2015-09-212-2/+4
| | |
* | | Merge pull request #18709 from owncloud/cleanup-login-semanticsThomas Müller2015-09-212-5/+4
|\ \ \ | | | | | | | | Pushes input inside the bottom group - login.
| * | | Squashing all commits in one, remove typos.Raghu Nayyar2015-09-122-5/+4
| | | |
* | | | fix missing checkboxes in file comparatorHendrik Leppelsack2015-09-212-0/+7
| | | |
* | | | Merge pull request #19183 from owncloud/oparoz-sharejs-typoThomas Müller2015-09-211-1/+1
|\ \ \ \ | | | | | | | | | | Typo
| * | | | TypoOlivier Paroz2015-09-191-1/+1
| | |/ / | |/| |
* | | | Merge pull request #19148 from ↵Thomas Müller2015-09-212-7/+35
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | owncloud/issue-19113-stop-setting-single-user-in-constructor Do not set single user in constructor of encryption occ commands
| * | | Also catch exceptions on encryptAll and reset trashbin and singleUser modeJoas Schilling2015-09-181-2/+7
| | | |
| * | | Do not set single user in constructorJoas Schilling2015-09-182-5/+28
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-202-0/+4
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-192-0/+4
| | |
* | | Merge pull request #19008 from owncloud/jquery_avatar_testsThomas Müller2015-09-182-1/+241
|\ \ \ | |/ / |/| | JS tests for jquery.avatar
| * | Added js tests for jquery.avatarRoeland Jago Douma2015-09-142-1/+241
| | | | | | | | | | | | * Ceil avatar request size
* | | Merge pull request #19126 from owncloud/fix-19117Thomas Müller2015-09-181-6/+12
|\ \ \ | | | | | | | | Fix missing checkboxes in share dialog
| * | | fix missing checkboxes in share dialogHendrik Leppelsack2015-09-171-6/+12
| | | |