summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11981 from owncloud/bower-jcropThomas Müller2014-11-068-2/+1893
|\ | | | | bower jcrop
| * bower jcropMorris Jobke2014-11-068-2/+1893
|/
* Merge pull request #11980 from owncloud/bower-select2Morris Jobke2014-11-0663-1301/+16
|\ | | | | bower select2
| * manage select2 via bowerMorris Jobke2014-11-0663-1301/+16
|/
* Merge pull request #11982 from owncloud/bower-underscoreVincent Petry2014-11-067-8/+35
|\ | | | | bower underscore
| * bower underscoreMorris Jobke2014-11-057-8/+35
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-06100-308/+182
| |
* | Merge pull request #11983 from owncloud/drop-chosenMorris Jobke2014-11-062-2/+0
|\ \ | |/ |/| drop unused library chosen
| * drop unused library chosenMorris Jobke2014-11-052-2/+0
|/
* Merge pull request #11970 from owncloud/bower-handlebarsThomas Müller2014-11-054-1/+6
|\ | | | | bower handlebars
| * bower handlebarsMorris Jobke2014-11-054-1/+6
|/
* Merge pull request #11936 from owncloud/bower-jqueryLukas Reschke2014-11-0514-184/+192
|\ | | | | Bower jquery
| * ignore core/vendor in scrutinizerMorris Jobke2014-11-051-4/+1
| |
| * migrate jQuery to bowerMorris Jobke2014-11-0413-164/+175
| |
| * fix whitespaceMorris Jobke2014-11-041-16/+16
| |
* | Merge pull request #11968 from owncloud/drop-jquery-placeholderLukas Reschke2014-11-053-218/+0
|\ \ | | | | | | drop unused jquery.placeholder
| * | drop unused jquery.placeholderMorris Jobke2014-11-053-218/+0
| | |
* | | Merge pull request #11355 from owncloud/unboldThomas Müller2014-11-053-7/+5
|\ \ \ | | | | | | | | Unbold
| * | | explicitly unbold text by default, otherwise might be boldJan-Christoph Borchardt2014-11-051-0/+2
| | | |
| * | | unbold labels and foldersJan-Christoph Borchardt2014-11-052-7/+3
|/ / /
* | | Merge pull request #11965 from owncloud/fix-jsonresponseThomas Müller2014-11-052-2/+2
|\ \ \ | | | | | | | | fix typo in content type for JSONResponse
| * | | fix typo in content typeBernhard Posselt2014-11-052-2/+2
| | | |
* | | | Merge pull request #11928 from owncloud/support-HTML-in-logoThomas Müller2014-11-053-1/+21
|\ \ \ \ | | | | | | | | | | Support HTML in logo
| * | | | Support HTML in logo claimLukas Reschke2014-11-033-1/+21
| | | | |
* | | | | Merge pull request #11962 from owncloud/fix-server-sharing-stringsThomas Müller2014-11-051-3/+11
|\ \ \ \ \ | |_|_|/ / |/| | | | adjust strings - fixed #11930
| * | | | adjust strings - fixed #11930Thomas Müller2014-11-051-3/+11
| | |/ / | |/| |
* | | | Merge pull request #11966 from owncloud/drop-jquery-inviewMorris Jobke2014-11-055-192/+0
|\ \ \ \ | | | | | | | | | | drop jquery.inview as it is unused
| * | | | drop jquery.inview as it is unusedMorris Jobke2014-11-055-192/+0
|/ / / /
* | | | Merge pull request #11853 from owncloud/close-session-for-trashbinVincent Petry2014-11-055-0/+6
|\ \ \ \ | | | | | | | | | | Close session for files_trashbin
| * | | | Close session for files_trashbinLukas Reschke2014-10-295-0/+6
| | | | | | | | | | | | | | | | | | | | When restoring huge folders the interface will be unresponsive otherwise
* | | | | Merge pull request #11953 from owncloud/drop-listview-jsThomas Müller2014-11-051-71/+0
|\ \ \ \ \ | |_|/ / / |/| | | | drop listview.js
| * | | | drop listview.jsMorris Jobke2014-11-041-71/+0
| | | | | | | | | | | | | | | | | | | | * isn't used in core and isn't mentioned in documentation
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-0542-92/+220
| | | | |
* | | | | Merge pull request #11949 from owncloud/s2s-fixcertcheckwhennocertfileVincent Petry2014-11-041-1/+8
|\ \ \ \ \ | |/ / / / |/| | | | Check for cert bundle existence before using it
| * | | | Store curl error message directlyVincent Petry2014-11-041-5/+2
| | | | |
| * | | | Check for cert bundle existence before using itVincent Petry2014-11-041-1/+11
|/ / / /
* | | | Merge pull request #11940 from owncloud/fix-underline-conventionThomas Müller2014-11-041-2/+2
|\ \ \ \ | | | | | | | | | | fix shortcuts - underline instead of camelCase
| * | | | fix shortcuts - underline instead of camelCaseMorris Jobke2014-11-041-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #11938 from owncloud/jshintrc-laxbreakThomas Müller2014-11-041-0/+1
|\ \ \ \ | | | | | | | | | | enable laxbreak option in jshintrc to comply with our coding guide lines
| * | | | enable laxbreak option in jshintrc to comply with our coding guide linesArthur Schiwon2014-11-041-0/+1
| |/ / /
* | | | Merge pull request #11934 from owncloud/trash-restorefixonlyrescantrashfolderVincent Petry2014-11-041-1/+1
|\ \ \ \ | | | | | | | | | | Only rescan trash folder when checking deleted versions
| * | | | Only rescan trash folder when checking deleted versionsVincent Petry2014-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This fix prevents the file scanner to rescan the WHOLE storage and reset the etags by mistake.
* | | | | Merge pull request #11362 from mark0n/rm_ldap_conf_cliblizzz2014-11-043-3/+45
|\ \ \ \ \ | |_|/ / / |/| | | | Add a CLI command that deletes an LDAP config
| * | | | Add a CLI command that deletes an LDAP configMartin Konrad2014-09-303-3/+45
| | | | | | | | | | | | | | | | | | | | | | | | | With this change LDAP configurations can be managed completely from the command line.
* | | | | Merge pull request #11916 from owncloud/introduce-bowerMorris Jobke2014-11-0410-71/+262
|\ \ \ \ \ | | | | | | | | | | | | Introduce bower dependency managment for frontend libraries
| * | | | | use https ... everywhere :)Morris Jobke2014-11-041-1/+1
| | | | | |
| * | | | | replace moment.js with bower versionMorris Jobke2014-11-037-55/+168
| | | | | | | | | | | | | | | | | | | | | | | | * fix JS unit tests
| * | | | | ability to add bower resourcesMorris Jobke2014-11-034-16/+94
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | * add addVendorScript & addVendorStyle * refactoring of addScript and addStyle * add shortcuts vendorScript and vendorStyle
* | | | | Merge pull request #11931 from owncloud/fix-js-unit-testsMorris Jobke2014-11-041-7/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | JS unit tests fix - use toBeUndefined() instead of toEqual(null)
| * | | | JS unit tests fix - use toBeUndefined() instead of toEqual(null)Morris Jobke2014-11-041-7/+7
|/ / / /
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 16:40:24 +0000