summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19526 from ↵Thomas Müller2015-10-062-2/+25
|\ | | | | | | | | owncloud/issue-16251-reload-app-settings-when-app-needs-update Reload the page when an app needs an update after being enabled
| * fix wordingMorris Jobke2015-10-061-1/+1
| |
| * Use OC.Dialogs for modal reload messageMorris Jobke2015-10-051-1/+15
| |
| * Reload the page when an app needs an update after being enabledJoas Schilling2015-10-052-2/+11
| |
* | Merge pull request #19407 from owncloud/lock-zip-contentThomas Müller2015-10-062-84/+135
|\ \ | | | | | | Lock zip content
| * | Refactor single file download into it's own methodThomas Müller2015-10-051-76/+71
| | |
| * | Recursively lock folder contentsThomas Müller2015-10-051-6/+27
| | |
| * | release locks in case of exceptionThomas Müller2015-10-051-0/+2
| | |
| * | log the exception during zip creationThomas Müller2015-10-051-13/+26
| | |
| * | Lock files which are zippedThomas Müller2015-10-051-6/+26
| | |
| * | Clean PHPDocThomas Müller2015-10-051-6/+6
| | |
* | | Merge pull request #19452 from owncloud/ocs_provisioning_api_more_testsThomas Müller2015-10-063-13/+130
|\ \ \ | | | | | | | | OCS provisioning API more tests
| * | | [Intergration] Throw error if exception not thrownRoeland Jago Douma2015-10-061-17/+2
| | | |
| * | | added a couple of testsSergio Bertolin2015-10-061-0/+15
| | | |
| * | | restored assertions in existance of users and groupsSergio Bertolin2015-10-061-12/+14
| | | |
| * | | Being explicit between http and ocs return codesSergio Bertolin2015-10-063-20/+37
| | | |
| * | | added edit user testSergio Bertolin2015-10-061-0/+12
| | | |
| * | | Return the actual ocs return codes and check itSergio Bertolin2015-10-062-18/+37
| | | |
| * | | added some deletion logicSergio Bertolin2015-10-061-1/+0
| | | |
| * | | added some deletion logicSergio Bertolin2015-10-061-2/+9
| | | |
| * | | added some group logicSergio Bertolin2015-10-062-0/+61
| | | |
* | | | Merge pull request #19597 from owncloud/update-license-headersThomas Müller2015-10-06370-237/+481
|\ \ \ \ | |/ / / |/| | | update licence headers via script
| * | | deduplicate @xenopathicMorris Jobke2015-10-06118-118/+101
| | | |
| * | | update licence headers via scriptMorris Jobke2015-10-05328-190/+450
| | | |
| * | | Update license header script to only use code changesMorris Jobke2015-10-051-2/+3
| | | | | | | | | | | | | | | | * ignores the first lines of a file with the license header
* | | | Merge pull request #19577 from ↵Thomas Müller2015-10-062-0/+43
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/share-donotreturnentrieswhenusernotingroup Remove invalid share items from result when missing group membership
| * | | | Remove invalid share items from result when missing group membershipVincent Petry2015-10-052-0/+43
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group shares usually have subshare entries for every user. In some situations it can happen that the user was removed from the group but the subshare entries still exist. This fix makes sure that such subshare entries are not returned any more as the user isn't in the group any more.
* | | | Merge pull request #19535 from owncloud/check-memcache-moduleThomas Müller2015-10-064-6/+65
|\ \ \ \ | | | | | | | | | | [admin] check for correct PHP memcached module
| * | | | [admin] check for correct PHP memcached moduleMorris Jobke2015-10-064-6/+65
| | | | |
* | | | | Merge pull request #19530 from ↵Thomas Müller2015-10-062-1/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-13213-sharing-conflict-when-sharing-subfile Make sure the share we found is for the same item
| * | | | | Add a unit test for "share a file inside a folder that is already shared"Joas Schilling2015-10-051-0/+33
| | | | | |
| * | | | | Make sure all variables are definedJoas Schilling2015-10-051-0/+2
| | | | | |
| * | | | | Make sure the share we found is for the same itemJoas Schilling2015-10-051-1/+1
| | | | | |
* | | | | | Merge pull request #18484 from owncloud/fix-17964Thomas Müller2015-10-062-7/+152
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Remove whitespace from base-DNs
| * | | | | trim by default, add unit testsArthur Schiwon2015-10-052-16/+140
| | | | | |
| * | | | | Spaces -> Tabs, Update PHP-Doc and function logicLennart Rosam2015-10-051-12/+27
| | | | | |
| * | | | | Remove whitespace from base-DNsLennart Rosam2015-10-051-6/+12
| |/ / / /
* | | | / [tx-robot] updated from transifexJenkins for ownCloud2015-10-0642-36/+268
| |_|_|/ |/| | |
* | | | Merge pull request #18883 from owncloud/encryption-move-same-storageThomas Müller2015-10-051-0/+3
|\ \ \ \ | | | | | | | | | | use a normal rename when moving from the same storage in the encryption wrapper
| * | | | use a normal rename when moving from the same storage in the encryption wrapperRobin Appelman2015-10-051-0/+3
| | |_|/ | |/| |
* | | | Merge pull request #19553 from owncloud/properly_format_date_shareviewThomas Müller2015-10-052-9/+11
|\ \ \ \ | | | | | | | | | | Use DD-MM-YYYY consistently in share sidebar
| * | | | Use DD-MM-YYYY consistently in share sidebarRoeland Jago Douma2015-10-042-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to display the response from the server. Which is in non ISO8601 format. Now this is weird since the datepickers shows us 'DD-MM-YYYY' once a date is chosen. Now use momentJS to properly format the date. * Unit tests updated
* | | | | Merge pull request #19590 from owncloud/compactmode-sidebarfullscreenThomas Müller2015-10-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Make sidebar properly fullscreen in mobile/compact mode
| * | | | | Make sidebar properly fullscreen in mobile/compact modeVincent Petry2015-10-051-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #19558 from owncloud/sharing_sidebar_toggle_enforcedpassRoeland Douma2015-10-052-1/+42
|\ \ \ \ \ | |_|_|/ / |/| | | | Do not remove linkshare if there is none
| * | | | Do not remove linkshare if there is noneRoeland Jago Douma2015-10-052-1/+42
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the password is enforced we can't create a link share right away but just show the password field. Untoggling the link sharing should not try to remove the share. * Added unit test
* | | | Merge pull request #19591 from owncloud/files-renametooltipplacementHendrik Leppelsack2015-10-051-2/+2
|\ \ \ \ | |/ / / |/| | | Fix tooltip placement on rename error
| * | | Fix tooltip placement on rename errorVincent Petry2015-10-051-2/+2
|/ / /
* | | Merge pull request #19582 from owncloud/fix_19456Morris Jobke2015-10-052-0/+9
|\ \ \ | |_|/ |/| | add some output to explain the pre-conditions for decrypt-all
| * | add some output to explain the pre-conditions for decrypt-allBjoern Schiessle2015-10-052-0/+9
|/ /
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-31 10:12:30 +0000