summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | | Fix updateApp() and add extra check to updateApps()Michael Gapczynski2012-01-011-7/+9
| | * | | | | | | | | | | merge master into filesystemRobin Appelman2012-01-08168-659/+66574
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge branch 'database'Robin Appelman2012-01-086-50/+116
| | | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | also use fscache when getting used space for webdavRobin Appelman2011-12-141-3/+3
| | * | | | | | | | | | | | save quota in human readable format (42 MB), should prevent some of the overf...Robin Appelman2011-12-143-3/+8
| | * | | | | | | | | | | | use fscache for getting used spaceRobin Appelman2011-12-141-1/+2
| | * | | | | | | | | | | | Merge branch 'database' into filesystemRobin Appelman2011-12-112-0/+31
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | update apps when their version number increasesRobin Appelman2011-12-112-0/+31
| | | * | | | | | | | | | | Merge branch 'master' into databaseRobin Appelman2011-12-1185-1627/+9018
| | | |\ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into filesystemRobin Appelman2011-12-11120-2190/+9682
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | make filesize parsing case insensitiveRobin Appelman2011-12-111-12/+13
| | * | | | | | | | | | | | | | also update the data attribute holding the quotaRobin Appelman2011-12-111-1/+1
| | * | | | | | | | | | | | | | after editing a user quota, set the value of the quota field to how the serve...Robin Appelman2011-12-112-3/+6
| | * | | | | | | | | | | | | | increase version to trigger database upgradeRobin Appelman2011-11-261-1/+1
| | * | | | | | | | | | | | | | Merge branch 'database' into filesystemRobin Appelman2011-11-2619-95/+190
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | fix errors during database migrationRobin Appelman2011-11-151-7/+8
| | | * | | | | | | | | | | | | set the installed version after updating the databaseRobin Appelman2011-11-151-0/+1
| | | * | | | | | | | | | | | | fixes in the sqlite manager driverRobin Appelman2011-11-151-23/+49
| | | * | | | | | | | | | | | | automatically upgrade the main database on version number increase (doesnt wo...Robin Appelman2011-11-132-7/+12
| | | * | | | | | | | | | | | | small fix in sqlite3 driverRobin Appelman2011-11-131-3/+0
| | | * | | | | | | | | | | | | minor changes to mysql setupRobin Appelman2011-11-131-4/+4
| | | * | | | | | | | | | | | | some fixes in the sqlite3 driverRobin Appelman2011-11-122-7/+12
| | * | | | | | | | | | | | | | keep encrypted and versioned flag in fscacheRobin Appelman2011-11-122-15/+51
| | * | | | | | | | | | | | | | use cache for searching filesRobin Appelman2011-11-102-12/+10
| | * | | | | | | | | | | | | | use force parameterRobin Appelman2011-11-101-1/+1
| | * | | | | | | | | | | | | | always load the filecacheRobin Appelman2011-11-101-0/+2
| | * | | | | | | | | | | | | | tell the user when the files are being scannedRobin Appelman2011-11-108-29/+51
| | * | | | | | | | | | | | | | provide caching for file metadataRobin Appelman2011-11-099-129/+446
| | * | | | | | | | | | | | | | remove OC_Filesystem::fromUploadedFileRobin Appelman2011-11-086-54/+6
| | * | | | | | | | | | | | | | remove OC_Filesystem::fileatimeRobin Appelman2011-11-085-30/+1
| | * | | | | | | | | | | | | | remove the need to register storage providers, pass the classname during moun...Robin Appelman2011-11-085-46/+9
| | * | | | | | | | | | | | | | remove outdated remote storage prototypeRobin Appelman2011-11-081-350/+0
* | | | | | | | | | | | | | | | Keep js data structure in sync on changes.Thomas Tanghus2012-02-096-17/+82
* | | | | | | | | | | | | | | | More @£#¤ conflictsThomas Tanghus2012-02-082-19/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix merge conflictsThomas Tanghus2012-02-081-15/+0
| * | | | | | | | | | | | | | | | Added files for new contact editor/viewer.Thomas Tanghus2012-02-082-63/+16
| * | | | | | | | | | | | | | | | Fixed broken "Add new" contact.Thomas Tanghus2012-02-087-46/+85
| * | | | | | | | | | | | | | | | Hide container for emails/phones/adresses if there are none.Thomas Tanghus2012-02-082-1/+5
| * | | | | | | | | | | | | | | | Updated copyrights.Thomas Tanghus2012-02-084-15/+9
| * | | | | | | | | | | | | | | | Added files for new contact editor/viewer.Thomas Tanghus2012-02-0832-0/+6293
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'tanghus_contacts' of gitorious.org:owncloud/owncloud into tangh...Thomas Tanghus2012-02-082-51/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fixed broken "Add new" contact.Thomas Tanghus2012-02-067-46/+85
| * | | | | | | | | | | | | | | | Hide container for emails/phones/adresses if there are none.Thomas Tanghus2012-02-062-1/+5
| * | | | | | | | | | | | | | | | Updated copyrights.Thomas Tanghus2012-02-064-15/+9
| * | | | | | | | | | | | | | | | Added files for new contact editor/viewer.Thomas Tanghus2012-02-0632-0/+6293
* | | | | | | | | | | | | | | | | Don't import cards that can't be parsed by Sabre, but log it instead.Thomas Tanghus2012-02-084-32/+55
* | | | | | | | | | | | | | | | | Some fixes for malformed VCards.Thomas Tanghus2012-02-083-75/+23
* | | | | | | | | | | | | | | | | Fixed broken "Add new" contact.Thomas Tanghus2012-02-087-46/+85
* | | | | | | | | | | | | | | | | Hide container for emails/phones/adresses if there are none.Thomas Tanghus2012-02-082-1/+5
* | | | | | | | | | | | | | | | | Updated copyrights.Thomas Tanghus2012-02-084-15/+9