summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* Added warning notification when user home already existsVincent Petry2013-10-222-0/+19
| | | | | | | When creating a user and the home already exists in the data dir, a warning notification will be displayed. Fixes #5161
* Merge pull request #5455 from owncloud/fixing-2423-masterThomas Müller2013-10-222-2/+2
|\ | | | | introduce link_to_docs() and migrate links
| * introduce link_to_docs() and migrate linksThomas Müller2013-10-212-2/+2
| |
* | Merge pull request #5426 from owncloud/fix-3612Vincent Petry2013-10-221-0/+4
|\ \ | |/ |/| Adds margin to the SSL root certificate button
| * Takes Import button to next line.raghunayyar2013-10-211-1/+4
| |
| * Adds margin to the SSL root certificate buttonraghunayyar2013-10-191-0/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-2129-58/+0
| |
* | Merge pull request #5429 from owncloud/fix_cron_docuFrank Karlitschek2013-10-201-2/+2
|\ \ | | | | | | harmonize this with the documentation. Once every minute is way to often.
| * | change the languageFrank Karlitschek2013-10-201-2/+2
| | |
| * | harmonize this with the documentation. Once every minute is way to often. ↵Frank Karlitschek2013-10-191-2/+2
| |/ | | | | | | Every 15min should be fine just as the documentation suggests: http://doc.owncloud.org/server/5.0/admin_manual/configuration/background_jobs.html
* / [tx-robot] updated from transifexJenkins for ownCloud2013-10-194-7/+27
|/
* Merge pull request #5321 from owncloud/settings-applistwidthsVincent Petry2013-10-181-1/+5
|\ | | | | Fixed app list right container to not overlap left container scrollbar
| * Fixed app list right container to not overlap left container scrollbarVincent Petry2013-10-141-1/+5
| | | | | | | | | | | | - Container widths in apps list now use pixels instead of em - Container widths now match properly and rightcontainer doesn't overlap the scrollbar any more
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-172-1/+3
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-163-1/+20
| |
* | Merge pull request #5297 from owncloud/quota-styleJan-Christoph Borchardt2013-10-141-7/+5
|\ \ | |/ |/| Fixes Default Quota Style in User Management.
| * Fixes Default Quota Style in User Management.raghunayyar2013-10-141-7/+5
| |
* | finally fix the app sortingFrank Karlitschek2013-10-141-17/+0
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-131-0/+8
|
* show the channel. Also mark git as git channel so that someone can see where ↵Frank Karlitschek2013-10-132-2/+2
| | | | this build comes from
* Merge pull request #5299 from owncloud/settings-ie8-tablegridstylesThomas Müller2013-10-123-8/+11
|\ | | | | Fixed table grid styles for IE8
| * Fixed table grid styles for IE8Vincent Petry2013-10-113-8/+11
| | | | | | | | | | | | | | | | The selector :not() isn't supported in IE8, replaced it with the "grid" class. - Fixes the log table style in IE8 (#5057) - Fixes the users table layout bug in IE8
* | Merge pull request #5272 from mrflix/masterThomas Müller2013-10-121-1/+1
|\ \ | | | | | | fix label to checkbox binding in admin -> force-https
| * | fix checkbox <-> label bindingFelix Niklas2013-10-101-1/+1
| | | | | | | | | | | | clicking the label will trigger the checkbox
* | | Includes <optgroup> tagraghunayyar2013-10-111-1/+1
| | |
* | | Puts the language divider in place. thanks @Kondou-ger ;)raghunayyar2013-10-112-4/+1
| | |
* | | Removes the Bogus Labelraghunayyar2013-10-111-3/+0
| |/ |/|
* | Uniform Styles and Indentation Fixes for Personal Blockraghunayyar2013-10-112-11/+20
| |
* | Fixed display name change for IE8Vincent Petry2013-10-111-1/+1
| | | | | | | | | | | | | | | | After saving the display name, the oldDisplayName field's value was wrongly set with text(), which would append the text inside the input element which is considered as an invalid operation in IE8. This fix for #5054 correctly puts the old value into the field with a val() call.
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-105-0/+21
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-081-0/+15
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-071-0/+2
|
* Fix new user avatar. Ref#5166Victor Dubiniuk2013-10-071-0/+6
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-0614-0/+51
|
* more elegant style for Personal and Admin settingsJan-Christoph Borchardt2013-10-052-19/+19
|
* merge master into input-simplifyJan-Christoph Borchardt2013-10-044-15/+47
|\
| * Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-042-8/+31
| |\ | | | | | | | | | | | | | | | Conflicts: apps/files/index.php apps/files/templates/index.php
| | * Merge pull request #5109 from owncloud/controls-bar-heightMorris Jobke2013-10-041-4/+23
| | |\ | | | | | | | | Controls bar height
| | | * increase height of controls bar and elements to more clickable 44pxJan-Christoph Borchardt2013-10-041-4/+23
| | | |
| | * | Hide defaultavatar in #header and don't darken proper avatars in #headerkondou2013-10-041-4/+8
| | |/
| * | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-0211-3/+83
| |\| | | | | | | | | | | | | Conflicts: lib/private/util.php
| * | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-2349-76/+395
| |\ \ | | | | | | | | | | | | | | | | Conflicts: lib/public/share.php
| * \ \ Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-1612-4/+239
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/index.php
| * \ \ \ Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-054-11/+47
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | increased version number to trigger db update Conflicts: lib/util.php
| * | | | | use css class hidden to hide setting elementsBjoern Schiessle2013-09-021-5/+5
| | | | | |
| * | | | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-0211-11/+154
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/util.php
| * | | | | | enable user to inform recipients about a shared file by mailBjoern Schiessle2013-08-302-3/+12
| | | | | | |
* | | | | | | better style and color for warning and success feedback on inputsJan-Christoph Borchardt2013-10-031-2/+10
| |_|_|_|_|/ |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-304-0/+41
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-292-2/+15
| | | | | |