Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bower zxcvbn | Morris Jobke | 2014-11-06 | 7 | -3/+72 |
* | Merge pull request #11981 from owncloud/bower-jcrop | Thomas Müller | 2014-11-06 | 8 | -2/+1893 |
|\ | |||||
| * | bower jcrop | Morris Jobke | 2014-11-06 | 8 | -2/+1893 |
|/ | |||||
* | Merge pull request #11980 from owncloud/bower-select2 | Morris Jobke | 2014-11-06 | 63 | -1301/+16 |
|\ | |||||
| * | manage select2 via bower | Morris Jobke | 2014-11-06 | 63 | -1301/+16 |
|/ | |||||
* | Merge pull request #11982 from owncloud/bower-underscore | Vincent Petry | 2014-11-06 | 7 | -8/+35 |
|\ | |||||
| * | bower underscore | Morris Jobke | 2014-11-05 | 7 | -8/+35 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-06 | 100 | -308/+182 |
* | | Merge pull request #11983 from owncloud/drop-chosen | Morris Jobke | 2014-11-06 | 2 | -2/+0 |
|\ \ | |/ |/| | |||||
| * | drop unused library chosen | Morris Jobke | 2014-11-05 | 2 | -2/+0 |
|/ | |||||
* | Merge pull request #11970 from owncloud/bower-handlebars | Thomas Müller | 2014-11-05 | 4 | -1/+6 |
|\ | |||||
| * | bower handlebars | Morris Jobke | 2014-11-05 | 4 | -1/+6 |
|/ | |||||
* | Merge pull request #11936 from owncloud/bower-jquery | Lukas Reschke | 2014-11-05 | 14 | -184/+192 |
|\ | |||||
| * | ignore core/vendor in scrutinizer | Morris Jobke | 2014-11-05 | 1 | -4/+1 |
| * | migrate jQuery to bower | Morris Jobke | 2014-11-04 | 13 | -164/+175 |
| * | fix whitespace | Morris Jobke | 2014-11-04 | 1 | -16/+16 |
* | | Merge pull request #11968 from owncloud/drop-jquery-placeholder | Lukas Reschke | 2014-11-05 | 3 | -218/+0 |
|\ \ | |||||
| * | | drop unused jquery.placeholder | Morris Jobke | 2014-11-05 | 3 | -218/+0 |
* | | | Merge pull request #11355 from owncloud/unbold | Thomas Müller | 2014-11-05 | 3 | -7/+5 |
|\ \ \ | |||||
| * | | | explicitly unbold text by default, otherwise might be bold | Jan-Christoph Borchardt | 2014-11-05 | 1 | -0/+2 |
| * | | | unbold labels and folders | Jan-Christoph Borchardt | 2014-11-05 | 2 | -7/+3 |
|/ / / | |||||
* | | | Merge pull request #11965 from owncloud/fix-jsonresponse | Thomas Müller | 2014-11-05 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | fix typo in content type | Bernhard Posselt | 2014-11-05 | 2 | -2/+2 |
* | | | | Merge pull request #11928 from owncloud/support-HTML-in-logo | Thomas Müller | 2014-11-05 | 3 | -1/+21 |
|\ \ \ \ | |||||
| * | | | | Support HTML in logo claim | Lukas Reschke | 2014-11-03 | 3 | -1/+21 |
* | | | | | Merge pull request #11962 from owncloud/fix-server-sharing-strings | Thomas Müller | 2014-11-05 | 1 | -3/+11 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | adjust strings - fixed #11930 | Thomas Müller | 2014-11-05 | 1 | -3/+11 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #11966 from owncloud/drop-jquery-inview | Morris Jobke | 2014-11-05 | 5 | -192/+0 |
|\ \ \ \ | |||||
| * | | | | drop jquery.inview as it is unused | Morris Jobke | 2014-11-05 | 5 | -192/+0 |
|/ / / / | |||||
* | | | | Merge pull request #11853 from owncloud/close-session-for-trashbin | Vincent Petry | 2014-11-05 | 5 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | Close session for files_trashbin | Lukas Reschke | 2014-10-29 | 5 | -0/+6 |
* | | | | | Merge pull request #11953 from owncloud/drop-listview-js | Thomas Müller | 2014-11-05 | 1 | -71/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | drop listview.js | Morris Jobke | 2014-11-04 | 1 | -71/+0 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-05 | 42 | -92/+220 |
* | | | | | Merge pull request #11949 from owncloud/s2s-fixcertcheckwhennocertfile | Vincent Petry | 2014-11-04 | 1 | -1/+8 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Store curl error message directly | Vincent Petry | 2014-11-04 | 1 | -5/+2 |
| * | | | | Check for cert bundle existence before using it | Vincent Petry | 2014-11-04 | 1 | -1/+11 |
|/ / / / | |||||
* | | | | Merge pull request #11940 from owncloud/fix-underline-convention | Thomas Müller | 2014-11-04 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | fix shortcuts - underline instead of camelCase | Morris Jobke | 2014-11-04 | 1 | -2/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #11938 from owncloud/jshintrc-laxbreak | Thomas Müller | 2014-11-04 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | enable laxbreak option in jshintrc to comply with our coding guide lines | Arthur Schiwon | 2014-11-04 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Merge pull request #11934 from owncloud/trash-restorefixonlyrescantrashfolder | Vincent Petry | 2014-11-04 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Only rescan trash folder when checking deleted versions | Vincent Petry | 2014-11-04 | 1 | -1/+1 |
* | | | | | Merge pull request #11362 from mark0n/rm_ldap_conf_cli | blizzz | 2014-11-04 | 3 | -3/+45 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Add a CLI command that deletes an LDAP config | Martin Konrad | 2014-09-30 | 3 | -3/+45 |
* | | | | | Merge pull request #11916 from owncloud/introduce-bower | Morris Jobke | 2014-11-04 | 10 | -71/+262 |
|\ \ \ \ \ | |||||
| * | | | | | use https ... everywhere :) | Morris Jobke | 2014-11-04 | 1 | -1/+1 |
| * | | | | | replace moment.js with bower version | Morris Jobke | 2014-11-03 | 7 | -55/+168 |
| * | | | | | ability to add bower resources | Morris Jobke | 2014-11-03 | 4 | -16/+94 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #11931 from owncloud/fix-js-unit-tests | Morris Jobke | 2014-11-04 | 1 | -7/+7 |
|\ \ \ \ \ | |_|_|/ / |/| | | | |