summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/owncloud/core into last_cron_logkondou2014-03-2125-6/+512
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2014-03-212-0/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2014-03-202-0/+15
| * [tx-robot] updated from transifexJenkins for ownCloud2014-03-192-0/+46
| * Display admin option for public upload with encryption enabledVincent Petry2014-03-181-2/+0
| * [tx-robot] updated from transifexJenkins for ownCloud2014-03-171-1/+18
| * [tx-robot] updated from transifexJenkins for ownCloud2014-03-162-0/+41
| * [tx-robot] updated from transifexJenkins for ownCloud2014-03-153-0/+57
| * [tx-robot] updated from transifexJenkins for ownCloud2014-03-135-0/+247
| * Merge pull request #7340 from owncloud/hide_remove_image_avatarMorris Jobke2014-03-131-0/+15
| |\
| | * Use $.hide() instead of .hidden for nowkondou2014-03-121-3/+3
| | * Remove OC.Router usagekondou2014-03-121-7/+8
| | * Merge branch 'master' into hide_remove_image_avatarkondou2014-03-1280-363/+1213
| | |\
| | * \ Merge branch 'master' into hide_remove_image_avatarkondou2014-02-2810-29/+281
| | |\ \
| | * | | Use addClass('hidden') and removeClass('hidden')kondou2014-02-211-3/+3
| | * | | Hide remove image, if there's no custom avatarkondou2014-02-201-0/+14
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1310-0/+45
| * | | | Merge pull request #7564 from owncloud/issue/7559Vincent Petry2014-03-122-3/+26
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Use command -v to check for sendmailJoas Schilling2014-03-121-1/+15
| | * | | Hide QMail when not selected and hide sendmail when not available on the serverJoas Schilling2014-03-052-3/+12
* | | | | Use OC_Util::formatDate()kondou2014-03-121-1/+1
* | | | | Move cron status to the right of the headingkondou2014-03-122-18/+22
* | | | | Log last cron executionkondou2014-03-123-0/+26
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1273-11/+672
* | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 13:45:42 +0000