summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11090 from owncloud/fix-undefined-class-and-phpdocMorris Jobke2014-09-161-16/+8
|\
| * Fix unexisting class and PHPDocLukas Reschke2014-09-151-16/+8
* | Merge pull request #10639 from owncloud/fix_naming_schema_preview_with_aspectMorris Jobke2014-09-161-7/+17
|\ \
| * | add phpdocGeorg Ehrke2014-09-151-0/+4
| * | add y to with-aspect naming schemaGeorg Ehrke2014-09-151-7/+13
* | | Merge pull request #10362 from owncloud/preserve_transparency_on_fileloadMorris Jobke2014-09-162-0/+9
|\ \ \
| * | | Preserve transparency when loading from a filekondou2014-09-102-0/+9
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1624-17/+38
* | | | Merge pull request #11040 from owncloud/fix-app-menu-overlappJan-Christoph Borchardt2014-09-152-2/+6
|\ \ \ \
| * | | | add some minor fixes for IE8Morris Jobke2014-09-152-1/+5
| * | | | remove bottom: 0 to prevent the menu form overlapping the whole element. This...Bernhard Posselt2014-09-151-2/+2
* | | | | Merge pull request #11023 from owncloud/users-fixundoLukas Reschke2014-09-153-5/+237
|\ \ \ \ \
| * | | | | Add timeout to user and group deletion notificationVincent Petry2014-09-153-5/+237
| |/ / / /
* | | | | Merge pull request #11060 from owncloud/rmobslangLukas Reschke2014-09-1511-89/+0
|\ \ \ \ \
| * | | | | remove obsolete language filesVolkan Gezer2014-09-1311-89/+0
* | | | | | Merge pull request #10109 from owncloud/issue_#9793_guestlayoutMorris Jobke2014-09-152-7/+11
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Step one, open guest layout for different styles.Lukas Reschke2014-09-112-7/+11
* | | | | | Merge pull request #11026 from owncloud/apps-styles-updateMorris Jobke2014-09-151-23/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | use same shade of grey for active navigation items and hoveringJan-Christoph Borchardt2014-09-111-2/+2
| * | | | | remove icon styles from apps.css as they are in icons.cssJan-Christoph Borchardt2014-09-111-21/+0
* | | | | | Merge pull request #10960 from owncloud/use-intl-module-masterLukas Reschke2014-09-152-7/+8
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | use intl's native normalizer_normalize() in case the module is availableThomas Müller2014-09-112-7/+8
| | |/ / / | |/| | |
* | | | | Merge pull request #11021 from owncloud/do-not-double-decodeAndreas Fischer2014-09-151-1/+1
|\ \ \ \ \
| * | | | | Do not double decode valuesLukas Reschke2014-09-111-1/+1
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1514-13/+16
* | | | | | Merge pull request #11050 from owncloud/enc-flockfixLukas Reschke2014-09-151-1/+1
|\ \ \ \ \ \
| * | | | | | Remove passing by reference to allow for proper GCVincent Petry2014-09-121-1/+1
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1414-13/+15
* | | | | | | Merge pull request #11054 from owncloud/fix-unit-tests-11041-masterThomas Müller2014-09-131-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | content size checks are not valid for LOCKThomas Müller2014-09-121-0/+2
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1325-24/+37
* | | | | | | Don't terminate the script if the pgsql database could not be deletedThomas Müller2014-09-121-1/+1
|/ / / / / /
* | | | | | Merge pull request #11041 from owncloud/no-size-check-on-lock-masterRaghu Nayyar2014-09-131-1/+1
|\ \ \ \ \ \
| * | | | | | content size checks are not valid for LOCKThomas Müller2014-09-121-1/+1
* | | | | | | Merge pull request #10974 from owncloud/fix-app-content-overflowBernhard Posselt2014-09-121-1/+0
|\ \ \ \ \ \ \
| * | | | | | | This fixes the double scrollbars issueBernhard Posselt2014-09-091-1/+0
* | | | | | | | remove 'set -e' - causes issues during ci executionThomas Müller2014-09-121-1/+1
* | | | | | | | Merge pull request #11043 from owncloud/test-againstNullClark Tomlinson2014-09-121-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Return false in case one of the values is nullLukas Reschke2014-09-121-0/+4
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1257-94/+87
|/ / / / / / / /
* | | | | | | | Merge pull request #11024 from owncloud/fix-nojavascriptJan-Christoph Borchardt2014-09-111-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | fix nojavascript message alignmentJan-Christoph Borchardt2014-09-111-1/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #11022 from owncloud/icons-fixJan-Christoph Borchardt2014-09-1116-153/+136
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix folder icon alignment, fix #10866Jan-Christoph Borchardt2014-09-1110-112/+102
| * | | | | | | fix svg of calendar filetype iconJan-Christoph Borchardt2014-09-112-34/+32
| * | | | | | | fix size of toggle icon, make container squareJan-Christoph Borchardt2014-09-112-4/+1
| * | | | | | | improve style of checkmark icon, less bold, fitting ownCloud styleJan-Christoph Borchardt2014-09-112-3/+1
* | | | | | | | Merge pull request #11018 from owncloud/fix-notification-layerLukas Reschke2014-09-111-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix notification visibility, fix #11016Jan-Christoph Borchardt2014-09-111-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #11006 from owncloud/addCustomHex2BinImplementationBecause...Thomas Müller2014-09-111-2/+18
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |