summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8547 from owncloud/path-length-masterThomas Müller2014-05-291-3/+18
|\
| * # This is a combination of 2 commits.Thomas Müller2014-05-281-3/+18
* | Merge pull request #8754 from owncloud/3rdparty-upgraded-phpmailerLukas Reschke2014-05-281-2/+0
|\ \
| * | upgraded phpmailer into v5.2.8 via composerVolkan Gezer2014-05-271-2/+0
* | | Merge pull request #8681 from owncloud/logintimestampLukas Reschke2014-05-285-16/+87
|\ \ \
| * \ \ Merge branch 'logintimestamp' of git://github.com/owncloud/core into logintim...Arthur Schiwon2014-05-261-1/+1
| |\ \ \
| | * | | Clarify commentLukas Reschke2014-05-241-1/+1
| * | | | drop superflous statement in phpdocArthur Schiwon2014-05-261-2/+0
| * | | | add preRememberedLogin hook and document this and postRememberedLogin in clas...Arthur Schiwon2014-05-261-1/+4
| |/ / /
| * | | increase scrutinizer happyiness by removing minor/informational issuesArthur Schiwon2014-05-231-1/+1
| * | | clean up tryRememberLogin and save the timestamp of users last loginArthur Schiwon2014-05-215-15/+85
* | | | Change visibility of scanner internalsringmaster2014-05-281-4/+4
| |_|/ |/| |
* | | Merge pull request #8755 from owncloud/fix-8737-masterVincent Petry2014-05-281-2/+2
|\ \ \
| * | | remove legacy OC_Filesystem being used in a hook callbackThomas Müller2014-05-281-2/+2
| | |/ | |/|
* / | [tx-robot] updated from transifexJenkins for ownCloud2014-05-283-1/+9
|/ /
* | Merge pull request #8136 from owncloud/contactsmanager-registerBart Visscher2014-05-273-37/+71
|\ \
| * | no return on register and unregisterThomas Müller2014-05-191-2/+2
| * | Merge branch 'master' into contactsmanager-registerThomas Müller2014-05-19212-2243/+3670
| |\ \
| * | | Fix wrong var nameBart Visscher2014-04-261-1/+1
| * | | Merge branch 'master' into contactsmanager-registerBart Visscher2014-04-26131-1013/+1996
| |\ \ \
| * | | | 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-102-5/+3
| * | | | Implement the register function of OC\ContactsManagerBart Visscher2014-04-091-12/+48
* | | | | Added requiremin/requiremax fields for appsVincent Petry2014-05-272-26/+63
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-271-0/+1
* | | | | 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
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-264-2/+13
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-258-10/+20
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-244-2/+25
| |/ / / / / |/| | | | |
* | | | | | 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
| |\ \ \