Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove some more debug output | Bjoern Schiessle | 2013-09-06 | 1 | -2/+0 |
* | remove some error_logs | Bjoern Schiessle | 2013-09-06 | 1 | -1/+0 |
* | remove error logs | Bjoern Schiessle | 2013-09-06 | 1 | -2/+2 |
* | coding style fixes | Bjoern Schiessle | 2013-09-06 | 1 | -1/+2 |
* | if the files doesn't exist yet we start with the parent to search for shares | Bjoern Schiessle | 2013-09-06 | 1 | -4/+12 |
* | fix part file handling and real size calculation, this should also solve #4581 | Bjoern Schiessle | 2013-09-06 | 3 | -45/+24 |
* | check shares for the real file and not for the .part file | Bjoern Schiessle | 2013-09-06 | 1 | -0/+5 |
* | first check if a extension exists before comparing it | Bjoern Schiessle | 2013-09-06 | 1 | -1/+1 |
* | handle part files correctly | Bjoern Schiessle | 2013-09-06 | 1 | -6/+27 |
* | prefix #filestable to tbody tr | Pete McFarlane | 2013-09-06 | 1 | -3/+3 |
* | Revert "fixes #4574" | Thomas Müller | 2013-09-06 | 1 | -10/+5 |
* | Merge pull request #4704 from owncloud/rename-lostpassword-controller | Bart Visscher | 2013-09-05 | 2 | -26/+26 |
|\ | |||||
| * | Merge branch 'master' into rename-lostpassword-controller | Thomas Müller | 2013-09-04 | 71 | -592/+718 |
| |\ | |||||
| * | | 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 | 57 | -438/+560 |
* | | | Merge pull request #4477 from owncloud/hooks-view | Bernhard Posselt | 2013-09-04 | 2 | -33/+87 |
|\ \ \ | |||||
| * | | | test case for hooks send from a non-default view | Robin Appelman | 2013-08-29 | 1 | -1/+30 |
| * | | | also emit hooks for views that are a subfolder of the user folder | Robin Appelman | 2013-08-17 | 1 | -32/+57 |
* | | | | Merge pull request #4683 from owncloud/publicuploadjserror | Thomas Müller | 2013-09-04 | 1 | -0/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Fixed public upload error that prevents upload | Vincent Petry | 2013-09-01 | 1 | -0/+1 |
* | | | | Merge pull request #4449 from owncloud/clean_up_util | Morris Jobke | 2013-09-03 | 17 | -242/+318 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into clean_up_util | kondou | 2013-09-02 | 884 | -12621/+26367 |
| |\ \ \ \ | |||||
| * | | | | | Fix some phpdoc and camelcase | kondou | 2013-08-23 | 1 | -15/+17 |
| * | | | | | fixing typos | Thomas Müller | 2013-08-22 | 1 | -9/+10 |
| * | | | | | Merge branch 'master' into clean_up_util | kondou | 2013-08-20 | 1069 | -19632/+16788 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix some naming and spacing in lib/util.php | kondou | 2013-08-18 | 4 | -15/+20 |
| * | | | | | | Clean up \OC\Util | kondou | 2013-08-15 | 17 | -222/+290 |
* | | | | | | | Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepicker | Morris Jobke | 2013-09-03 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 | 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 | 2 | -21/+30 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Revert "remove editor div in filelist", add "is deprecated" comment | Jörn Friedrich Dreyer | 2013-09-03 | 1 | -0/+1 |
| * | | | | | | | | | refactor OC.Breadcrumbs, allow injection of container to allow rendering crum... | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -20/+29 |
| * | | | | | | | | | remove editor div in filelist | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -1/+0 |
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-03 | 35 | -193/+267 |
* | | | | | | | | | | Merge pull request #4702 from owncloud/center-utils | Morris Jobke | 2013-09-03 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | 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 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #4706 from owncloud/fix_filepicker_mimetype | Christopher | 2013-09-02 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use provided mimetype on open. Fix #4696 | Thomas Tanghus | 2013-09-02 | 1 | -2/+2 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #4672 from owncloud/ocs_cleanup | blizzz | 2013-09-02 | 2 | -52/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | remove the config option that is no longer needed | Frank Karlitschek | 2013-08-31 | 1 | -3/+0 |
| * | | | | | | | | | remove knowledgebase calls that are no longer used in ownCloud 5/6 | Frank Karlitschek | 2013-08-31 | 1 | -49/+0 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #4514 from owncloud/windows_ssl | Owen Winkler | 2013-09-02 | 4 | -12/+40 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | This function doesn't cache anymore. Adjusted PHPDoc to suit. | ringmaster | 2013-09-02 | 1 | -1/+1 |
| * | | | | | | | | Don't cache the pkey, skip generation if the keyfile exists | ringmaster | 2013-09-02 | 2 | -13/+11 |