summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Authentification -> AuthenticationThomas Müller2014-03-112-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-1167-336/+479
* Merge branch 'master' into fix-7307Thomas Müller2014-03-065-3/+48
|\
| * Merge pull request #7412 from owncloud/issue/7175Joas Schilling2014-03-054-3/+48
| |\
| | * Add button to send a test mail after changing the email settingsJoas Schilling2014-03-054-3/+48
| * | update wording of email fieldMorris Jobke2014-03-041-1/+1
* | | remove OC.Router.registerLoadedCallback()Thomas Müller2014-03-021-3/+1
* | | Replace OC.Router.generate() with OC.generateUrl()Thomas Müller2014-03-024-8/+11
|/ /
* | profile image: relabel technical 'Abort' to more widely used 'Cancel'Jan-Christoph Borchardt2014-02-281-1/+1
* | close encryption session after decryption was finishedBjoern Schiessle2014-02-261-0/+2
|/
* Merge pull request #7174 from owncloud/issue/7166Jan-Christoph Borchardt2014-02-267-22/+251
|\
| * Remove unused variables, add doc blocks and break linesJoas Schilling2014-02-263-14/+35
| * Hide SMTP options based on selected send modeJoas Schilling2014-02-262-18/+36
| * Remove duplicated definition and move OC.msg to js/js.jsJoas Schilling2014-02-192-44/+0
| * Add option to change email settings in admin sectionJoas Schilling2014-02-186-0/+234
* | Merge pull request #7406 from owncloud/settings-apps.js-styleJan-Christoph Borchardt2014-02-261-5/+17
|\ \
| * | coding style fixes: cut long lines, whitespaceJan-Christoph Borchardt2014-02-261-5/+17
* | | Fix scrutinizer issue in settings/js/apps.jskondou2014-02-261-2/+2
* | | Merge pull request #7401 from owncloud/highlight_selected_app_settingsVincent Petry2014-02-262-1/+8
|\ \ \ | |/ / |/| |
| * | fix for coding styleJan-Christoph Borchardt2014-02-261-1/+6
| * | Highlight the selected app in app-settingskondou2014-02-262-1/+3
* | | Merge branch 'master' into mobile-headerRobin Appelman2014-02-214-50/+59
|\| |
| * | Merge pull request #7291 from owncloud/adminess-raghuLukas Reschke2014-02-204-26/+2
| |\ \
| | * | Move isadmin to template and rename it to oc_isadminLukas Reschke2014-02-194-26/+2
| * | | Merge pull request #7056 from owncloud/users-scrollperformanceJan-Christoph Borchardt2014-02-201-24/+57
| |\ \ \ | | |/ / | |/| |
| | * | Added loading spinner to users list on scrollVincent Petry2014-02-181-0/+4
| | * | Improve users list scrolling performanceVincent Petry2014-02-171-24/+53
| | |/
* | / do not show display name on mobile when profile picture is presentJan-Christoph Borchardt2014-02-201-0/+2
|/ /
* | Add event parameter to keyup eventJoas Schilling2014-02-191-1/+1
* | do not autocapitalize fields on mobile, fix user name input. Also disable aut...Jan-Christoph Borchardt2014-02-181-4/+10
* | catch errors during decryptionBjoern Schiessle2014-02-171-1/+8
|/
* Fix implied evals and doubled definition of variableMorris Jobke2014-02-071-2/+2
* Merge pull request #6490 from owncloud/theming-for-appstemplateJan-Christoph Borchardt2014-02-051-0/+4
|\
| * use appstoreenabled config switchBjoern Schiessle2014-01-161-2/+2
| * do not show 'Add app' and 'More apps' for themed ownCloudJan-Christoph Borchardt2013-12-181-0/+4
* | merge master into mobile-styleJan-Christoph Borchardt2014-01-292-27/+48
|\ \
| * \ Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decryptMorris Jobke2014-01-272-25/+27
| |\ \
| | * | disable button and input field during decryptionBjoern Schiessle2014-01-241-0/+5
| | * | remove the form, it isn't needed hereBjoern Schiessle2014-01-242-25/+22
| * | | prevent autofill for password change settings, prevent leak of existing passw...Jan-Christoph Borchardt2014-01-241-2/+4
| |/ /
| * | Merge pull request #6234 from owncloud/change-email-by-enterJan-Christoph Borchardt2014-01-231-0/+17
| |\ \
| | * | fix double call of changeEmailAddress()Morris Jobke2014-01-181-0/+5
| | * | fix typoMorris Jobke2013-12-091-1/+1
| | * | change mail address by pressing enter - fixes #6179Morris Jobke2013-12-071-0/+12
* | | | Merge branch 'master' into mobile-styleThomas Müller2014-01-238-15/+73
|\| | |
| * | | added website fieldBjoern Schiessle2014-01-173-18/+25
| * | | distinguish app links from doc linksBjoern Schiessle2014-01-173-3/+4
| * | | show link to app documentationBjoern Schiessle2014-01-173-1/+30
| * | | Merge pull request #6786 from wakeup/masterBjörn Schießle2014-01-161-1/+1
| |\ \ \
| | * | | Fix untranslated text when deleting userVolkan Gezer2014-01-151-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 21:54:36 +0000