Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #11055 from owncloud/replaceprodname | Thomas Müller | 2014-09-16 | 1 | -2/+2 |
|\ | |||||
| * | replace ownCloud with placeholder | Volkan Gezer | 2014-09-13 | 1 | -2/+2 |
* | | Merge pull request #11084 from owncloud/no-migration-for-mssql-master | Lukas Reschke | 2014-09-16 | 2 | -0/+26 |
|\ \ | |||||
| * | | Disable database migrations for MSSQL - scripts have to be applied manually | Thomas Müller | 2014-09-15 | 2 | -0/+26 |
* | | | Merge pull request #11081 from owncloud/trash_fix_expire | Lukas Reschke | 2014-09-16 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | also expire file if timestamp = limit, happens if trashbin_retention_obligati... | Bjoern Schiessle | 2014-09-15 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #10663 from owncloud/files_trashbin_original_path | Morris Jobke | 2014-09-16 | 7 | -5/+79 |
|\ \ \ | |||||
| * | | | patch tipsy in style.css - don't patch 3rdparty libraries | Morris Jobke | 2014-09-16 | 2 | -1/+6 |
| * | | | Better tooltip handling of very long strings | Robin McCorkell | 2014-09-11 | 1 | -1/+1 |
| * | | | Show original path information in trashbin and sharing views | Robin McCorkell | 2014-09-11 | 7 | -5/+74 |
* | | | | Revert "improve logo flexibility to fix wide custom logo alignment, fix #9339" | Vincent Petry | 2014-09-16 | 2 | -1/+3 |
* | | | | Merge pull request #11090 from owncloud/fix-undefined-class-and-phpdoc | Morris Jobke | 2014-09-16 | 1 | -16/+8 |
|\ \ \ \ | |||||
| * | | | | Fix unexisting class and PHPDoc | Lukas Reschke | 2014-09-15 | 1 | -16/+8 |
* | | | | | Merge pull request #10639 from owncloud/fix_naming_schema_preview_with_aspect | Morris Jobke | 2014-09-16 | 1 | -7/+17 |
|\ \ \ \ \ | |||||
| * | | | | | add phpdoc | Georg Ehrke | 2014-09-15 | 1 | -0/+4 |
| * | | | | | add y to with-aspect naming schema | Georg Ehrke | 2014-09-15 | 1 | -7/+13 |
* | | | | | | Merge pull request #10362 from owncloud/preserve_transparency_on_fileload | Morris Jobke | 2014-09-16 | 2 | -0/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Preserve transparency when loading from a file | kondou | 2014-09-10 | 2 | -0/+9 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-16 | 24 | -17/+38 |
* | | | | | | | Merge pull request #11040 from owncloud/fix-app-menu-overlapp | Jan-Christoph Borchardt | 2014-09-15 | 2 | -2/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add some minor fixes for IE8 | Morris Jobke | 2014-09-15 | 2 | -1/+5 |
| * | | | | | | | remove bottom: 0 to prevent the menu form overlapping the whole element. This... | Bernhard Posselt | 2014-09-15 | 1 | -2/+2 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #11023 from owncloud/users-fixundo | Lukas Reschke | 2014-09-15 | 3 | -5/+237 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add timeout to user and group deletion notification | Vincent Petry | 2014-09-15 | 3 | -5/+237 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #11060 from owncloud/rmobslang | Lukas Reschke | 2014-09-15 | 11 | -89/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remove obsolete language files | Volkan Gezer | 2014-09-13 | 11 | -89/+0 |
* | | | | | | | | Merge pull request #10109 from owncloud/issue_#9793_guestlayout | Morris Jobke | 2014-09-15 | 2 | -7/+11 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Step one, open guest layout for different styles. | Lukas Reschke | 2014-09-11 | 2 | -7/+11 |
* | | | | | | | | Merge pull request #11026 from owncloud/apps-styles-update | Morris Jobke | 2014-09-15 | 1 | -23/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | use same shade of grey for active navigation items and hovering | Jan-Christoph Borchardt | 2014-09-11 | 1 | -2/+2 |
| * | | | | | | | remove icon styles from apps.css as they are in icons.css | Jan-Christoph Borchardt | 2014-09-11 | 1 | -21/+0 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #10960 from owncloud/use-intl-module-master | Lukas Reschke | 2014-09-15 | 2 | -7/+8 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | use intl's native normalizer_normalize() in case the module is available | Thomas Müller | 2014-09-11 | 2 | -7/+8 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #11021 from owncloud/do-not-double-decode | Andreas Fischer | 2014-09-15 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Do not double decode values | Lukas Reschke | 2014-09-11 | 1 | -1/+1 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-15 | 14 | -13/+16 |
* | | | | | | | Merge pull request #11050 from owncloud/enc-flockfix | Lukas Reschke | 2014-09-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove passing by reference to allow for proper GC | Vincent Petry | 2014-09-12 | 1 | -1/+1 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-14 | 14 | -13/+15 |
* | | | | | | | | Merge pull request #11054 from owncloud/fix-unit-tests-11041-master | Thomas Müller | 2014-09-13 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | content size checks are not valid for LOCK | Thomas Müller | 2014-09-12 | 1 | -0/+2 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-13 | 25 | -24/+37 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Don't terminate the script if the pgsql database could not be deleted | Thomas Müller | 2014-09-12 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #11041 from owncloud/no-size-check-on-lock-master | Raghu Nayyar | 2014-09-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | content size checks are not valid for LOCK | Thomas Müller | 2014-09-12 | 1 | -1/+1 |
* | | | | | | | Merge pull request #10974 from owncloud/fix-app-content-overflow | Bernhard Posselt | 2014-09-12 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | This fixes the double scrollbars issue | Bernhard Posselt | 2014-09-09 | 1 | -1/+0 |
* | | | | | | | | remove 'set -e' - causes issues during ci execution | Thomas Müller | 2014-09-12 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #11043 from owncloud/test-againstNull | Clark Tomlinson | 2014-09-12 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Return false in case one of the values is null | Lukas Reschke | 2014-09-12 | 1 | -0/+4 |