summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8599 from owncloud/sharing_disable_for_groupsBjörn Schießle2014-05-225-4/+61
|\
| * allow admin to disable sharing for specific groups of usersBjoern Schiessle2014-05-225-4/+61
* | 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
* | Merge pull request #8416 from owncloud/sharing_keep_mount_points_visibleBjörn Schießle2014-05-211-0/+11
|\ \
| * | move the mount point up if a share is mounted to a subfolder and the subfolde...Bjoern Schiessle2014-05-211-0/+11
| |/
* / use custom logfile path if defined, otherwise use default of owncloud.log in ...scolebrook2014-05-201-1/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-205-0/+26
* Merge pull request #8639 from owncloud/drop-briefThomas Müller2014-05-1972-478/+478
|\
| * Remove all occurences of @brief and @returns from PHPDocMorris Jobke2014-05-1972-482/+482
* | 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-1566-230/+485
| |\
| * | 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-0946-121/+228
| |\ \
| * | | 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-194-4/+84
|\ \ \ \
| * | | | - update permissionsThomas Müller2014-05-092-4/+7
| * | | | - Introduce isShared() and isMounted() on FileInfo classThomas Müller2014-05-024-4/+81
* | | | | Merge pull request #8557 from owncloud/custom_session_handlingThomas Müller2014-05-191-2/+11
|\ \ \ \ \
| * | | | | Allow apps to create custom session handlers.ringmaster2014-05-121-2/+11
* | | | | | Merge pull request #7286 from owncloud/issue/4823Morris Jobke2014-05-192-40/+98
|\ \ \ \ \ \
| * | | | | | Automatically copy the share expiration date when new shares are createdJoas Schilling2014-05-192-40/+98
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-193-0/+4
* | | | | | | Merge pull request #7363 from owncloud/optimize-startup-queriesMorris Jobke2014-05-192-13/+39
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into optimize-startup-queriesBart Visscher2014-05-07206-4651/+6532
| |\ \ \ \ \ \
| * | | | | | | Use limit=1 so the db can stop searching on the first hitBart Visscher2014-02-281-2/+9
| * | | | | | | 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
| * | | | | | | Only check for existence of shared files when doing shared storage setupBart Visscher2014-02-211-0/+23
| * | | | | | | 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
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-186-0/+7
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-171-0/+8
* | | | | | | | 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-163-1/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | allow admin to enforce passwords for public link sharesBjoern Schiessle2014-05-163-1/+28
* | | | | | | | | | Merge pull request #6260 from owncloud/jan-navigation-filesidebarVincent Petry2014-05-162-2/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Now settings CSS class with appid in content DIVVincent Petry2014-05-152-2/+6
| | |/ / / / / / / / | |/| | | | | | | |
* / | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-164-5/+35
|/ / / / / / / / /
* | | | | | | | | Merge pull request #8587 from Raydiation/masterThomas Müller2014-05-154-4/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use registerService method instead of array accessBernhard Posselt2014-05-141-1/+1
| * | | | | | | | | use fetch method instead of fetchRow because fetchRow is only an owncloud int...Bernhard Posselt2014-05-141-3/+3
| * | | | | | | | | provide a way to detect the language that is being used (e.g. for clientside ...Bernhard Posselt2014-05-142-0/+31
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-151-1/+3
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-142-0/+13
|/ / / / / / / /