summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-1368-776/+274
* Merge pull request #5253 from owncloud/externalstorage-adminstatusindicatorMorris Jobke2013-10-132-0/+1
|\
| * Now using smaller spinner image for status indicatorVincent Petry2013-10-112-0/+1
* | Merge pull request #5290 from owncloud/fixing-5191-masterMorris Jobke2013-10-122-19/+16
|\ \
| * | Improve expand/collapse logicVictor Dubiniuk2013-10-111-16/+13
| * | Show advanced section on error. Fixes #5191Victor Dubiniuk2013-10-111-3/+3
* | | Merge pull request #5287 from owncloud/core-layoutviewportdirectiveThomas Müller2013-10-123-3/+3
|\ \ \ | |/ / |/| |
| * | Fixed viewport layout using commas instead of semicolonsVincent Petry2013-10-113-3/+3
* | | Merge pull request #5133 from owncloud/js_vcategories_to_tagsThomas Tanghus2013-10-1115-512/+534
|\ \ \ | |/ / |/| |
| * | Merge branch 'js_vcategories_to_tags' of github.com:owncloud/core into js_vca...Thomas Tanghus2013-10-041-1/+1
| |\ \
| | * | Fix typoThomas Tanghus2013-10-041-1/+1
| * | | It's 'status', not 'result'!Thomas Tanghus2013-10-041-4/+4
| |/ /
| * | Remove obsolete files.Thomas Tanghus2013-10-049-490/+0
| * | JS version of the OCP\ITags interfaceThomas Tanghus2013-10-046-22/+534
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-106-0/+45
* | | Merge pull request #5182 from owncloud/fix-sharring-with-password-screenMorris Jobke2013-10-103-0/+7
|\ \ \
| * | | Optimize confirm.[svg|png] with optipng and scourkondou2013-10-082-63/+4
| * | | Fix password screen for public sharesMorris Jobke2013-10-073-0/+66
* | | | Merge pull request #5244 from owncloud/more-css-fixesMorris Jobke2013-10-105-2/+7
|\ \ \ \
| * | | | fix web interface showing very small when accessed on smartphoneJan-Christoph Borchardt2013-10-063-0/+3
| * | | | properly indent contents of folders for app styles, to line up with textJan-Christoph Borchardt2013-10-061-2/+2
| * | | | improve clickability of footer linkJan-Christoph Borchardt2013-10-061-0/+2
* | | | | Merge pull request #5210 from owncloud/sharing_search_users_fixBjörn Schießle2013-10-101-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | find users which are in the same groupBjoern Schiessle2013-10-081-1/+1
* | | | | Merge pull request #5183 from owncloud/login-warningstyleVincent Petry2013-10-091-2/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed login warning style #5065Vincent Petry2013-10-091-2/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-086-1/+35
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-072-0/+11
|/ / / /
* | | | Merge pull request #4921 from owncloud/file_conflicts_dialog_fixesVicDeo2013-10-071-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | use correct property for mimetype of existing filesJörn Friedrich Dreyer2013-10-071-1/+1
* | | | Merge pull request #5072 from owncloud/apache-auth-masterThomas Müller2013-10-072-1/+7
|\ \ \ \
| * | | | move call to print_unescaped() to templateThomas Müller2013-10-071-1/+1
| * | | | adding warning about failed apache module authThomas Müller2013-10-021-0/+6
| * | | | $defaults is not necessary here - merge artifactThomas Müller2013-10-021-2/+0
| * | | | Revert "use $defaults instead of $theme"Thomas Müller2013-10-021-3/+3
| * | | | use $defaults instead of $themeThomas Müller2013-10-011-3/+3
| * | | | Squashed commit of the following:Thomas Müller2013-10-011-1/+3
* | | | | Prevent share dropdown to close too early with autocompleteVincent Petry2013-10-071-1/+1
* | | | | Fixed label for sharing notification to be clickableVincent Petry2013-10-071-1/+1
* | | | | Prevent scroll up when click on links in sharing dropdownVincent Petry2013-10-071-0/+2
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-0659-82/+180
* | | | Merge pull request #5154 from owncloud/fix-appimagesMorris Jobke2013-10-064-4/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Optimize images with optipngkondou2013-10-063-0/+0
| * | | fix mobile and desktop app images looking differentJan-Christoph Borchardt2013-10-054-4/+3
* | | | Merge pull request #4982 from syncloud/masterOwen Winkler2013-10-052-4/+24
|\ \ \ \ | |/ / / |/| | |
| * | | Moving Advanced button out of datadirField fieldsetvsapronov2013-10-041-1/+6
| * | | Fixed review issuesvsapronov2013-09-292-14/+14
| * | | autoconfig.php could have only some of parameters; installation.php generates...vsapronov2013-09-252-3/+18
* | | | Merge pull request #5131 from owncloud/fix-5130VicDeo2013-10-052-2/+2
|\ \ \ \
| * | | | Allow "Finishing..." button on setup page to be translated.ringmaster2013-10-042-2/+2