summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-14256-262/+24
|
* Merge pull request #24617 from owncloud/autoloader_no_privateVincent Petry2016-05-132-36/+4
|\ | | | | our autoloader should not load classes in \OC
| * Fix unit testsRoeland Jago Douma2016-05-131-18/+4
| |
| * All \OC\ classes are handled by the composer autoloaderRoeland Jago Douma2016-05-131-17/+0
| |
| * OC_xx all live in the legacy folderRoeland Jago Douma2016-05-131-1/+0
| |
* | Merge pull request #22341 from ↵Vincent Petry2016-05-132-0/+19
|\ \ | | | | | | | | | | | | owncloud/pellaeon-pr-breadcrumb-filelist-overlap-drop Handle case when breadcrumb and filelist item overlap and both receive a drop
| * | Handle case when breadcrumb and filelist item overlapPellaeon Lin2016-03-172-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and both receive a drop. Build breadcrumb over and out callback in filelist.js and pass them as options to utilize local selectors of filelist Re-enable td elements after drop to bread crumb Fix# drop handler still being called after enable, it seems that waiting for a short time before re-enabling solves the problem * Add explanations for setTimeout re-enable td.filename drop handler
* | | Merge pull request #22214 from owncloud/ext-better-dropbox-gdriveVincent Petry2016-05-1315-29/+111
|\ \ \ | | | | | | | | Direct links to Google Drive/Dropbox configuration pages from external storage config
| * | | Move Dropbox/GDrive link to iconRobin McCorkell2016-05-033-8/+17
| | | |
| * | | Change colour of input fields instead of printing 'Access granted'Robin McCorkell2016-05-033-11/+16
| | | |
| * | | Add links to load GDrive/Dropbox configuration pagesRobin McCorkell2016-05-036-4/+58
| | | |
| * | | Allow multiple custom JS filesRobin McCorkell2016-05-038-18/+32
| | | |
* | | | Merge pull request #24600 from owncloud/http-client-lazy-configVincent Petry2016-05-131-6/+23
|\ \ \ \ | | | | | | | | | | only configure the http client once we start using it
| * | | | only configure the http client once we start using itRobin Appelman2016-05-121-6/+23
| | | | |
* | | | | Merge pull request #24614 from owncloud/token-validation-logVincent Petry2016-05-131-3/+1
|\ \ \ \ \ | | | | | | | | | | | | don't spam the log file with failed token validation entries
| * | | | | don't spam the log file with failed token validation entriesChristoph Wurst2016-05-131-3/+1
| | | | | |
* | | | | | Merge pull request #24594 from owncloud/authtoken-name-column-sizeVincent Petry2016-05-133-4/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Use CLOB for auth token names to allow long user agent strings
| * | | | | Use CLOB for auth token names to allow long user agent stringsChristoph Wurst2016-05-123-4/+6
| | | | | |
* | | | | | Merge pull request #24601 from owncloud/template_psr4Vincent Petry2016-05-139-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Template to PSR-4
| * | | | | | Move \OC\Template to PSR-4Roeland Jago Douma2016-05-136-0/+0
| | | | | | |
| * | | | | | Move functions.php to legacyRoeland Jago Douma2016-05-133-2/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | This file should really be properly namespaced etc!
* | | | | | Merge pull request #24605 from ↵Vincent Petry2016-05-134-9/+120
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | owncloud/luckydonald-Superduper-Progressbar-branch-thingie Luckydonald superduper progressbar branch thingie
| * | | | | Merge branch 'Superduper-Progressbar-branch-thingie' of ↵Vincent Petry2016-05-124-9/+120
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | https://github.com/luckydonald/core into luckydonald-Superduper-Progressbar-branch-thingie
| | * | | | | Optimized time formatting, optimized time smoothing.luckydonald2014-08-141-11/+8
| | | | | | |
| | * | | | | Changes for scrutinizer. Yay!luckydonald2014-08-131-15/+29
| | | | | | |
| | * | | | | fixed browser showing the tipsy tooltip as default tooltip twice.luckydonald2014-08-131-1/+1
| | | | | | |
| | * | | | | Fixed "Any minute now" staying because of undefined buffer. Also increased ↵luckydonald2014-08-131-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | buffer size to 20 to be less jittery.
| | * | | | | Updated String formatting. Label font-weight was already normal.luckydonald2014-08-132-11/+11
| | | | | | |
| | * | | | | Fixed Positioning, fixed formatting for both mobile and desktop.luckydonald2014-08-132-9/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tooltips still frustrate me- And the updated code with tabs nicely. yay.
| | * | | | | Added remaining time displaying, moved Information to tooltip, removed now ↵luckydonald2014-08-123-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | unneeded speed div
| | * | | | | ...in case the text gets to big, don't wrap to new line. Instead just cut it.luckydonald2014-08-111-0/+4
| | | | | | |
| | * | | | | Updated and optimized Mobile Layout as well.luckydonald2014-08-114-4/+19
| | | | | | |
| | * | | | | Fixed translations, indentation and renamed the .percents class to .speed class.luckydonald2014-08-103-10/+10
| | | | | | |
| | * | | | | Upload progress bar now displays informations about uploades size (12kB of ↵luckydonald2014-08-103-5/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 3MB) and the current speed.
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-13148-150/+234
|/ / / / / /
* | | / / / Show login error message correctly (#24599)Christoph Wurst2016-05-121-1/+0
| |_|/ / / |/| | | |
* | | | | Merge pull request #24563 from owncloud/redis-factoryMorris Jobke2016-05-123-29/+101
|\ \ \ \ \ | | | | | | | | | | | | factor out redis configuration into it's own factory
| * | | | | factor out redis configuration into it's own factoryRobin Appelman2016-05-033-29/+101
| | | | | |
* | | | | | Log user out correctly if max session lifetime is reached (#24552)Christoph Wurst2016-05-121-1/+1
| | | | | |
* | | | | | Move Files app to PSR-4 (#24569)Joas Schilling2016-05-1223-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move lib/ of Files app to PSR-4 * Move tests to PSR-4
* | | | | | Background jobs from info.xml (#24582)Joas Schilling2016-05-1219-209/+28
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move background job registration of Federation to info.xml * Move background registration of Files app to info.xml * Move background job registration of files_sharing to info.xml * Move background job registration of files_trashbin to info.xml * Move background job registration of files_versions to info.xml * Move background job registration from user_ldap to info.xml
* | | | | Move the testing app to PSR-4 (#24580)Joas Schilling2016-05-121-0/+0
| | | | |
* | | | | Move files_versions to PSR-4 (#24571)Joas Schilling2016-05-1213-2/+5
| | | | |
* | | | | Move files_trashbin to PSR-4 (#24570)Joas Schilling2016-05-1218-14/+16
| | | | |
* | | | | Move \OCP\Comments to PSR-4 (#24565)Roeland Douma2016-05-127-0/+0
| | | | |
* | | | | lib/private/ocs to PSR-4 (#24558)Roeland Douma2016-05-1212-24/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move OC_OCS_XX to legacy * Move \OC\OCS to PSR-4 * OC_OCS_xx to \OC\OCS\xx * Moved OC_OCS_xx to proper namespace * OC_OCS_xx is still there for legacy reasons as a wrapper * No calls to OC_OCS_xx in \OC\OCS\
* | | | | Do not automatically try to enable index.php-less URLs (#24539)Lukas Reschke2016-05-125-37/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current logic for mod_rewrite relies on the fact that people have properly configured ownCloud, basically it reads from the `overwrite.cli.ur l` entry and then derives the `RewriteBase` from it. This usually works. However, since the ownCloud packages seem to install themselves at `/owncloud` (because subfolders are cool or so…) _a lot_ of people have just created a new Virtual Host for it or have simply symlinked the path etc. This means that `overwrite.cli.url` is wrong, which fails hard if it is used as RewriteBase since Apache does not know where it should serve files from. In the end the ownCloud instance will not be accessible anymore and users will be frustrated. Also some shared hosters like 1&1 (because using shared hosters is so awesome… ;-)) have somewhat dubious Apache configurations or use versions of mod_rewrite from the mediveal age. (because updating is money or so…) Anyhow. This makes this explicitly an opt-in configuration flag. If `htaccess.RewriteBase` is set then it will configure index.php-less URLs, if admins set that after installation and don't want to wait until the next ownCloud version they can run `occ maintenance:update:htaccess`. For ownCloud 9.0 we also have to add a repair step to make sure that instances that already have a RewriteBase configured continue to use it by copying it into the config file. That way all existing URLs stay valid. That one is not in this PR since this is unneccessary in master. Effectively this reduces another risk of breakage when updating from ownCloud 8 to ownCloud 9. Fixes https://github.com/owncloud/core/issues/24525, https://github.com/owncloud/core/issues/24426 and probably some more.
* | | | | Move dav app to PSR-4 (#24527)Joas Schilling2016-05-1294-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move Application to correct namespace and PSR-4 it * Move dav app to PSR-4
* | | | | Move Encryption app to PSR-4 (#24524)Joas Schilling2016-05-1239-98/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move Encryption to PSR-4 * Move encryption tests to PSR-4 * Fix the tests
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-12140-458/+502
| | | | |