Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4704 from owncloud/rename-lostpassword-controller | Bart Visscher | 2013-09-05 | 2 | -26/+26 |
|\ | | | | | Use the namespaced variation of the classname. | ||||
| * | Merge branch 'master' into rename-lostpassword-controller | Thomas Müller | 2013-09-04 | 12 | -51/+116 |
| |\ | | | | | | | | | | | | | Conflicts: core/lostpassword/controller.php | ||||
| * | | Use the namespaced variation of the classname. | Bart Visscher | 2013-09-02 | 2 | -26/+26 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-05 | 4 | -20/+46 |
| |/ |/| | |||||
* | | Merge pull request #4449 from owncloud/clean_up_util | Morris Jobke | 2013-09-03 | 3 | -5/+5 |
|\ \ | | | | | | | Clean up \OC\Util | ||||
| * \ | Merge branch 'master' into clean_up_util | kondou | 2013-09-02 | 177 | -619/+3800 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: lib/base.php | ||||
| * \ \ | Merge branch 'master' into clean_up_util | kondou | 2013-08-20 | 107 | -649/+557 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/util.php | ||||
| * | | | | Fix some naming and spacing in lib/util.php | kondou | 2013-08-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Clean up \OC\Util | kondou | 2013-08-15 | 3 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use camelCase - Add some phpdoc - Fix some indents - Use some more spacing | ||||
* | | | | | Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepicker | Morris Jobke | 2013-09-03 | 1 | -1/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Add previews to OC.dialogs.filepicker() | ||||
| * | | | | | Add previews to OC.dialogs.filepicker(); Fix #4697 | kondou | 2013-09-03 | 1 | -1/+5 |
| | | | | | | |||||
* | | | | | | Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bind | Christopher | 2013-09-03 | 1 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | use on to add event listener instead of deprecated jquery bind | ||||
| * | | | | | | use on to add event listener instead of deprecated jquery bind | Jörn Friedrich Dreyer | 2013-09-03 | 1 | -1/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4473 from owncloud/texteditor_polishing | Jörn Friedrich Dreyer | 2013-09-03 | 1 | -20/+29 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Texteditor polishing | ||||
| * | | | | | | | refactor OC.Breadcrumbs, allow injection of container to allow rendering ↵ | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -20/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crumbs into full screen editor | ||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-03 | 2 | -4/+27 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #4702 from owncloud/center-utils | Morris Jobke | 2013-09-03 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | center utils | ||||
| * | | | | | | | | center utils | Bernhard Posselt | 2013-09-02 | 1 | -0/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #4695 from owncloud/placeholder-hsl | Morris Jobke | 2013-09-03 | 1 | -8/+5 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | RGB -> HSL | ||||
| * | | | | | | | | placeholder.js: fix typo | Jan-Christoph Borchardt | 2013-09-02 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | placeholder.js: adjust saturation and lightness values | Jan-Christoph Borchardt | 2013-09-02 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | RGB -> HSL | Morris Jobke | 2013-09-02 | 1 | -7/+4 |
| | |_|/ / / / / | |/| | | | | | | |||||
* / | | | | | | | Use provided mimetype on open. Fix #4696 | Thomas Tanghus | 2013-09-02 | 1 | -2/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #4657 from owncloud/files-controls-fixes | Morris Jobke | 2013-09-01 | 1 | -7/+13 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Files controls fixes | ||||
| * | | | | | | | adjust right padding of controls bar, fix #4650 | Jan-Christoph Borchardt | 2013-08-30 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | fix coding style for controls bar | Jan-Christoph Borchardt | 2013-08-30 | 1 | -7/+13 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #4674 from owncloud/fit-filepicker-new-icons | Morris Jobke | 2013-09-01 | 2 | -2/+19 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | Fit filesummary for \OC\Preview's new mimetype-icons | ||||
| * | | | | | | | IE8 fixes | Morris Jobke | 2013-09-02 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | Fit filesummary for \OC\Preview's ne mimetype-icons | kondou | 2013-08-31 | 1 | -2/+15 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #4671 from owncloud/emptycontent | Bernhard Posselt | 2013-09-01 | 1 | -1/+8 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | centers text message in empty-content page (files and files_trashbin apps) | ||||
| * | | | | | | rename emptyfolder to emptycontent | Alessandro Cosentino | 2013-08-31 | 1 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | text centered horizontally and vertically in emptycontent div | Alessandro Cosentino | 2013-08-31 | 1 | -1/+8 |
| |/ / / / / | |||||
* / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-01 | 51 | -15/+78 |
|/ / / / / | |||||
* | | | | | Merge master into oc_preview | Georg Ehrke | 2013-08-30 | 31 | -317/+489 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #4661 from owncloud/separate-app-styles | Jan-Christoph Borchardt | 2013-08-30 | 3 | -283/+282 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Move CSS for apps and browser-specific fixes out of main styles.css | ||||
| | * | | | | | move CSS for browser-specific fixes out of styles.css into new fixes.css | Jan-Christoph Borchardt | 2013-08-30 | 2 | -44/+46 |
| | | | | | | | |||||
| | * | | | | | move CSS for apps out of styles.css into new apps.css | Jan-Christoph Borchardt | 2013-08-30 | 2 | -239/+236 |
| | | | | | | | |||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-30 | 26 | -26/+177 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #4660 from owncloud/apps-management-sticky | Morris Jobke | 2013-08-30 | 2 | -2/+25 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Apps management as sticky footer and rename to 'Apps', fix #4622 | ||||
| | * | | | | | | Apps management as sticky footer and rename to 'Apps', fix #4622 | Jan-Christoph Borchardt | 2013-08-30 | 2 | -2/+25 |
| | |/ / / / / | |||||
| * / / / / / | Use Group methods for searching, fixes #4201 | Arthur Schiwon | 2013-08-30 | 1 | -6/+5 |
| |/ / / / / | |||||
* | | | | | | Merge master into oc_preview | Georg Ehrke | 2013-08-29 | 19 | -183/+162 |
|\| | | | | | |||||
| * | | | | | Merge pull request #4552 from dampfklon/fix4552 | Morris Jobke | 2013-08-28 | 1 | -1/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Make group suffix in share dialog translatable | ||||
| | * | | | | | Make group suffix in share dialog translatable | dampfklon | 2013-08-22 | 1 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #4618 from owncloud/visualize-js | Morris Jobke | 2013-08-28 | 1 | -0/+65 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | visualize | ||||
| | * | | | | | | fixing typo | Thomas Müller | 2013-08-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | calculate fontsize and line-height | Morris Jobke | 2013-08-28 | 1 | -2/+7 |
| | | | | | | | | |||||
| | * | | | | | | reviewers comments | Morris Jobke | 2013-08-28 | 1 | -6/+14 |
| | | | | | | | | |||||
| | * | | | | | | add visualize | Morris Jobke | 2013-08-28 | 1 | -0/+52 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #4627 from owncloud/trashbin-tipsy | Morris Jobke | 2013-08-28 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | change orientation for delete tooltip to left, fix #4589 |