summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12290 from owncloud/ext-preventbreakageduetobugs2Lukas Reschke2014-11-191-0/+8
|\
| * Show warning when invalid user was passedVincent Petry2014-11-141-0/+8
* | Merge pull request #11696 from owncloud/addWarningToEncryptionLostPasswordLukas Reschke2014-11-1915-150/+388
|\ \
| * | center spinnerMorris Jobke2014-11-182-1/+7
| * | Show spinnerLukas Reschke2014-11-172-0/+2
| * | fix unreadable label in warning boxMorris Jobke2014-11-171-0/+6
| * | Hide submit button after password changeLukas Reschke2014-11-171-0/+3
| * | listen to the post_passwordReset hook, backup the old keys and create a new k...Bjoern Schiessle2014-11-173-0/+26
| * | add password as parameter to the signal so that the encryption can create a n...Bjoern Schiessle2014-11-171-1/+1
| * | Add "postPasswordReset" hookLukas Reschke2014-11-171-4/+8
| * | Use correct route insteadLukas Reschke2014-11-172-2/+2
| * | Remove uneeded importLukas Reschke2014-11-171-1/+0
| * | Fix scrutinizer issuesLukas Reschke2014-11-171-1/+1
| * | Warn for password reset when files_encryption is enabledLukas Reschke2014-11-1710-149/+341
* | | Merge pull request #12276 from owncloud/undelete-only-if-files-trashin-is-ena...Morris Jobke2014-11-193-1/+36
|\ \ \
| * | | Only show undelete capability if files_trashbin is enabledLukas Reschke2014-11-183-1/+36
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-1984-90/+20
* | | | Merge pull request #12270 from owncloud/fix-search-labelThomas Müller2014-11-181-1/+1
|\ \ \ \
| * | | | User management search just searches users - adjust label of input field - fi...Morris Jobke2014-11-181-1/+1
| |/ / /
* | | | Merge pull request #12272 from owncloud/drop-var_dumpThomas Müller2014-11-181-1/+0
|\ \ \ \ | |/ / / |/| | |
| * | | drop unneeded var_dump - fixes #9997Morris Jobke2014-11-181-1/+0
|/ / /
* | | Merge pull request #12261 from oparoz/patch-1Morris Jobke2014-11-181-1/+1
|\ \ \
| * | | Replace deprecated switchesOlivier Paroz2014-11-181-1/+1
* | | | Merge pull request #12264 from owncloud/use-full-path-for-filesize-calculationLukas Reschke2014-11-181-1/+1
|\ \ \ \
| * | | | $file only contains the filename and not the absolute path, that means that f...Lukas Reschke2014-11-181-1/+1
| |/ / /
* | | | Merge pull request #12224 from owncloud/fix_12211Björn Schießle2014-11-182-18/+74
|\ \ \ \ | |/ / / |/| | |
| * | | only users can have a display name different from the idBjoern Schiessle2014-11-181-1/+4
| * | | use the new base class for unit testsBjoern Schiessle2014-11-181-10/+12
| * | | make sure that we only find the shares from the correct share type if users a...Bjoern Schiessle2014-11-181-2/+8
| * | | make sure that we don't find the wrong shares if a user and a group have the ...Bjoern Schiessle2014-11-182-6/+51
* | | | Merge pull request #12259 from owncloud/app-enabled-plugin-appmanagerLukas Reschke2014-11-181-4/+4
|\ \ \ \
| * | | | Fix type hinting for app managerRobin Appelman2014-11-181-4/+4
| |/ / /
* | | | Merge pull request #12242 from owncloud/fix-undefined-sizeLukas Reschke2014-11-181-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Check if the size field is availableLukas Reschke2014-11-171-1/+1
| |/ /
* | | Merge pull request #12220 from owncloud/remove-unused-codeMorris Jobke2014-11-183-373/+0
|\ \ \
| * | | Remove unused codeLukas Reschke2014-11-173-373/+0
* | | | Merge pull request #12237 from owncloud/fix-12236Morris Jobke2014-11-181-5/+5
|\ \ \ \
| * | | | Make declaration compatibleLukas Reschke2014-11-171-5/+5
| | |/ / | |/| |
* | | | Merge pull request #12234 from owncloud/normalizepath-absolute-testsLukas Reschke2014-11-181-61/+102
|\ \ \ \
| * | | | Add tests for absolute paths on windowsJoas Schilling2014-11-171-2/+32
| * | | | Refactor tests to use a dataProvider methodJoas Schilling2014-11-171-62/+73
* | | | | Merge pull request #9962 from owncloud/app-group-enable-remoteLukas Reschke2014-11-183-2/+81
|\ \ \ \ \
| * | | | | Add sabredav plugin to check if a user has access to an appRobin Appelman2014-11-173-2/+81
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-186-0/+24
* | | | | | Merge pull request #11727 from owncloud/moveCallCheckRegisterToSomeWhereElseLukas Reschke2014-11-171-0/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Move CSRF checkLukas Reschke2014-11-171-0/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #11741 from owncloud/delete_all_children_preview_2Vincent Petry2014-11-171-16/+94
|\ \ \ \ \
| * | | | | delete all children's previews when deleting a folderGeorg Ehrke2014-10-301-16/+94
* | | | | | Merge pull request #12218 from owncloud/issue/10991-fixesMorris Jobke2014-11-1748-415/+784
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Correctly restore previous root mount point after testingJoas Schilling2014-11-1715-55/+203