summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* detect user display name attribute and return user count depending on its pre...Arthur Schiwon2014-11-203-7/+59
* 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 #12253 from owncloud/port-12154Vincent Petry2014-11-206-14/+54
|\ \
| * | Add repair steps for legacy config filesLukas Reschke2014-11-182-1/+31
| * | Ignore port for trusted domainsLukas Reschke2014-11-184-13/+23
* | | Merge pull request #12257 from owncloud/l10n-loadtranslationsfromjsVincent Petry2014-11-203-2/+106
|\ \ \
| * | | Fix l10n promisesVincent Petry2014-11-192-6/+11
| * | | Better use of promise in OC.L10N.load()Vincent Petry2014-11-191-13/+8
| * | | Remove stray generateUrlVincent Petry2014-11-191-5/+0
| * | | Added function to load translations from JSVincent Petry2014-11-183-2/+111
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-20174-774/+406
* | | | 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
|\ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 00:20:07 +0000