summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8755 from owncloud/fix-8737-masterVincent Petry2014-05-281-2/+2
|\ | | | | remove legacy OC_Filesystem being used in a hook callback
| * 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
|\ | | | | Implement the register function of OC\ContactsManager
| * no return on register and unregisterThomas Müller2014-05-191-2/+2
| |
| * Merge branch 'master' into contactsmanager-registerThomas Müller2014-05-19212-2243/+3670
| |\ | | | | | | | | | | | | Conflicts: lib/private/contactsmanager.php
| * | Fix wrong var nameBart Visscher2014-04-261-1/+1
| | |
| * | Merge branch 'master' into contactsmanager-registerBart Visscher2014-04-26131-1013/+1996
| |\ \ | | | | | | | | | | | | | | | | Conflicts: lib/private/contactsmanager.php
| * | | 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
| | | | | | | | | | | | | | | | | | | | Apps can now specify a minimum and maximum version of ownCloud in which they are supported.
* | | | [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 robust
| * | | | 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 for setting the filesystem watcher policy
| * | | | | 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 users
| * | | | 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
|\ \ \ \ \ | |/ / / / |/| | | | Add a method to get the values for multiple users to OC\Preferences
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | [sharing] move the mount point up if the parent folder no longer exists
| * | | | | move the mount point up if a share is mounted to a subfolder and the ↵Bjoern Schiessle2014-05-211-0/+11
| |/ / / / | | | | | | | | | | | | | | | subfolder no longer exists
* / / / / use custom logfile path if defined, otherwise use default of owncloud.log in ↵scolebrook2014-05-201-1/+2
|/ / / / | | | | | | | | | | | | data directory
* | | / [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 PHPDoc
| * | | Remove all occurences of @brief and @returns from PHPDocMorris Jobke2014-05-1972-482/+482
| | | | | | | | | | | | | | | | * test case added to avoid adding them later
* | | | Merge pull request #6457 from owncloud/db-convert-toolFrank Karlitschek2014-05-193-98/+199
|\ \ \ \ | |/ / / |/| | | Command line tool to convert current database to others, except sqlite
| * | | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * owncloud/master: (61 commits) [tx-robot] updated from transifex Make email display name change translatable again Ignore jquery.multiselect.js - it's 3rdparty javascript code cleanup + fixing syntax errors Revert "close-button for share_dropdown" close-button for share_dropdown [tx-robot] updated from transifex The latest developer manual link The latest developer manual link p() and print_unescaped() also take arrays as parameter Check whether the user has permissions to add personal storage backends [tx-robot] updated from transifex Fix a wrong WebDAV Warning with self-signed-certs fix translation link upda mailinglist address fix contribute link default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute Correctly process request parameters other than GET or POST, dont use globals in the class but inject it [tx-robot] updated from transifex use references for middleware to fix problems on 5.3 ...
| * | | | 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * owncloud/master: (137 commits) add comment to clearify when a skip in the foreach happens remove obsolete code Always define sendmail_is_available [tx-robot] updated from transifex Make hardcoded exception messages translatable Disable sharing in trashbin app class Test_Config is already declared [tx-robot] updated from transifex using array_key_exists() instead of isset() - required because in case the value is null isset is returning false fixing undefined exception classes unit test testSetAppValueIfSetToNull() added unit tests for dynamic backend registration ignore underscore.js in scrutinizer.yml adding ownCloud globals to jshintrc: OC, t, n Use git checkout on directory as some files may not be in git resulting in, e.g.: adding underscore.js reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085 translations for oc-dialogs reside in code Fix copy conflict dialog translation [tx-robot] updated from transifex ...
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Expose permission via WebDAV
| * | | | | | - update permissionsThomas Müller2014-05-092-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - change xml tag to perm
| * | | | | | - Introduce isShared() and isMounted() on FileInfo classThomas Müller2014-05-024-4/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reuse these methods on determineIcon() - Generate permission string for the desktop client - expose {http://owncloud.org/ns}permissions as additional WebDAV property containing the permission string
* | | | | | | Merge pull request #8557 from owncloud/custom_session_handlingThomas Müller2014-05-191-2/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow apps to create custom session handlers.
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Set expiration date by default when adding additional shares
| * | | | | | | | Automatically copy the share expiration date when new shares are createdJoas Schilling2014-05-192-40/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #4823
* | | | | | | | | [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
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Optimize some queries that are always executed when loading base.php
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-08 22:30:27 +0000