summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* add folder icons for shared, public and externalJan-Christoph Borchardt2013-08-156-0/+204
* adjust New file dialog for new stylesJan-Christoph Borchardt2013-08-152-13/+11
* Merge master into oc_previewGeorg Ehrke2013-08-1480-118/+519
|\
| * Merge pull request #4376 from owncloud/use_pluralsJörn Friedrich Dreyer2013-08-141-6/+4
| |\
| | * Use plural translationskondou2013-08-091-6/+4
| * | Merge pull request #4410 from owncloud/fix_sharing_defaultsJörn Friedrich Dreyer2013-08-132-2/+3
| |\ \
| | * | 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 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
| |\ \
| | * | 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
| |\ \ \
| | * \ \ Merge branch 'master' into css_cleanup_kondoukondou2013-07-2494-350/+452
| | |\ \ \
| | * | | | General CSS cleanupkondou2013-07-091-17/+39
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-072-0/+6
| | |_|_|/ | |/| | |
* | | | | increase row height to 50px, properly position everything, checkboxes, action...Jan-Christoph Borchardt2013-08-141-1/+1
* | | | | adjustments of video and web iconJan-Christoph Borchardt2013-08-148-243/+109
* | | | | Merge branch 'oc_preview' of github.com:owncloud/core into oc_previewJan-Christoph Borchardt2013-08-143-12/+0
|\ \ \ \ \
| * | | | | remove \OC\Preview::showErrorPreviewGeorg Ehrke2013-08-143-12/+0
* | | | | | replace different icons for code with proper onesJan-Christoph Borchardt2013-08-1420-50/+317
* | | | | | replace different icons for documents, spreadsheets and presentations with pr...Jan-Christoph Borchardt2013-08-1418-0/+233
* | | | | | replace same but differently named package graphics with one proper oneJan-Christoph Borchardt2013-08-1416-0/+62
* | | | | | add more file type icons, replace old onesJan-Christoph Borchardt2013-08-1415-0/+1387
|/ / / / /
* | | | | fix merge conflictsGeorg Ehrke2013-08-0510-26/+109
|\| | | |
| * | | | [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 ...Robin Appelman2013-08-011-1/+1
| * | | | | [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
| |\ \ \ \
| | * | | | 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
* | | | | | Merge branch 'master' into oc_previewGeorg Ehrke2013-07-302-21/+25
|\| | | | |
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-302-21/+25
| |/ / / /
* | | | | fix code style of try catch blocksGeorg Ehrke2013-07-301-1/+1
* | | | | style fixesGeorg Ehrke2013-07-304-3/+183
* | | | | Merge branch 'master' into oc_previewThomas Müller2013-07-3061-257/+447
|\| | | |