| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #8435 from owncloud/fix-8322-master | Thomas Müller | 2014-05-19 | 6 | -17/+99 |
|\ |
|
| * | - update permissions | Thomas Müller | 2014-05-09 | 2 | -4/+7 |
| * | fix broken unit test | Thomas Müller | 2014-05-02 | 1 | -1/+11 |
| * | - Introduce isShared() and isMounted() on FileInfo class | Thomas Müller | 2014-05-02 | 5 | -17/+85 |
* | | 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 #8585 from owncloud/phpdoc-improvements-apps | Andreas Fischer | 2014-05-19 | 43 | -342/+338 |
|\ \ \ |
|
| * | | | Fix whitespace issues | Robin McCorkell | 2014-05-16 | 16 | -69/+69 |
| * | | | Reduce double-space with single-space. | Andreas Fischer | 2014-05-16 | 1 | -1/+1 |
| * | | | Remove spaces around | operator in doc block. | Andreas Fischer | 2014-05-16 | 1 | -1/+1 |
| * | | | Fix more missing or broken PHPDoc | Robin McCorkell | 2014-05-16 | 10 | -22/+20 |
| * | | | PHPDoc fixes for user_ldap | Robin McCorkell | 2014-05-16 | 7 | -29/+29 |
| * | | | Fix PHPDoc in /apps | Robin McCorkell | 2014-05-16 | 31 | -241/+239 |
* | | | | Merge branch 'libasys-patch-1' | Morris Jobke | 2014-05-19 | 1 | -1/+13 |
|\ \ \ \ |
|
| * | | | | Add generic 'share by link' URL generator in share.js | libasys | 2014-05-19 | 1 | -1/+13 |
|/ / / / |
|
* | | | | Merge pull request #7286 from owncloud/issue/4823 | Morris Jobke | 2014-05-19 | 4 | -46/+132 |
|\ \ \ \ |
|
| * | | | | fix wrong conflict resolution | Morris Jobke | 2014-05-19 | 1 | -1/+1 |
| * | | | | Correctly set expiration dates when adding additional shares | Joas Schilling | 2014-05-19 | 1 | -4/+31 |
| * | | | | Automatically copy the share expiration date when new shares are created | Joas Schilling | 2014-05-19 | 3 | -41/+100 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-19 | 40 | -90/+121 |
* | | | | | Merge pull request #7363 from owncloud/optimize-startup-queries | Morris Jobke | 2014-05-19 | 3 | -13/+133 |
|\ \ \ \ \ |
|
| * \ \ \ \ | Merge branch 'master' into optimize-startup-queries | Bart Visscher | 2014-05-07 | 2215 | -83919/+193118 |
| |\ \ \ \ \ |
|
| * | | | | | | Use limit=1 so the db can stop searching on the first hit | Bart Visscher | 2014-02-28 | 1 | -2/+9 |
| * | | | | | | Add unit tests for getUserGroups with addUser and removeUser | Bart Visscher | 2014-02-27 | 1 | -0/+94 |
| * | | | | | | 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 |
| * | | | | | | Only check for existence of shared files when doing shared storage setup | Bart Visscher | 2014-02-21 | 2 | -1/+24 |
| * | | | | | | 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 #8592 from owncloud/login-timezone | Morris Jobke | 2014-05-19 | 2 | -1/+7 |
|\ \ \ \ \ \ \
| |_|_|/ / / /
|/| | | | | | |
|
| * | | | | | | Disable login button until the timezone is set | Vincent Petry | 2014-05-14 | 2 | -1/+7 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-18 | 169 | -394/+578 |
* | | | | | | | Merge pull request #8609 from owncloud/ie8-svgfallbackforicons | Vincent Petry | 2014-05-17 | 1 | -0/+15 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | SVG fallback for settings icon | Vincent Petry | 2014-05-16 | 1 | -0/+5 |
| * | | | | | | | Fallback for triangle icons | Vincent Petry | 2014-05-16 | 1 | -0/+10 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-17 | 967 | -19151/+24007 |
| |_|_|_|/ / /
|/| | | | | | |
|
* | | | | | | | Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links | Björn Schießle | 2014-05-16 | 3 | -8/+66 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | use default expire date only for link shares | Bjoern Schiessle | 2014-05-16 | 3 | -8/+66 |
* | | | | | | | | Merge pull request #8604 from owncloud/sharing_encforce_password | Björn Schießle | 2014-05-16 | 9 | -29/+132 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | allow admin to enforce passwords for public link shares | Bjoern Schiessle | 2014-05-16 | 9 | -29/+132 |
* | | | | | | | | | Merge pull request #8610 from owncloud/ie8-filesdndbug | Vincent Petry | 2014-05-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Fix drag and drop in IE8 | Vincent Petry | 2014-05-16 | 1 | -1/+1 |
| | |_|/ / / / / /
| |/| | | | | | | |
|
* | | | | | | | | | Merge pull request #6260 from owncloud/jan-navigation-filesidebar | Vincent Petry | 2014-05-16 | 46 | -3032/+4323 |
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | | |
|
| * | | | | | | | | Fixed many issues, clean up | Vincent Petry | 2014-05-15 | 29 | -276/+540 |
| * | | | | | | | | Namespacing for FileList, FileActions and trashbin app | Vincent Petry | 2014-05-15 | 37 | -2941/+3796 |
| * | | | | | | | | Files app navigation can now switch | Vincent Petry | 2014-05-15 | 9 | -7/+124 |
| * | | | | | | | | Added navigation manager in files app for the sidebar | Vincent Petry | 2014-05-15 | 7 | -60/+70 |
| * | | | | | | | | Added app navigation for files app | Vincent Petry | 2014-05-15 | 10 | -14/+55 |
| * | | | | | | | | Now settings CSS class with appid in content DIV | Vincent Petry | 2014-05-15 | 3 | -3/+7 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-16 | 365 | -2177/+2831 |
|/ / / / / / / / |
|