summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7940 from owncloud/settings-userlistajaxcallfixblizzz2014-04-011-1/+1
|\
| * Fixed user list offset callVincent Petry2014-03-281-1/+1
* | Merge pull request #7975 from owncloud/fix-7973-master-2Vincent Petry2014-04-011-6/+0
|\ \
| * | remove pl_PL - fixes #7973Thomas Müller2014-03-311-6/+0
* | | Merge pull request #7915 from owncloud/replace-personalblockVincent Petry2014-04-013-129/+112
|\ \ \
| * \ \ external storage: fix merge conflict, indentationJan-Christoph Borchardt2014-03-3113-12/+19
| |\ \ \
| * | | | remove CSS rules for personalblock, remove it from coreJan-Christoph Borchardt2014-03-271-5/+0
| * | | | replace personalblock fieldset with section div in admin and personal settingsJan-Christoph Borchardt2014-03-272-124/+112
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-012-0/+14
| |_|/ / |/| | |
* | | | Merge pull request #7916 from owncloud/fix-input-sizesMorris Jobke2014-03-311-1/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | remove additional radio button width declarationJan-Christoph Borchardt2014-03-271-1/+0
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-301-0/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-291-0/+3
| |/ |/|
* | Merge pull request #7107 from owncloud/load-apps-proper-masterThomas Müller2014-03-287-12/+0
|\ \
| * | killing some more calls to OC_App::loadApps(); - because we load all apps in ...Thomas Müller2014-03-257-12/+0
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-284-0/+15
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2014-03-2710-0/+38
* | Merge pull request #7864 from owncloud/routing-performanceThomas Müller2014-03-251-1/+1
|\ \
| * | update type hint in PHPDocThomas Müller2014-03-251-1/+1
* | | Merge pull request #7689 from owncloud/last_cron_logVincent Petry2014-03-253-1/+40
|\ \ \
| * | | Move success/error squircles to settingskondou2014-03-211-0/+9
| * | | Merge branch 'master' of https://github.com/owncloud/core into last_cron_logkondou2014-03-2125-6/+512
| |\ \ \ | | | |/ | | |/|
| * | | 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
* | | | Merge pull request #7861 from owncloud/idn-domains-support-on-emails-masterThomas Müller2014-03-251-1/+1
|\ \ \ \
| * | | | use \OC_Mail::validateAddress() to validate the email address - fixes #7862Thomas Müller2014-03-241-1/+1
| | |_|/ | |/| |
* / | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-251-0/+7
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-241-6/+14
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-221-1/+1
| |/ |/|
* | [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
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1273-11/+672