summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8136 from owncloud/contactsmanager-registerBart Visscher2014-05-271-33/+68
|\
| * Merge branch 'master' into contactsmanager-registerThomas Müller2014-05-19138-1982/+2178
| |\
| * | Fix wrong var nameBart Visscher2014-04-261-1/+1
| * | Merge branch 'master' into contactsmanager-registerBart Visscher2014-04-2671-1032/+1372
| |\ \
| * | | camelCase vars in OC\ContactsManagerBart Visscher2014-04-171-34/+34
| * | | Supply the contactsmanager object to the callbacksBart Visscher2014-04-101-1/+1
| * | | $key is not needed for registering contactsmanager callbacksBart Visscher2014-04-101-3/+2
| * | | Implement the register function of OC\ContactsManagerBart Visscher2014-04-091-12/+48
* | | | Added requiremin/requiremax fields for appsVincent Petry2014-05-272-26/+63
* | | | Merge pull request #8687 from owncloud/recursive-remove-smbVincent Petry2014-05-261-1/+1
|\ \ \ \
| * | | | Make the recursive delete more robustRobin Appelman2014-05-231-1/+1
* | | | | Merge pull request #8674 from owncloud/watch-policyFrank Karlitschek2014-05-262-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add a config option fro setting the filesystem watcher policyRobin Appelman2014-05-231-0/+2
| * | | | Fix phpdocRobin Appelman2014-05-221-1/+1
* | | | | Merge pull request #8599 from owncloud/sharing_disable_for_groupsBjörn Schießle2014-05-224-4/+52
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | allow admin to disable sharing for specific groups of usersBjoern Schiessle2014-05-224-4/+52
* | | | | Merge pull request #8659 from owncloud/get-preference-multiple-userVincent Petry2014-05-221-0/+37
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Correctly create list of placeholdersJoas Schilling2014-05-211-1/+1
| * | | | Move return to new lineJoas Schilling2014-05-211-1/+3
| * | | | Add a method to get the values for multiple users to OC\PreferencesJoas Schilling2014-05-211-0/+35
| | |_|/ | |/| |
* / | | move the mount point up if a share is mounted to a subfolder and the subfolde...Bjoern Schiessle2014-05-211-0/+11
|/ / /
* | | Merge pull request #8639 from owncloud/drop-briefThomas Müller2014-05-1965-461/+461
|\ \ \
| * | | Remove all occurences of @brief and @returns from PHPDocMorris Jobke2014-05-1965-465/+465
* | | | Merge pull request #6457 from owncloud/db-convert-toolFrank Karlitschek2014-05-193-98/+199
|\ \ \ \ | |/ / / |/| | |
| * | | fixing typos and adding PHPDocThomas Müller2014-05-121-2/+3
| * | | Add Bart to PgSqlTools copyright.Andreas Fischer2014-04-151-0/+1
| * | | Merge remote-tracking branch 'owncloud/master' into db-convert-toolAndreas Fischer2014-04-1517-174/+294
| |\ \ \
| * | | | Move PostgreSQL sequence resynchronisation out into PgSqlTools class.Andreas Fischer2014-04-141-0/+39
| * | | | Merge remote-tracking branch 'owncloud/master' into db-convert-toolAndreas Fischer2014-04-0926-84/+133
| |\ \ \ \
| * | | | | Deduplicate connection handling code into \OC\DB\ConnectionFactoryAndreas Fischer2014-03-312-98/+158
* | | | | | Merge pull request #8435 from owncloud/fix-8322-masterThomas Müller2014-05-193-4/+70
|\ \ \ \ \ \
| * | | | | | - update permissionsThomas Müller2014-05-092-4/+7
| * | | | | | - Introduce isShared() and isMounted() on FileInfo classThomas Müller2014-05-023-4/+67
* | | | | | | Merge pull request #7286 from owncloud/issue/4823Morris Jobke2014-05-191-31/+93
|\ \ \ \ \ \ \
| * | | | | | | Automatically copy the share expiration date when new shares are createdJoas Schilling2014-05-191-31/+93
* | | | | | | | Merge pull request #7363 from owncloud/optimize-startup-queriesMorris Jobke2014-05-192-13/+39
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into optimize-startup-queriesBart Visscher2014-05-07113-2590/+5021
| |\ \ \ \ \ \ \
| * | | | | | | | Also clear cached UserGroup when a user is added/removedBart Visscher2014-02-271-0/+12
| * | | | | | | | Clear the cached user groups when a group is deletedBart Visscher2014-02-271-3/+5
| * | | | | | | | Delay fetching the display name until it is requestedBart Visscher2014-02-211-5/+7
| * | | | | | | | Add more caching in the group managerBart Visscher2014-02-211-5/+15
* | | | | | | | | Merge pull request #8555 from owncloud/sharing_default_expire_only_public_linksBjörn Schießle2014-05-162-8/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use default expire date only for link sharesBjoern Schiessle2014-05-162-8/+12
* | | | | | | | | | Merge pull request #8604 from owncloud/sharing_encforce_passwordBjörn Schießle2014-05-162-1/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | allow admin to enforce passwords for public link sharesBjoern Schiessle2014-05-162-1/+20
* | | | | | | | | | | Now settings CSS class with appid in content DIVVincent Petry2014-05-152-2/+6
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | use registerService method instead of array accessBernhard Posselt2014-05-141-1/+1
* | | | | | | | | | provide a way to detect the language that is being used (e.g. for clientside ...Bernhard Posselt2014-05-141-0/+17
|/ / / / / / / / /
* | | | | | | | | fixing variable namingThomas Müller2014-05-131-24/+24
* | | | | | | | | fix PHPDocThomas Müller2014-05-131-3/+5