Commit Graph

21226 Commits

Author SHA1 Message Date
Lukas Reschke 0e3e1e3563 Add getLogger() to IServerContainer
Makes my IDE complaining less ;-)
2014-11-06 13:36:36 +01:00
Thomas Müller f2d17ea771 Merge pull request #11984 from owncloud/bower-md5
bower md5
2014-11-06 13:28:30 +01:00
Jan-Christoph Borchardt 45c6ec8582 introduce h1, use either ownCloud name or current app name 2014-11-06 13:26:38 +01:00
Morris Jobke 73569b29bc md5 now handled via bower 2014-11-06 13:22:16 +01:00
Morris Jobke ae72f0c158 Merge pull request #11985 from owncloud/bower-snap
bower snapjs
2014-11-06 12:44:36 +01:00
Jan-Christoph Borchardt 764f51c976 add missing alt attribute to spinner 2014-11-06 12:09:48 +01:00
Morris Jobke e49b9022a1 bower snapjs 2014-11-06 12:03:57 +01:00
Thomas Müller fd829cb0b5 Merge pull request #11989 from owncloud/bower-zxcvbn
bower zxcvbn
2014-11-06 11:57:33 +01:00
Morris Jobke f816f3df03 bower zxcvbn 2014-11-06 11:55:57 +01:00
Thomas Müller 06b67f7e43 Merge pull request #11981 from owncloud/bower-jcrop
bower jcrop
2014-11-06 11:49:39 +01:00
Bjoern Schiessle 8104a4e24e check if the provided password is really the current log-in password 2014-11-06 11:12:20 +01:00
Morris Jobke 49fbd766c2 bower jcrop 2014-11-06 09:32:34 +01:00
Morris Jobke 3329492766 Merge pull request #11980 from owncloud/bower-select2
bower select2
2014-11-06 09:27:58 +01:00
Morris Jobke 226d43a1cf manage select2 via bower 2014-11-06 09:27:12 +01:00
Vincent Petry afa14d571c Merge pull request #11982 from owncloud/bower-underscore
bower underscore
2014-11-06 08:42:29 +01:00
Jenkins for ownCloud fa4018d36c [tx-robot] updated from transifex 2014-11-06 01:55:04 -05:00
Morris Jobke 86d3476761 Merge pull request #11983 from owncloud/drop-chosen
drop unused library chosen
2014-11-06 00:47:25 +01:00
Morris Jobke 957dee5af1 bower underscore 2014-11-05 23:23:03 +01:00
Morris Jobke 0af5a8db74 drop unused library chosen 2014-11-05 22:41:33 +01:00
Thomas Müller bf0ad7f219 Merge pull request #11970 from owncloud/bower-handlebars
bower handlebars
2014-11-05 16:50:58 +01:00
Morris Jobke 02c7fb8445 bower handlebars 2014-11-05 16:47:46 +01:00
Lukas Reschke 4659b0e6a0 Merge pull request #11936 from owncloud/bower-jquery
Bower jquery
2014-11-05 16:43:24 +01:00
Robin Appelman 1eefc21329 Remove confusingly names \OC\User\Manager::delete and fix the automatic cache cleanup instead 2014-11-05 15:45:58 +01:00
Lukas Reschke 9dc769c37a Merge pull request #11968 from owncloud/drop-jquery-placeholder
drop unused jquery.placeholder
2014-11-05 15:04:23 +01:00
Thomas Müller a0e9324e00 Merge pull request #11355 from owncloud/unbold
Unbold
2014-11-05 14:18:16 +01:00
Jan-Christoph Borchardt a857559979 explicitly unbold text by default, otherwise might be bold 2014-11-05 14:14:16 +01:00
Jan-Christoph Borchardt e869db47b0 unbold labels and folders 2014-11-05 14:13:09 +01:00
Thomas Müller e624e9064c Merge pull request #11965 from owncloud/fix-jsonresponse
fix typo in content type for JSONResponse
2014-11-05 14:03:12 +01:00
Thomas Müller 06267fec8f Merge pull request #11928 from owncloud/support-HTML-in-logo
Support HTML in logo
2014-11-05 13:54:29 +01:00
Thomas Müller 7f41048a33 Merge pull request #11962 from owncloud/fix-server-sharing-strings
adjust strings - fixed #11930
2014-11-05 13:43:23 +01:00
Morris Jobke 4fa3a5034b drop unused jquery.placeholder 2014-11-05 13:41:11 +01:00
Morris Jobke f0d6a47a67 Merge pull request #11966 from owncloud/drop-jquery-inview
drop jquery.inview as it is unused
2014-11-05 13:11:48 +01:00
Bjoern Schiessle c2a45c1238 throw exception if private key is missing 2014-11-05 13:05:46 +01:00
Morris Jobke a857bf1d50 drop jquery.inview as it is unused 2014-11-05 12:57:18 +01:00
Vincent Petry 97cbec8b8d Merge pull request #11853 from owncloud/close-session-for-trashbin
Close session for files_trashbin
2014-11-05 12:44:10 +01:00
Bernhard Posselt 91a23bfa9c fix typo in content type 2014-11-05 12:04:56 +01:00
Thomas Müller 810dd956b4 Merge pull request #11953 from owncloud/drop-listview-js
drop listview.js
2014-11-05 11:31:53 +01:00
Morris Jobke 2c941729ee ignore core/vendor in scrutinizer 2014-11-05 11:13:00 +01:00
Thomas Müller 8116d903dd adjust strings - fixed #11930 2014-11-05 11:08:17 +01:00
Jenkins for ownCloud c8f55e7f87 [tx-robot] updated from transifex 2014-11-05 01:54:36 -05:00
Vincent Petry 140faf2c30 Merge pull request #11949 from owncloud/s2s-fixcertcheckwhennocertfile
Check for cert bundle existence before using it
2014-11-04 20:05:49 +01:00
Vincent Petry ee6d8c9d58 Store curl error message directly 2014-11-04 17:37:15 +01:00
Morris Jobke 5a6cbea261 drop listview.js
* isn't used in core and isn't mentioned in documentation
2014-11-04 17:28:35 +01:00
Bjoern Schiessle 0580c232d7 still try to encrypt files, even if the session is not initialized. The stream wrapper will throw an error which is better than silently continue. 2014-11-04 17:16:36 +01:00
Vincent Petry 768f3979e0 Check for cert bundle existence before using it 2014-11-04 16:44:42 +01:00
Thomas Müller 9323ba53b1 Merge pull request #11940 from owncloud/fix-underline-convention
fix shortcuts - underline instead of camelCase
2014-11-04 14:51:19 +01:00
Thomas Müller 9e045d6c0f Merge pull request #11938 from owncloud/jshintrc-laxbreak
enable laxbreak option in jshintrc to comply with our coding guide lines
2014-11-04 14:49:58 +01:00
Morris Jobke 74d375d8ea migrate jQuery to bower 2014-11-04 14:28:29 +01:00
Vincent Petry 79a7297880 Merge pull request #11934 from owncloud/trash-restorefixonlyrescantrashfolder
Only rescan trash folder when checking deleted versions
2014-11-04 14:16:58 +01:00
Morris Jobke 7f4e447a5f fix shortcuts - underline instead of camelCase 2014-11-04 13:57:38 +01:00