summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11611 from owncloud/fix-svg-masterMorris Jobke2014-10-172-3/+13
|\
| * Remove insane commentLukas Reschke2014-10-161-1/+0
| * Fix SVG iconsLukas Reschke2014-10-162-3/+14
* | Merge pull request #11629 from owncloud/add-notice-to-php-docMorris Jobke2014-10-171-1/+1
|\ \
| * | Add PHPDoc about sanitization of "insertIfNotExist"Lukas Reschke2014-10-171-1/+1
* | | Merge pull request #11594 from owncloud/sharing_toggle_passwordMorris Jobke2014-10-171-0/+1
|\ \ \ | |/ / |/| |
| * | set password field placeholder back if passward was disabledBjoern Schiessle2014-10-151-0/+1
* | | Merge pull request #11627 from owncloud/fix-sample.php-syntaxThomas Müller2014-10-171-3/+5
|\ \ \
| * | | fix the RST syntax of config.sample.phpMorris Jobke2014-10-171-3/+5
* | | | Merge pull request #11552 from owncloud/fix_files_external_flickeringJörn Friedrich Dreyer2014-10-171-76/+80
|\ \ \ \
| * | | | cleanup variable names and duplicate jQuery selectorsJörn Friedrich Dreyer2014-10-131-76/+80
| * | | | fix flickering usersJörn Friedrich Dreyer2014-10-131-1/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-1794-69/+329
| |/ / / |/| | |
* | | | read config.sample.php options and whitespace fixesMorris Jobke2014-10-171-4/+6
* | | | Merge pull request #11626 from owncloud/add-l10nLukas Reschke2014-10-161-1/+1
|\ \ \ \
| * | | | Use l10n on this string as wellLukas Reschke2014-10-161-1/+1
* | | | | Merge pull request #11625 from owncloud/fix-setup-due-to-some-race-conditionVincent Petry2014-10-161-6/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add a try catch blockLukas Reschke2014-10-161-6/+10
|/ / / /
* | | | Merge pull request #11617 from owncloud/fix-unitThomas Müller2014-10-161-3/+3
|\ \ \ \
| * | | | Fix unit testLukas Reschke2014-10-161-3/+3
* | | | | Merge pull request #11591 from owncloud/addAppVersionToCSSandJSLukas Reschke2014-10-161-9/+12
|\ \ \ \ \
| * | | | | include the apps' versions hash to invalidate the cached assetsThomas Müller2014-10-161-0/+2
| * | | | | Add app version to JS and CSSLukas Reschke2014-10-151-9/+10
| | |_|/ / | |/| | |
* | | | | Merge pull request #11521 from owncloud/configsamplephpLukas Reschke2014-10-161-11/+28
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | commented out instanceid and passwordsaltCarla Schroder2014-10-141-3/+5
| * | | | some small tweaksCarla Schroder2014-10-141-9/+18
| * | | | small corrections to config.sample.phpCarla Schroder2014-10-101-6/+12
* | | | | Merge pull request #11615 from owncloud/fix-translation-source-stringClark Tomlinson2014-10-161-1/+1
|\ \ \ \ \
| * | | | | fixing typo in English source stringThomas Müller2014-10-161-1/+1
* | | | | | Merge pull request #11383 from ockham/share-tags2Lukas Reschke2014-10-1610-139/+555
|\ \ \ \ \ \
| * | | | | | PHPDoc fixes as suggested by @MorrisJobke.Bernhard Reiter2014-10-144-5/+9
| * | | | | | Add getTag() function for accessing of a single tag.Bernhard Reiter2014-10-142-6/+41
| * | | | | | Make loading of tags from DB more explicit.Bernhard Reiter2014-10-141-9/+3
| * | | | | | In Tags::rename($from, $to), check if there already is a tag named $to.Bernhard Reiter2014-10-142-3/+8
| * | | | | | Add option to include tags for shared items.Bernhard Reiter2014-10-147-23/+214
| * | | | | | Remove two obsolete try...catch blocks.Bernhard Reiter2014-10-141-13/+5
| * | | | | | Implement Tag and TagMapper classes.Bernhard Reiter2014-10-146-99/+262
| * | | | | | Remove redundant null initializations.Bernhard Reiter2014-10-142-4/+4
| * | | | | | Test addMultiple() with $sync=true.Bernhard Reiter2014-10-142-1/+31
| * | | | | | Test Tags::getFavorites().Bernhard Reiter2014-10-141-0/+2
| * | | | | | Fix a comment.Bernhard Reiter2014-10-141-2/+2
* | | | | | | Merge pull request #11478 from owncloud/fix-11448blizzz2014-10-1612-206/+551
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | left-align checkbox on server tabArthur Schiwon2014-10-161-4/+3
| * | | | | | rephrase xp'ed user mode labelArthur Schiwon2014-10-151-1/+1
| * | | | | | remove debug outputArthur Schiwon2014-10-151-1/+0
| * | | | | | instead of dis/enabling tabs on save, cancel tab change. avoids noisy uiArthur Schiwon2014-10-151-5/+4
| * | | | | | show busy cursor and lock tabs on saveArthur Schiwon2014-10-152-9/+34
| * | | | | | show Spinner when stuff is being savedArthur Schiwon2014-10-143-1/+17
| * | | | | | show a spinner next to test filter button when the test is runningArthur Schiwon2014-10-102-10/+28
| * | | | | | always abort running ajax request when the method is fired up againArthur Schiwon2014-10-101-12/+28