summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* skip certain tests for shipped appsGeorg Ehrke2014-06-131-6/+10
* don't show update button when appstore is disabled or no writable dir existsGeorg Ehrke2014-06-101-0/+15
* fix php doc blockGeorg Ehrke2014-06-101-0/+2
* always return a bool in OC_App::updateAppGeorg Ehrke2014-06-101-1/+1
* fix php doc blockGeorg Ehrke2014-06-101-3/+1
* remove unnecessary @returnGeorg Ehrke2014-06-101-1/+0
* some additional type checksGeorg Ehrke2014-06-062-3/+3
* add additional type checkGeorg Ehrke2014-06-061-1/+1
* Merge branch 'master' into update_shipped_apps_from_appstoreGeorg Ehrke2014-06-05117-1213/+1518
|\
| * Merge pull request #8889 from owncloud/mtime-reuseThomas Müller2014-06-051-0/+1
| |\
| | * Don't update the mtime if the storage mtime hasn't changedRobin Appelman2014-06-051-0/+1
| * | Merge pull request #8866 from owncloud/flock-quotafixVincent Petry2014-06-051-1/+1
| |\ \
| | * | Fixed quota wrapper to return the value from flock()Vincent Petry2014-06-041-1/+1
| * | | Merge pull request #7878 from owncloud/quota-extstorageswitchicewind19912014-06-052-2/+53
| |\ \ \
| | * | | Added experimental switch to count external storage data in quotaVincent Petry2014-06-042-2/+53
| | | |/ | | |/|
| * | | Merge pull request #8884 from owncloud/move-flock-to-appJörn Friedrich Dreyer2014-06-054-564/+0
| |\ \ \
| | * | | remove file locking - code will continue to live in it's own appThomas Müller2014-06-044-564/+0
| * | | | Merge pull request #8620 from owncloud/design-navigation-twoThomas Müller2014-06-051-0/+1
| |\ \ \ \
| | * | | | hide navigation by default, not only on small screens, first stepJan-Christoph Borchardt2014-06-041-0/+1
| | | |/ / | | |/| |
| * | | | Merge pull request #8878 from owncloud/update-checkmigrationforappsVincent Petry2014-06-055-37/+119
| |\ \ \ \
| | * | | | Do not load apps when upgrade is neededVincent Petry2014-06-041-1/+1
| | * | | | Removed simulate db update flag and split into separate methodsVincent Petry2014-06-043-23/+47
| | * | | | Simulate apps database schema update on upgradeVincent Petry2014-06-044-37/+95
| | | |_|/ | | |/| |
| * | | | Merge pull request #8852 from owncloud/kill-permissions-masterThomas Müller2014-06-0510-346/+15
| |\ \ \ \
| | * | | | - drop permissions table and related codeThomas Müller2014-06-0510-346/+15
| | |/ / /
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-053-8/+9
| * | | | Merge pull request #8724 from owncloud/update-sabre-2.0Thomas Müller2014-06-0421-176/+156
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | use the right interface \Sabre\DAVACL\PrincipalBackend\BackendInterfaceThomas Müller2014-06-042-10/+1
| | * | | Upgrade SabreDAV to 1.8.10Thomas Müller2014-06-0421-176/+165
| | |/ /
| * | | Merge pull request #8471 from owncloud/versioning_no_longer_track_the_sizeThomas Müller2014-06-041-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | let file cache handle the versions sizeBjoern Schiessle2014-06-021-1/+1
| * | | Merge pull request #8822 from owncloud/cache-change-propagatorVincent Petry2014-06-043-47/+167
| |\ \ \ | | |_|/ | |/| |
| | * | Fix size calculation during recursive scanRobin Appelman2014-06-031-7/+3
| | * | Fix recursive scanningRobin Appelman2014-06-021-3/+5
| | * | propagate changes in the scannerRobin Appelman2014-06-022-1/+21
| | * | Split of cache writes in the scanner to their own methodsRobin Appelman2014-06-021-39/+43
| | * | Add a change propagator class to handle propagating etag and mtime changesRobin Appelman2014-06-021-0/+98
| * | | Merge pull request #8701 from owncloud/slide-up-toggleBernhard Posselt2014-06-041-0/+1
| |\ \ \
| | * | | rename to apps.jsBernhard Posselt2014-05-261-1/+1
| | * | | add a slideup mechanismBernhard Posselt2014-05-231-0/+1
| * | | | Merge pull request #8853 from owncloud/design-typefaceJan-Christoph Borchardt2014-06-041-0/+1
| |\ \ \ \
| | * | | | use Open Sans as typefaceJan-Christoph Borchardt2014-06-031-0/+1
| * | | | | Merge pull request #8662 from owncloud/f-lockThomas Müller2014-06-0411-14/+675
| |\ \ \ \ \
| | * | | | | Use ->instanceOfStorage() not instanceof for Storage instances.ringmaster2014-06-041-1/+1
| | * | | | | only lock if unlink is called for a fileBjoern Schiessle2014-06-041-1/+3
| | * | | | | name the storage wrapper to make sure that we don't apply the wrapper multipl...Bjoern Schiessle2014-06-043-6/+6
| | * | | | | Normalize lock exception messages.ringmaster2014-06-042-2/+2
| | * | | | | Restore the reference to this used exception class.ringmaster2014-06-041-0/+1
| | * | | | | Move Lock to private namespace, add interface. Update PHPDoc.ringmaster2014-06-043-255/+316
| | * | | | | Don't error out on console.ringmaster2014-06-041-2/+2