Commit Graph

17833 Commits (95741f3936501e3ad6aeb26f93eeb28f9decc273)
 

Author SHA1 Message Date
Thomas Müller 95741f3936 Merge pull request #8435 from owncloud/fix-8322-master 11 years ago
Thomas Müller 04e6c12fe2 Merge pull request #8557 from owncloud/custom_session_handling 11 years ago
Andreas Fischer 6c4b650524 Merge pull request #8585 from owncloud/phpdoc-improvements-apps 11 years ago
Morris Jobke 1cff73b615 Merge branch 'libasys-patch-1' 11 years ago
libasys 9e1d47bd90 Add generic 'share by link' URL generator in share.js 11 years ago
Morris Jobke 48977c8579 Merge pull request #7286 from owncloud/issue/4823 11 years ago
Jenkins for ownCloud d52252998a [tx-robot] updated from transifex 11 years ago
Morris Jobke f633fb537f fix wrong conflict resolution 11 years ago
Joas Schilling d273b55e98 Correctly set expiration dates when adding additional shares 11 years ago
Joas Schilling ab7ae004f7 Automatically copy the share expiration date when new shares are created 11 years ago
Morris Jobke 804020bb6d Merge pull request #7363 from owncloud/optimize-startup-queries 11 years ago
Morris Jobke db9cfaa56d Merge pull request #8592 from owncloud/login-timezone 11 years ago
Jenkins for ownCloud a7509e5fd9 [tx-robot] updated from transifex 11 years ago
Vincent Petry b3d12412ce Merge pull request #8609 from owncloud/ie8-svgfallbackforicons 11 years ago
Jenkins for ownCloud a1b356c7b6 [tx-robot] updated from transifex 11 years ago
Robin McCorkell e7aebc5c32 Fix whitespace issues 11 years ago
Andreas Fischer 5b1ffd7611 Reduce double-space with single-space. 11 years ago
Andreas Fischer e04d956cac Remove spaces around | operator in doc block. 11 years ago
Robin McCorkell 6930ae22e4 Fix more missing or broken PHPDoc 11 years ago
Robin McCorkell a17f9111a0 PHPDoc fixes for user_ldap 11 years ago
Robin McCorkell c4f1de63a8 Fix PHPDoc in /apps 11 years ago
Björn Schießle 42b99b6d0f Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links 11 years ago
Björn Schießle b52cb8f557 Merge pull request #8604 from owncloud/sharing_encforce_password 11 years ago
Bjoern Schiessle 7a48f24459 use default expire date only for link shares 11 years ago
Bjoern Schiessle b6e14af861 allow admin to enforce passwords for public link shares 11 years ago
Vincent Petry d5f60a8eb0 Merge pull request #8610 from owncloud/ie8-filesdndbug 11 years ago
Vincent Petry 1fb0d5412c Merge pull request #6260 from owncloud/jan-navigation-filesidebar 11 years ago
Vincent Petry f3d421d24b Fix drag and drop in IE8 11 years ago
Vincent Petry 9d3fcfcac8 SVG fallback for settings icon 11 years ago
Vincent Petry d4801e078e Fallback for triangle icons 11 years ago
Jenkins for ownCloud 43d6650d19 [tx-robot] updated from transifex 11 years ago
Vincent Petry 6fd084243b Fixed many issues, clean up 11 years ago
Vincent Petry 9d38e3602b Namespacing for FileList, FileActions and trashbin app 11 years ago
Vincent Petry fb10bf4048 Files app navigation can now switch 11 years ago
Vincent Petry 88ebb15f1d Added navigation manager in files app for the sidebar 11 years ago
Vincent Petry 9ccb3279dd Added app navigation for files app 11 years ago
Vincent Petry 04f73275ba Now settings CSS class with appid in content DIV 11 years ago
Vincent Petry b2e8aa70cd Merge pull request #8603 from owncloud/trashbinfix 11 years ago
Vincent Petry 818c77684d Fixed trashbin to use correct class 11 years ago
Jan-Christoph Borchardt 60efa0f1c8 Merge pull request #8140 from owncloud/login-valign 11 years ago
Robin McCorkell a0f309bbd8 Merge pull request #8589 from fibsifan/files_external_sftp_port 11 years ago
fibsifan 06c084cc3c changing label "URL" to "Host" 11 years ago
Thomas Müller 7abe3b1989 Merge pull request #8587 from Raydiation/master 11 years ago
Vincent Petry 3daaf6ba4f Merge pull request #8597 from owncloud/l10n-fix-typo 11 years ago
Jenkins for ownCloud d9d684197a [tx-robot] updated from transifex 11 years ago
Volkan Gezer 5291f47c66 fix typo encryption 11 years ago
Thomas Müller 48ee72732e Merge pull request #8567 from owncloud/test-ocshareunittests 11 years ago
Björn Schießle dab3cb65cf Merge pull request #8522 from owncloud/sharing_ux_improvements 11 years ago
Vincent Petry 1de068b5cb Disable login button until the timezone is set 11 years ago
icewind1991 4c19acf09b Merge pull request #8403 from owncloud/fix-oc-dialog 11 years ago