Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8755 from owncloud/fix-8737-master | Vincent Petry | 2014-05-28 | 1 | -2/+2 |
|\ | |||||
| * | remove legacy OC_Filesystem being used in a hook callback | Thomas Müller | 2014-05-28 | 1 | -2/+2 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-28 | 3 | -1/+9 |
|/ | |||||
* | Merge pull request #8136 from owncloud/contactsmanager-register | Bart Visscher | 2014-05-27 | 3 | -37/+71 |
|\ | |||||
| * | no return on register and unregister | Thomas Müller | 2014-05-19 | 1 | -2/+2 |
| * | Merge branch 'master' into contactsmanager-register | Thomas Müller | 2014-05-19 | 212 | -2243/+3670 |
| |\ | |||||
| * | | Fix wrong var name | Bart Visscher | 2014-04-26 | 1 | -1/+1 |
| * | | Merge branch 'master' into contactsmanager-register | Bart Visscher | 2014-04-26 | 131 | -1013/+1996 |
| |\ \ | |||||
| * | | | camelCase vars in OC\ContactsManager | Bart Visscher | 2014-04-17 | 1 | -34/+34 |
| * | | | Supply the contactsmanager object to the callbacks | Bart Visscher | 2014-04-10 | 1 | -1/+1 |
| * | | | $key is not needed for registering contactsmanager callbacks | Bart Visscher | 2014-04-10 | 2 | -5/+3 |
| * | | | Implement the register function of OC\ContactsManager | Bart Visscher | 2014-04-09 | 1 | -12/+48 |
* | | | | Added requiremin/requiremax fields for apps | Vincent Petry | 2014-05-27 | 2 | -26/+63 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-27 | 1 | -0/+1 |
* | | | | Merge pull request #8687 from owncloud/recursive-remove-smb | Vincent Petry | 2014-05-26 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Make the recursive delete more robust | Robin Appelman | 2014-05-23 | 1 | -1/+1 |
* | | | | | Merge pull request #8674 from owncloud/watch-policy | Frank Karlitschek | 2014-05-26 | 2 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Add a config option fro setting the filesystem watcher policy | Robin Appelman | 2014-05-23 | 1 | -0/+2 |
| * | | | | | Fix phpdoc | Robin Appelman | 2014-05-22 | 1 | -1/+1 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-26 | 4 | -2/+13 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-25 | 8 | -10/+20 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-24 | 4 | -2/+25 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #8599 from owncloud/sharing_disable_for_groups | Björn Schießle | 2014-05-22 | 5 | -4/+61 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | allow admin to disable sharing for specific groups of users | Bjoern Schiessle | 2014-05-22 | 5 | -4/+61 |
* | | | | | Merge pull request #8659 from owncloud/get-preference-multiple-user | Vincent Petry | 2014-05-22 | 1 | -0/+37 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Correctly create list of placeholders | Joas Schilling | 2014-05-21 | 1 | -1/+1 |
| * | | | | Move return to new line | Joas Schilling | 2014-05-21 | 1 | -1/+3 |
| * | | | | Add a method to get the values for multiple users to OC\Preferences | Joas Schilling | 2014-05-21 | 1 | -0/+35 |
* | | | | | Merge pull request #8416 from owncloud/sharing_keep_mount_points_visible | Björn Schießle | 2014-05-21 | 1 | -0/+11 |
|\ \ \ \ \ | |||||
| * | | | | | move the mount point up if a share is mounted to a subfolder and the subfolde... | Bjoern Schiessle | 2014-05-21 | 1 | -0/+11 |
| |/ / / / | |||||
* / / / / | use custom logfile path if defined, otherwise use default of owncloud.log in ... | scolebrook | 2014-05-20 | 1 | -1/+2 |
|/ / / / | |||||
* | | / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-20 | 5 | -0/+26 |
| |_|/ |/| | | |||||
* | | | Merge pull request #8639 from owncloud/drop-brief | Thomas Müller | 2014-05-19 | 72 | -478/+478 |
|\ \ \ | |||||
| * | | | Remove all occurences of @brief and @returns from PHPDoc | Morris Jobke | 2014-05-19 | 72 | -482/+482 |
* | | | | Merge pull request #6457 from owncloud/db-convert-tool | Frank Karlitschek | 2014-05-19 | 3 | -98/+199 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | fixing typos and adding PHPDoc | Thomas Müller | 2014-05-12 | 1 | -2/+3 |
| * | | | Add Bart to PgSqlTools copyright. | Andreas Fischer | 2014-04-15 | 1 | -0/+1 |
| * | | | Merge remote-tracking branch 'owncloud/master' into db-convert-tool | Andreas Fischer | 2014-04-15 | 66 | -230/+485 |
| |\ \ \ | |||||
| * | | | | Move PostgreSQL sequence resynchronisation out into PgSqlTools class. | Andreas Fischer | 2014-04-14 | 1 | -0/+39 |
| * | | | | Merge remote-tracking branch 'owncloud/master' into db-convert-tool | Andreas Fischer | 2014-04-09 | 46 | -121/+228 |
| |\ \ \ \ | |||||
| * | | | | | Deduplicate connection handling code into \OC\DB\ConnectionFactory | Andreas Fischer | 2014-03-31 | 2 | -98/+158 |
* | | | | | | Merge pull request #8435 from owncloud/fix-8322-master | Thomas Müller | 2014-05-19 | 4 | -4/+84 |
|\ \ \ \ \ \ | |||||
| * | | | | | | - update permissions | Thomas Müller | 2014-05-09 | 2 | -4/+7 |
| * | | | | | | - Introduce isShared() and isMounted() on FileInfo class | Thomas Müller | 2014-05-02 | 4 | -4/+81 |
* | | | | | | | Merge pull request #8557 from owncloud/custom_session_handling | Thomas Müller | 2014-05-19 | 1 | -2/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Allow apps to create custom session handlers. | ringmaster | 2014-05-12 | 1 | -2/+11 |
* | | | | | | | | Merge pull request #7286 from owncloud/issue/4823 | Morris Jobke | 2014-05-19 | 2 | -40/+98 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Automatically copy the share expiration date when new shares are created | Joas Schilling | 2014-05-19 | 2 | -40/+98 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-19 | 3 | -0/+4 |
* | | | | | | | | | Merge pull request #7363 from owncloud/optimize-startup-queries | Morris Jobke | 2014-05-19 | 2 | -13/+39 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | |