summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #7570 from owncloud/fix_issue_imagick_non_static_4Vincent Petry2014-03-063-62/+80
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ fix merge conflictsGeorg Ehrke2014-03-0617-53/+93
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | fix issue with Non-static method Imagick ../..; @ doesn't seem to work in thi...Georg Ehrke2014-03-053-62/+80
* | | | | | | | Merge pull request #7588 from owncloud/noise-repeatVincent Petry2014-03-061-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | fix noise not repeatingJan-Christoph Borchardt2014-03-061-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #7575 from owncloud/issue/7571Vincent Petry2014-03-051-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Do not set #dir when on public.phpJoas Schilling2014-03-051-2/+2
* | | | | | | | Merge pull request #7354 from pschmitt/masterLukas Reschke2014-03-055-7/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Use 'command -v' to detect whether and where software is installed (instead o...Philipp Schmitt2014-02-215-7/+7
* | | | | | | | | Merge pull request #7531 from owncloud/dont_create_shared_folderBjörn Schießle2014-03-057-28/+66
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | don't allow to create a file or folder named 'Shared' in the root folder, als...Bjoern Schiessle2014-03-057-28/+66
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #7569 from owncloud/scrutinizer-tabsJan-Christoph Borchardt2014-03-053-16/+16
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | fix some spaces to tabs issues reported by ScrutinizerJan-Christoph Borchardt2014-03-053-16/+16
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #7568 from owncloud/lib_preview_add_fcloseMorris Jobke2014-03-051-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | add fclose, fixes issue from bdb96b9af85256f9b3f8663ccf6d27b3d1330918Georg Ehrke2014-03-051-0/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #7566 from owncloud/button-outlinesMorris Jobke2014-03-051-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Adds 0 Outlines to Buttonsraghunayyar2014-03-051-0/+1
* | | | | | | | Merge pull request #7558 from owncloud/fix_issue_loading_cached_thumbMorris Jobke2014-03-051-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | fix issue with spamming logging files when loading cached thumbnailGeorg Ehrke2014-03-051-1/+3
* | | | | | | | Merge pull request #7560 from owncloud/icons.css-star-fixRaghu Nayyar2014-03-051-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | add hover/focus states for star icons to hint at actionJan-Christoph Borchardt2014-03-051-2/+6
* | | | | | | | | Merge pull request #7261 from owncloud/issue/6793Jan-Christoph Borchardt2014-03-055-13/+74
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Allow admins to disable certain external storages for usersJoas Schilling2014-02-265-13/+74
* | | | | | | | | Merge pull request #7556 from owncloud/enc_dont_create_files_folderVincent Petry2014-03-051-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | don't create files folder, let ownCloud core handle itBjoern Schiessle2014-03-051-1/+0
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #7412 from owncloud/issue/7175Joas Schilling2014-03-054-3/+48
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add button to send a test mail after changing the email settingsJoas Schilling2014-03-054-3/+48
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #7012 from owncloud/display-share-owner-masterVincent Petry2014-03-054-13/+30
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into display-share-owner-masterThomas Müller2014-02-28103-766/+1851
| |\ \ \ \ \ \ \
| * | | | | | | | Improve jQuery element selectorMorris Jobke2014-02-201-1/+1
| * | | | | | | | uppercase text and fix dialog popupThomas Müller2014-02-201-4/+4
| * | | | | | | | show share owner within shared folders as wellThomas Müller2014-02-201-0/+3
| * | | | | | | | remove duplicate selectors and declarationThomas Müller2014-02-201-7/+6
| * | | | | | | | update share ownerThomas Müller2014-02-201-0/+8
| * | | | | | | | store the share owner in a data-attribute instead of a separate spanThomas Müller2014-02-201-5/+9
| * | | | | | | | adding share owner information to the file listThomas Müller2014-02-202-5/+8
* | | | | | | | | Merge pull request #7554 from owncloud/issue/7304Morris Jobke2014-03-052-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix position of eye icon on database password fieldJoas Schilling2014-03-052-2/+6
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #7521 from owncloud/docstrings_2_kondouThomas Müller2014-03-052-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix some more docstringskondou2014-03-032-2/+2
* | | | | | | | | | Merge pull request #7508 from owncloud/ldap-configkeycasingVincent Petry2014-03-041-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed configkey casing for PostgreSQLVincent Petry2014-03-031-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #7251 from owncloud/fix-ocsapi-getuserTom Needham2014-03-041-2/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Return 101 if user doesnt existtomneedham2014-02-181-2/+6
| * | | | | | | | | | Add displayname for adminstomneedham2014-02-181-2/+10
* | | | | | | | | | | Merge pull request #7481 from tripflex/fix_downloadlink_spacesVincent Petry2014-03-041-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | move replace to inside issetMyles McNamara2014-02-281-2/+2
| * | | | | | | | | | | replace spaces in download link without encoding entire URLMyles McNamara2014-02-281-0/+2
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #7525 from owncloud/fix_S3stringThomas Müller2014-03-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix https://github.com/owncloud/core/issues/6825Frank Karlitschek2014-03-041-1/+1