summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
...
* | | | on creation only test for existing users if the backend supports user creationThomas Müller2013-02-082-12/+0
|/ / /
* | / [tx-robot] updated from transifexJenkins for ownCloud2013-02-089-0/+49
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0754-74/+82
* | Merge pull request #1443 from owncloud/use-module-file-info-masterLukas Reschke2013-02-062-1/+15
|\ \
| * | we get best results regarding mime type detection if we use fileinfo - let's ...Thomas Mueller2013-02-042-1/+15
* | | Merge pull request #1506 from owncloud/files_encryptionLukas Reschke2013-02-061-0/+3
|\ \ \
| * | | Reverted fix temporarily; another fix by LukasReschke is awaiting mergeSam Tuke2013-02-061-1/+3
| * | | Merge branch 'master' into files_encryptionSam Tuke2013-02-063-3/+2
| |\ \ \
| * | | | Added commentSam Tuke2013-02-061-0/+1
| * | | | Fixed bug causing password change related hooks to not be called due to ajaxSam Tuke2013-02-061-0/+2
| * | | | Merge branch 'master' into files_encryptionSam Tuke2013-02-062-3/+10
| |\ \ \ \
| * | | | | Removed call to depreciated isUserVerified()Sam Tuke2013-02-061-3/+1
* | | | | | Merge pull request #1363 from owncloud/FixPasswordChangeLukas Reschke2013-02-061-8/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix indentationLukas Reschke2013-01-301-1/+1
| * | | | | Remove the no longer existing function "isUserVerified"Lukas Reschke2013-01-301-7/+1
* | | | | | Merge pull request #1428 from owncloud/content_positioningThomas Tanghus2013-02-063-3/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add 'hascontrols' class for content with fixed topbar.Thomas Tanghus2013-02-042-2/+2
| * | | | | Remove padding hack to position users list.Thomas Tanghus2013-02-041-1/+0
* | | | | | make it possible to modify the links to the clientsGeorg Ehrke2013-02-062-3/+10
| |_|/ / / |/| | | |
* | | | | make strings translatableBjörn Schießle2013-02-061-2/+2
* | | | | let the user change his display name, if supported by the back-endBjörn Schießle2013-02-065-2/+51
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-063-0/+26
| |_|_|/ |/| | |
* | | | offer change password only when the action is supported by the user backendArthur Schiwon2013-02-052-1/+7
* | | | Remove superfluous appendThomas Tanghus2013-02-051-1/+0
* | | | remove superfluous enabled-app class againJan-Christoph Borchardt2013-02-051-1/+1
* | | | Merge branch 'master' into fix_addNavigationJan-Christoph Borchardt2013-02-057-29/+90
|\ \ \ \
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-052-0/+12
| | |_|/ | |/| |
| * | | Merge pull request #1229 from owncloud/from_live_to_onThomas Müller2013-02-031-9/+9
| |\ \ \
| | * \ \ Merge branch 'master' into from_live_to_onThomas Mueller2013-01-3120-43/+157
| | |\ \ \
| | * | | | use on instead of live in users.jsJörn Friedrich Dreyer2013-01-301-1/+1
| | * | | | replace live() with on() in core jsJörn Friedrich Dreyer2013-01-301-8/+8
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-044-20/+69
| | |_|/ / | |/| | |
* / | | | Make app icon linkable when enabling app.Thomas Tanghus2013-02-031-0/+1
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-037-0/+19
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0258-4/+166
* | | | Merge pull request #1404 from owncloud/fixing-1276-masterblizzz2013-02-011-3/+4
|\ \ \ \
| * | | | fix #1276 - use registerLoadedCallback()Thomas Mueller2013-02-011-3/+4
* | | | | Updateing -> UpdatingThomas Mueller2013-02-011-1/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-012-0/+8
|/ / / /
* | | | Merge pull request #1351 from owncloud/navigationMichael Gapczynski2013-01-3112-268/+87
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-3114-20/+99
| |\ \ \
| * \ \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-3111-22/+57
| |\ \ \ \
| * \ \ \ \ Merge pull request #1359 from raghunayyar/navigationJan-Christoph Borchardt2013-01-311-4/+4
| |\ \ \ \ \
| | * | | | | Shorter, Cleaner JS in apps.jsraghunayyar2013-01-311-8/+4
| | * | | | | Reduced Styling and Image loads as from src and not backgorund.raghunayyar2013-01-301-1/+2
| | * | | | | No Image Repetition on Enabling Apps in Navigation Barraghunayyar2013-01-301-1/+4
| * | | | | | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-3063-69/+95
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | merge stylesJan-Christoph Borchardt2013-01-2822-150/+139
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge changes in navigationJan-Christoph Borchardt2013-01-281-1/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Defined height for #leftcontentraghunayyar2013-01-251-1/+1