summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4410 from owncloud/fix_sharing_defaultsJörn Friedrich Dreyer2013-08-132-2/+3
|\ | | | | Fix sharing defaults
| * comment clarificationJörn Friedrich Dreyer2013-08-141-1/+1
| |
| * use edit & reshare permission as defaultJörn Friedrich Dreyer2013-08-131-2/+2
| |
| * add PERMISSIONS_ALL summaryJörn Friedrich Dreyer2013-08-131-0/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-08-139-0/+9
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-08-111-0/+2
|
* Merge pull request #4344 from owncloud/appmgmt-in-navigationJan-Christoph Borchardt2013-08-092-0/+17
|\ | | | | show 'More apps' link to app administration directly in app navigation
| * show 'More apps' link to app administration directly in app navigationJan-Christoph Borchardt2013-08-072-0/+17
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-08-0975-74/+371
| |
* | Merge pull request #4271 from owncloud/plural_translationsOwen Winkler2013-08-082-33/+94
|\ \ | | | | | | Plural translations
| * | adding proper evaluation of plural form - uses LGPL licensed code of jsgettextThomas Müller2013-08-031-17/+62
| | |
| * | return plural form in ajax translationsThomas Müller2013-08-031-1/+1
| | |
| * | Add multiple plural forms to the php partJakob Sack2013-07-161-6/+5
| | |
| * | Partly integrate plural translations into jsJakob Sack2013-07-071-19/+36
| | |
* | | Merge pull request #3912 from owncloud/css_cleanup_kondouJan-Christoph Borchardt2013-08-081-4/+13
|\ \ \ | | | | | | | | General CSS cleanup
| * \ \ Merge branch 'master' into css_cleanup_kondoukondou2013-07-2494-350/+452
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/css/styles.css settings/templates/personal.php
| * | | | General CSS cleanupkondou2013-07-091-17/+39
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-072-0/+6
| |_|_|/ |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-041-1/+1
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-032-0/+16
| | | |
* | | | use fixed OC.Breadcrumb.push()Jörn Friedrich Dreyer2013-08-021-56/+32
| | | |
* | | | add OC.Breadcrumb.show(dir, filename, link)Jörn Friedrich Dreyer2013-08-021-0/+62
| | | |
* | | | Merge pull request #4278 from owncloud/breadcrumb-firstJörn Friedrich Dreyer2013-08-021-1/+1
|\ \ \ \ | | | | | | | | | | make sure the first breadcrumb item is inserted before any other elements in the topbar
| * | | | make sure the first breadcrumb item is inserted before any other elements in ↵Robin Appelman2013-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | the topbar
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-022-10/+12
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-013-0/+10
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-311-0/+1
| | | |
* | | | Merge pull request #4225 from owncloud/better-404Thomas Müller2013-07-301-6/+10
|\ \ \ \ | | | | | | | | | | More verbose 404, closes #3225
| * | | | Move styles from core to appVictor Dubiniuk2013-07-291-12/+0
| | | | |
| * | | | Allow apps to have own 404 content, closes #3225Victor Dubiniuk2013-07-292-6/+22
| | | | |
* | | | | fixes #4026Thomas Müller2013-07-301-9/+21
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-302-21/+25
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-291-0/+2
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-281-0/+2
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-2744-86/+25
| | | |
* | | | Merge pull request #4199 from owncloud/login-cleanupJörn Friedrich Dreyer2013-07-261-0/+21
|\ \ \ \ | | | | | | | | | | Login cleanup IE8 fixes
| * | | | IE8 login/install screen cleartype fixes and input box bordersJörn Friedrich Dreyer2013-07-261-0/+21
| | | | |
| * | | | force dbs to stay in one lineJörn Friedrich Dreyer2013-07-241-1/+1
| | |/ / | |/| |
* | | | show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary ↵Jörn Friedrich Dreyer2013-07-242-31/+25
| | | | | | | | | | | | | | | | js & html ids
* | | | force dbs to stay in one lineJörn Friedrich Dreyer2013-07-241-1/+1
|/ / /
* | | merge masterJan-Christoph Borchardt2013-07-248-29/+29
|\ \ \
| * \ \ Merge pull request #4175 from owncloud/remember-checkedJan-Christoph Borchardt2013-07-241-2/+2
| |\ \ \ | | | | | | | | | | check remember log in by default, ref #3918
| | * | | check remember log in by default, ref #3918Jan-Christoph Borchardt2013-07-241-2/+2
| | | | |
| * | | | use OC_Defaults directly from the templateBjörn Schießle2013-07-241-2/+2
| | | | |
| * | | | initialize OC_Defaults in template constructorXBjörn Schießle2013-07-245-23/+14
| |/ / /
| * | | Merge branch 'master' into more-themable-stringsThomas Müller2013-07-2414-19/+67
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: lib/template.php
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-241-1/+7
| | | | |
| * | | | use themable strings for installationJan-Christoph Borchardt2013-07-111-2/+5
| | | | |
| * | | | introduce shortname themable string and split from title, use for image alt textJan-Christoph Borchardt2013-07-114-8/+8
| | | | |
* | | | | slight dark inset text shadow for warnings to increase legibilityJan-Christoph Borchardt2013-07-241-0/+1
| | | | |