Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #7570 from owncloud/fix_issue_imagick_non_static_4 | Vincent Petry | 2014-03-06 | 3 | -62/+80 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | fix merge conflicts | Georg Ehrke | 2014-03-06 | 17 | -53/+93 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| * | | | | | | | fix issue with Non-static method Imagick ../..; @ doesn't seem to work in thi... | Georg Ehrke | 2014-03-05 | 3 | -62/+80 | |
* | | | | | | | | Merge pull request #7588 from owncloud/noise-repeat | Vincent Petry | 2014-03-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | fix noise not repeating | Jan-Christoph Borchardt | 2014-03-06 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #7575 from owncloud/issue/7571 | Vincent Petry | 2014-03-05 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Do not set #dir when on public.php | Joas Schilling | 2014-03-05 | 1 | -2/+2 | |
* | | | | | | | | Merge pull request #7354 from pschmitt/master | Lukas Reschke | 2014-03-05 | 5 | -7/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Use 'command -v' to detect whether and where software is installed (instead o... | Philipp Schmitt | 2014-02-21 | 5 | -7/+7 | |
* | | | | | | | | | Merge pull request #7531 from owncloud/dont_create_shared_folder | Björn Schießle | 2014-03-05 | 7 | -28/+66 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | don't allow to create a file or folder named 'Shared' in the root folder, als... | Bjoern Schiessle | 2014-03-05 | 7 | -28/+66 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #7569 from owncloud/scrutinizer-tabs | Jan-Christoph Borchardt | 2014-03-05 | 3 | -16/+16 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | fix some spaces to tabs issues reported by Scrutinizer | Jan-Christoph Borchardt | 2014-03-05 | 3 | -16/+16 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #7568 from owncloud/lib_preview_add_fclose | Morris Jobke | 2014-03-05 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | add fclose, fixes issue from bdb96b9af85256f9b3f8663ccf6d27b3d1330918 | Georg Ehrke | 2014-03-05 | 1 | -0/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #7566 from owncloud/button-outlines | Morris Jobke | 2014-03-05 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Adds 0 Outlines to Buttons | raghunayyar | 2014-03-05 | 1 | -0/+1 | |
* | | | | | | | | Merge pull request #7558 from owncloud/fix_issue_loading_cached_thumb | Morris Jobke | 2014-03-05 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
| * | | | | | | | fix issue with spamming logging files when loading cached thumbnail | Georg Ehrke | 2014-03-05 | 1 | -1/+3 | |
* | | | | | | | | Merge pull request #7560 from owncloud/icons.css-star-fix | Raghu Nayyar | 2014-03-05 | 1 | -2/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | add hover/focus states for star icons to hint at action | Jan-Christoph Borchardt | 2014-03-05 | 1 | -2/+6 | |
* | | | | | | | | | Merge pull request #7261 from owncloud/issue/6793 | Jan-Christoph Borchardt | 2014-03-05 | 5 | -13/+74 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Allow admins to disable certain external storages for users | Joas Schilling | 2014-02-26 | 5 | -13/+74 | |
* | | | | | | | | | Merge pull request #7556 from owncloud/enc_dont_create_files_folder | Vincent Petry | 2014-03-05 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | don't create files folder, let ownCloud core handle it | Bjoern Schiessle | 2014-03-05 | 1 | -1/+0 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #7412 from owncloud/issue/7175 | Joas Schilling | 2014-03-05 | 4 | -3/+48 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Add button to send a test mail after changing the email settings | Joas Schilling | 2014-03-05 | 4 | -3/+48 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #7012 from owncloud/display-share-owner-master | Vincent Petry | 2014-03-05 | 4 | -13/+30 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' into display-share-owner-master | Thomas Müller | 2014-02-28 | 103 | -766/+1851 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Improve jQuery element selector | Morris Jobke | 2014-02-20 | 1 | -1/+1 | |
| * | | | | | | | | uppercase text and fix dialog popup | Thomas Müller | 2014-02-20 | 1 | -4/+4 | |
| * | | | | | | | | show share owner within shared folders as well | Thomas Müller | 2014-02-20 | 1 | -0/+3 | |
| * | | | | | | | | remove duplicate selectors and declaration | Thomas Müller | 2014-02-20 | 1 | -7/+6 | |
| * | | | | | | | | update share owner | Thomas Müller | 2014-02-20 | 1 | -0/+8 | |
| * | | | | | | | | store the share owner in a data-attribute instead of a separate span | Thomas Müller | 2014-02-20 | 1 | -5/+9 | |
| * | | | | | | | | adding share owner information to the file list | Thomas Müller | 2014-02-20 | 2 | -5/+8 | |
* | | | | | | | | | Merge pull request #7554 from owncloud/issue/7304 | Morris Jobke | 2014-03-05 | 2 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix position of eye icon on database password field | Joas Schilling | 2014-03-05 | 2 | -2/+6 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #7521 from owncloud/docstrings_2_kondou | Thomas Müller | 2014-03-05 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix some more docstrings | kondou | 2014-03-03 | 2 | -2/+2 | |
* | | | | | | | | | | Merge pull request #7508 from owncloud/ldap-configkeycasing | Vincent Petry | 2014-03-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fixed configkey casing for PostgreSQL | Vincent Petry | 2014-03-03 | 1 | -1/+1 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #7251 from owncloud/fix-ocsapi-getuser | Tom Needham | 2014-03-04 | 1 | -2/+14 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Return 101 if user doesnt exist | tomneedham | 2014-02-18 | 1 | -2/+6 | |
| * | | | | | | | | | | Add displayname for admins | tomneedham | 2014-02-18 | 1 | -2/+10 | |
* | | | | | | | | | | | Merge pull request #7481 from tripflex/fix_downloadlink_spaces | Vincent Petry | 2014-03-04 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | move replace to inside isset | Myles McNamara | 2014-02-28 | 1 | -2/+2 | |
| * | | | | | | | | | | | replace spaces in download link without encoding entire URL | Myles McNamara | 2014-02-28 | 1 | -0/+2 | |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #7525 from owncloud/fix_S3string | Thomas Müller | 2014-03-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | fix https://github.com/owncloud/core/issues/6825 | Frank Karlitschek | 2014-03-04 | 1 | -1/+1 |