Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8136 from owncloud/contactsmanager-register | Bart Visscher | 2014-05-27 | 1 | -33/+68 |
|\ | |||||
| * | Merge branch 'master' into contactsmanager-register | Thomas Müller | 2014-05-19 | 138 | -1982/+2178 |
| |\ | |||||
| * | | Fix wrong var name | Bart Visscher | 2014-04-26 | 1 | -1/+1 |
| * | | Merge branch 'master' into contactsmanager-register | Bart Visscher | 2014-04-26 | 71 | -1032/+1372 |
| |\ \ | |||||
| * | | | 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 | 1 | -3/+2 |
| * | | | 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 |
* | | | | 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 |
* | | | | | Merge pull request #8599 from owncloud/sharing_disable_for_groups | Björn Schießle | 2014-05-22 | 4 | -4/+52 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | allow admin to disable sharing for specific groups of users | Bjoern Schiessle | 2014-05-22 | 4 | -4/+52 |
* | | | | | 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 |
| | |_|/ | |/| | | |||||
* / | | | move the mount point up if a share is mounted to a subfolder and the subfolde... | Bjoern Schiessle | 2014-05-21 | 1 | -0/+11 |
|/ / / | |||||
* | | | Merge pull request #8639 from owncloud/drop-brief | Thomas Müller | 2014-05-19 | 65 | -461/+461 |
|\ \ \ | |||||
| * | | | Remove all occurences of @brief and @returns from PHPDoc | Morris Jobke | 2014-05-19 | 65 | -465/+465 |
* | | | | 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 | 17 | -174/+294 |
| |\ \ \ | |||||
| * | | | | 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 | 26 | -84/+133 |
| |\ \ \ \ | |||||
| * | | | | | 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 | 3 | -4/+70 |
|\ \ \ \ \ \ | |||||
| * | | | | | | - update permissions | Thomas Müller | 2014-05-09 | 2 | -4/+7 |
| * | | | | | | - Introduce isShared() and isMounted() on FileInfo class | Thomas Müller | 2014-05-02 | 3 | -4/+67 |
* | | | | | | | Merge pull request #7286 from owncloud/issue/4823 | Morris Jobke | 2014-05-19 | 1 | -31/+93 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Automatically copy the share expiration date when new shares are created | Joas Schilling | 2014-05-19 | 1 | -31/+93 |
* | | | | | | | | Merge pull request #7363 from owncloud/optimize-startup-queries | Morris Jobke | 2014-05-19 | 2 | -13/+39 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into optimize-startup-queries | Bart Visscher | 2014-05-07 | 113 | -2590/+5021 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Also clear cached UserGroup when a user is added/removed | Bart Visscher | 2014-02-27 | 1 | -0/+12 |
| * | | | | | | | | Clear the cached user groups when a group is deleted | Bart Visscher | 2014-02-27 | 1 | -3/+5 |
| * | | | | | | | | Delay fetching the display name until it is requested | Bart Visscher | 2014-02-21 | 1 | -5/+7 |
| * | | | | | | | | Add more caching in the group manager | Bart Visscher | 2014-02-21 | 1 | -5/+15 |
* | | | | | | | | | Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links | Björn Schießle | 2014-05-16 | 2 | -8/+12 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | use default expire date only for link shares | Bjoern Schiessle | 2014-05-16 | 2 | -8/+12 |
* | | | | | | | | | | Merge pull request #8604 from owncloud/sharing_encforce_password | Björn Schießle | 2014-05-16 | 2 | -1/+20 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | allow admin to enforce passwords for public link shares | Bjoern Schiessle | 2014-05-16 | 2 | -1/+20 |
* | | | | | | | | | | | Now settings CSS class with appid in content DIV | Vincent Petry | 2014-05-15 | 2 | -2/+6 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | use registerService method instead of array access | Bernhard Posselt | 2014-05-14 | 1 | -1/+1 |
* | | | | | | | | | | provide a way to detect the language that is being used (e.g. for clientside ... | Bernhard Posselt | 2014-05-14 | 1 | -0/+17 |
|/ / / / / / / / / | |||||
* | | | | | | | | | fixing variable naming | Thomas Müller | 2014-05-13 | 1 | -24/+24 |
* | | | | | | | | | fix PHPDoc | Thomas Müller | 2014-05-13 | 1 | -3/+5 |