Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #11611 from owncloud/fix-svg-master | Morris Jobke | 2014-10-17 | 2 | -3/+13 |
|\ | |||||
| * | Remove insane comment | Lukas Reschke | 2014-10-16 | 1 | -1/+0 |
| * | Fix SVG icons | Lukas Reschke | 2014-10-16 | 2 | -3/+14 |
* | | Merge pull request #11629 from owncloud/add-notice-to-php-doc | Morris Jobke | 2014-10-17 | 1 | -1/+1 |
|\ \ | |||||
| * | | Add PHPDoc about sanitization of "insertIfNotExist" | Lukas Reschke | 2014-10-17 | 1 | -1/+1 |
* | | | Merge pull request #11594 from owncloud/sharing_toggle_password | Morris Jobke | 2014-10-17 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | set password field placeholder back if passward was disabled | Bjoern Schiessle | 2014-10-15 | 1 | -0/+1 |
* | | | Merge pull request #11627 from owncloud/fix-sample.php-syntax | Thomas Müller | 2014-10-17 | 1 | -3/+5 |
|\ \ \ | |||||
| * | | | fix the RST syntax of config.sample.php | Morris Jobke | 2014-10-17 | 1 | -3/+5 |
* | | | | Merge pull request #11552 from owncloud/fix_files_external_flickering | Jörn Friedrich Dreyer | 2014-10-17 | 1 | -76/+80 |
|\ \ \ \ | |||||
| * | | | | cleanup variable names and duplicate jQuery selectors | Jörn Friedrich Dreyer | 2014-10-13 | 1 | -76/+80 |
| * | | | | fix flickering users | Jörn Friedrich Dreyer | 2014-10-13 | 1 | -1/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-17 | 94 | -69/+329 |
| |/ / / |/| | | | |||||
* | | | | read config.sample.php options and whitespace fixes | Morris Jobke | 2014-10-17 | 1 | -4/+6 |
* | | | | Merge pull request #11626 from owncloud/add-l10n | Lukas Reschke | 2014-10-16 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Use l10n on this string as well | Lukas Reschke | 2014-10-16 | 1 | -1/+1 |
* | | | | | Merge pull request #11625 from owncloud/fix-setup-due-to-some-race-condition | Vincent Petry | 2014-10-16 | 1 | -6/+10 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add a try catch block | Lukas Reschke | 2014-10-16 | 1 | -6/+10 |
|/ / / / | |||||
* | | | | Merge pull request #11617 from owncloud/fix-unit | Thomas Müller | 2014-10-16 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Fix unit test | Lukas Reschke | 2014-10-16 | 1 | -3/+3 |
* | | | | | Merge pull request #11591 from owncloud/addAppVersionToCSSandJS | Lukas Reschke | 2014-10-16 | 1 | -9/+12 |
|\ \ \ \ \ | |||||
| * | | | | | include the apps' versions hash to invalidate the cached assets | Thomas Müller | 2014-10-16 | 1 | -0/+2 |
| * | | | | | Add app version to JS and CSS | Lukas Reschke | 2014-10-15 | 1 | -9/+10 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #11521 from owncloud/configsamplephp | Lukas Reschke | 2014-10-16 | 1 | -11/+28 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | commented out instanceid and passwordsalt | Carla Schroder | 2014-10-14 | 1 | -3/+5 |
| * | | | | some small tweaks | Carla Schroder | 2014-10-14 | 1 | -9/+18 |
| * | | | | small corrections to config.sample.php | Carla Schroder | 2014-10-10 | 1 | -6/+12 |
* | | | | | Merge pull request #11615 from owncloud/fix-translation-source-string | Clark Tomlinson | 2014-10-16 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fixing typo in English source string | Thomas Müller | 2014-10-16 | 1 | -1/+1 |
* | | | | | | Merge pull request #11383 from ockham/share-tags2 | Lukas Reschke | 2014-10-16 | 10 | -139/+555 |
|\ \ \ \ \ \ | |||||
| * | | | | | | PHPDoc fixes as suggested by @MorrisJobke. | Bernhard Reiter | 2014-10-14 | 4 | -5/+9 |
| * | | | | | | Add getTag() function for accessing of a single tag. | Bernhard Reiter | 2014-10-14 | 2 | -6/+41 |
| * | | | | | | Make loading of tags from DB more explicit. | Bernhard Reiter | 2014-10-14 | 1 | -9/+3 |
| * | | | | | | In Tags::rename($from, $to), check if there already is a tag named $to. | Bernhard Reiter | 2014-10-14 | 2 | -3/+8 |
| * | | | | | | Add option to include tags for shared items. | Bernhard Reiter | 2014-10-14 | 7 | -23/+214 |
| * | | | | | | Remove two obsolete try...catch blocks. | Bernhard Reiter | 2014-10-14 | 1 | -13/+5 |
| * | | | | | | Implement Tag and TagMapper classes. | Bernhard Reiter | 2014-10-14 | 6 | -99/+262 |
| * | | | | | | Remove redundant null initializations. | Bernhard Reiter | 2014-10-14 | 2 | -4/+4 |
| * | | | | | | Test addMultiple() with $sync=true. | Bernhard Reiter | 2014-10-14 | 2 | -1/+31 |
| * | | | | | | Test Tags::getFavorites(). | Bernhard Reiter | 2014-10-14 | 1 | -0/+2 |
| * | | | | | | Fix a comment. | Bernhard Reiter | 2014-10-14 | 1 | -2/+2 |
* | | | | | | | Merge pull request #11478 from owncloud/fix-11448 | blizzz | 2014-10-16 | 12 | -206/+551 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | left-align checkbox on server tab | Arthur Schiwon | 2014-10-16 | 1 | -4/+3 |
| * | | | | | | rephrase xp'ed user mode label | Arthur Schiwon | 2014-10-15 | 1 | -1/+1 |
| * | | | | | | remove debug output | Arthur Schiwon | 2014-10-15 | 1 | -1/+0 |
| * | | | | | | instead of dis/enabling tabs on save, cancel tab change. avoids noisy ui | Arthur Schiwon | 2014-10-15 | 1 | -5/+4 |
| * | | | | | | show busy cursor and lock tabs on save | Arthur Schiwon | 2014-10-15 | 2 | -9/+34 |
| * | | | | | | show Spinner when stuff is being saved | Arthur Schiwon | 2014-10-14 | 3 | -1/+17 |
| * | | | | | | show a spinner next to test filter button when the test is running | Arthur Schiwon | 2014-10-10 | 2 | -10/+28 |
| * | | | | | | always abort running ajax request when the method is fired up again | Arthur Schiwon | 2014-10-10 | 1 | -12/+28 |