summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplateMorris Jobke2014-11-253-5/+3
|\
| * Remove unused variable and make Scrutinizer happy.Lukas Reschke2014-11-181-2/+0
| * Don't disclose relative directory path for single shared files of userLukas Reschke2014-11-182-2/+2
| * Fix case-sensitivityLukas Reschke2014-11-181-1/+1
* | Merge pull request #12390 from owncloud/use-session-in-caseMorris Jobke2014-11-251-2/+8
|\ \
| * | Close session only if encryption app is not enabledLukas Reschke2014-11-241-2/+8
* | | Merge pull request #11837 from owncloud/fix-11328Morris Jobke2014-11-247-89/+217
|\ \ \
| * | | make scrutinizer happier and always count users on assisted mode, even with x...Arthur Schiwon2014-11-222-6/+6
| * | | make updateCount work properly with new xp'd mode as well as withoutArthur Schiwon2014-11-212-7/+25
| * | | fix counting when ldapPagingSize is 0Arthur Schiwon2014-11-211-6/+5
| * | | trigger count on the correct filterArthur Schiwon2014-11-201-1/+1
| * | | phpdoc and mixed up lettersArthur Schiwon2014-11-202-1/+3
| * | | better readbility, no effective changesArthur Schiwon2014-11-201-5/+5
| * | | use underscore.js for undefined checksArthur Schiwon2014-11-201-4/+4
| * | | this happens already before counting, no need anymoreArthur Schiwon2014-11-201-2/+0
| * | | JS docArthur Schiwon2014-11-202-0/+27
| * | | a corrected email attribute needs to be saved, not only returnedArthur Schiwon2014-11-201-1/+1
| * | | to reassure that selected attributes still work, do not count all matching en...Arthur Schiwon2014-11-202-11/+16
| * | | detectors (email, displayname..) are now started in one place, triggered from...Arthur Schiwon2014-11-203-34/+81
| * | | consolidate user count filter in wizard and user back endArthur Schiwon2014-11-204-36/+16
| * | | detect user display name attribute and return user count depending on its pre...Arthur Schiwon2014-11-203-7/+59
* | | | use login name to verify passwordBjoern Schiessle2014-11-241-1/+2
| |/ / |/| |
* | | Merge pull request #12084 from owncloud/sharing_fix_shared_with_infoMorris Jobke2014-11-241-2/+3
|\ \ \
| * | | also check for the correct owner if it was submittedBjoern Schiessle2014-11-211-2/+3
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-242-2/+8
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-228-4/+10
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-2138-0/+640
* | | Fix file upload to ext storage when recovery key is enabledVincent Petry2014-11-202-9/+58
* | | Merge pull request #12325 from owncloud/removeunneccessarylangLukas Reschke2014-11-2046-690/+0
|\ \ \
| * | | cleanup languages. closes #11274Volkan Gezer2014-11-2046-690/+0
| |/ /
* | | Merge pull request #12226 from owncloud/remove-phpassThomas Müller2014-11-203-12/+40
|\ \ \
| * | | Remove phpass and migrate to new Hasher interfaceLukas Reschke2014-11-173-12/+40
* | | | Merge pull request #12297 from owncloud/issue/10991-all-testcaseMorris Jobke2014-11-2040-99/+176
|\ \ \ \ | |_|/ / |/| | |
| * | | Make apps/ extend the \Test\TestCase and fix overwritten methodsJoas Schilling2014-11-1939-90/+160
| * | | Use base class to reset the file mapperJoas Schilling2014-11-192-9/+16
* | | | Merge pull request #12305 from owncloud/sharelist-nodeleteMorris Jobke2014-11-202-12/+30
|\ \ \ \ | |/ / / |/| | |
| * | | JSHint fixes in sharedfilelistSpec unit test fileVincent Petry2014-11-191-1/+3
| * | | Remove delete button in shared with others listVincent Petry2014-11-192-11/+27
* | | | 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-193-0/+26
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | listen to the post_passwordReset hook, backup the old keys and create a new k...Bjoern Schiessle2014-11-173-0/+26
* | | | | 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-194-8/+8
|/ / / /
* | | | $file only contains the filename and not the absolute path, that means that f...Lukas Reschke2014-11-181-1/+1
* | | | Merge pull request #12220 from owncloud/remove-unused-codeMorris Jobke2014-11-183-373/+0
|\ \ \ \
| * | | | Remove unused codeLukas Reschke2014-11-173-373/+0
| | |_|/ | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-182-0/+16
| |/ / |/| |
* | | Merge pull request #12218 from owncloud/issue/10991-fixesMorris Jobke2014-11-1714-264/+410
|\ \ \ | |/ / |/| |