aboutsummaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Make email display name change translatable againVolkan Gezer2014-04-152-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-143-3/+8
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-1311-0/+33
* Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encr...Björn Schießle2014-04-112-4/+5
|\
| * Fix some localization issues with file encryption/decription stringsVolkan Gezer2014-04-052-4/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-101-0/+1
* | Always define sendmail_is_availableJoas Schilling2014-04-091-3/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-092-1/+18
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-083-0/+17
* | reduce code duplication, fix parse error, prevent page reload on hitting ente...Thomas Müller2014-04-071-50/+47
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-073-0/+64
|/
* Delete oauth.cssLukas Reschke2014-04-041-4/+0
* Remove uneeded fileLukas Reschke2014-04-041-19/+0
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-045-5/+6
* Merge pull request #7476 from owncloud/type-hintingThomas Müller2014-04-031-2/+2
|\
| * Merge branch 'master' into type-hintingBart Visscher2014-03-3190-384/+1838
| |\
| * | More PHPDoc updatesBart Visscher2014-02-281-2/+2
* | | fix h3 style, move out from settings to apps CSSJan-Christoph Borchardt2014-04-021-1/+0
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-022-3/+36
* | | Merge pull request #7817 from owncloud/app-navigation-for-appsMorris Jobke2014-04-013-58/+44
|\ \ \
| * | | Removes highlighting of selected items, padding from apps management.raghunayyar2014-03-301-0/+3
| * | | Adds Style changes to app-navigation in core/css/apps.cssraghunayyar2014-03-241-2/+2
| * | | Makes #app-navigation a part of app management.raghunayyar2014-03-203-59/+42
* | | | 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
| | |_|/ / / | |/| | | |