summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11055 from owncloud/replaceprodnameThomas Müller2014-09-161-2/+2
|\
| * replace ownCloud with placeholderVolkan Gezer2014-09-131-2/+2
* | Merge pull request #11084 from owncloud/no-migration-for-mssql-masterLukas Reschke2014-09-162-0/+26
|\ \
| * | Disable database migrations for MSSQL - scripts have to be applied manuallyThomas Müller2014-09-152-0/+26
* | | Merge pull request #11081 from owncloud/trash_fix_expireLukas Reschke2014-09-161-1/+1
|\ \ \
| * | | also expire file if timestamp = limit, happens if trashbin_retention_obligati...Bjoern Schiessle2014-09-151-1/+1
| |/ /
* | | Merge pull request #10663 from owncloud/files_trashbin_original_pathMorris Jobke2014-09-167-5/+79
|\ \ \
| * | | patch tipsy in style.css - don't patch 3rdparty librariesMorris Jobke2014-09-162-1/+6
| * | | Better tooltip handling of very long stringsRobin McCorkell2014-09-111-1/+1
| * | | Show original path information in trashbin and sharing viewsRobin McCorkell2014-09-117-5/+74
* | | | Revert "improve logo flexibility to fix wide custom logo alignment, fix #9339"Vincent Petry2014-09-162-1/+3
* | | | 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