summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Move ajax/changepassword to changepassword/controller to use autoloadingkondou2013-09-132-3/+0
* Merge branch 'master' into split_personal-user_passwordchangekondou2013-09-1120-23/+239
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-09-102-0/+3
| * [tx-robot] updated from transifexJenkins for ownCloud2013-09-081-0/+20
| * Fix language selection; Fix #4756kondou2013-09-071-1/+1
| * [tx-robot] updated from transifexJenkins for ownCloud2013-09-071-0/+14
| * [tx-robot] updated from transifexJenkins for ownCloud2013-09-052-9/+29
| * Merge pull request #4449 from owncloud/clean_up_utilMorris Jobke2013-09-031-2/+2
| |\
| | * Merge branch 'master' into clean_up_utilkondou2013-09-0271-315/+480
| | |\
| | * \ Merge branch 'master' into clean_up_utilkondou2013-08-2055-56/+225
| | |\ \
| | * | | Fix some naming and spacing in lib/util.phpkondou2013-08-181-2/+2
| | * | | Clean up \OC\Utilkondou2013-08-151-2/+2
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-031-0/+16
| * | | | Merge pull request #4663 from owncloud/fix-sticky-appsMorris Jobke2013-09-021-4/+4
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | fix issues caused by introduction of sticky Apps management footerJan-Christoph Borchardt2013-08-301-4/+4
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-014-2/+12
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-306-5/+138
| |/ / /
* | | | Use a controller instead of two files for changepassword.phpkondou2013-09-113-82/+94
* | | | Remove $recoveryPassword from changepersonalpassword & fix indentkondou2013-09-062-9/+12
* | | | Split personal and user-mgmt password change logickondou2013-09-065-23/+52
|/ / /
* | | no duplicate declaration of appLicense + camelCaseThomas Müller2013-08-281-5/+4
* | | Work around #4630 to fix license showingkondou2013-08-281-1/+10
* | | Merge pull request #4563 from owncloud/use_personal-passwordJan-Christoph Borchardt2013-08-282-2/+2
|\ \ \
| * | | Use personal-password for the password name in personal.phpkondou2013-08-242-2/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-284-0/+19
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-2711-5/+34
* | | | Merge pull request #4586 from owncloud/fixing-3431-masterMorris Jobke2013-08-271-118/+0
|\ \ \ \
| * | | | kill zh_CN.GB2312Thomas Müller2013-08-271-118/+0
* | | | | storage information is path specificThomas Müller2013-08-271-1/+1
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-2558-163/+114
* | | | Merge pull request #4331 from owncloud/improve_app-managementChristopher2013-08-254-22/+54
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into improve_app-managementkondou2013-08-2170-34/+282
| |\ \ \
| * | | | Move .errormsg from settings-css to .warning in core. Reusable!kondou2013-08-183-14/+6
| * | | | Use appitem instead of always recreating a jquery objectkondou2013-08-181-15/+13
| * | | | Don't use an alert for displaying app-mgmt-errorskondou2013-08-183-10/+44
| * | | | Merge branch 'master' into improve_app-managementkondou2013-08-1810-36/+47
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into improve_app-managementkondou2013-08-0975-76/+348
| |\ \ \ \ \
| * | | | | | Log exception at the catching codekondou2013-08-091-0/+1
| * | | | | | Improve app-managementkondou2013-08-062-11/+18
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-233-0/+18
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-225-1/+16
| |_|_|/ / / |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-2125-0/+65
* | | | | | Merge pull request #4262 from owncloud/fix_jslint_kondouChristopher2013-08-204-7/+10
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'master' into fix_jslint_kondoukondou2013-08-1881-129/+441
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Fix a syntax error & have if-conds in an own linekondou2013-08-011-1/+3
| * | | | | Fix some JSLint warningskondou2013-07-314-7/+8
* | | | | | Merge pull request #4447 from owncloud/fix_4351_masterMorris Jobke2013-08-204-22/+29
|\ \ \ \ \ \
| * | | | | | Break long lines into smaller ones.Owen Winkler2013-08-181-3/+10
| * | | | | | Use JSON to send/receive group data.Owen Winkler2013-08-154-22/+22
| | |_|_|_|/ | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1935-0/+62