Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9562 from owncloud/users-groupfilter | Thomas Müller | 2014-07-15 | 5 | -59/+153 |
|\ | |||||
| * | fixing PHPDoc | Thomas Müller | 2014-07-14 | 1 | -16/+16 |
| * | remove dead code | Arthur Schiwon | 2014-07-14 | 5 | -43/+137 |
* | | Merge pull request #9620 from owncloud/search-fileinfo-path | icewind1991 | 2014-07-14 | 1 | -1/+2 |
|\ \ | |/ |/| | |||||
| * | Use the correct path when building the FileInfo for the search result | Robin Appelman | 2014-07-14 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #9228 from owncloud/remove-routing-singular-issues | Morris Jobke | 2014-07-14 | 2 | -16/+6 |
|\ | |||||
| * | use id instead of resourceId | Bernhard Posselt | 2014-06-26 | 2 | -13/+3 |
| * | dont strip the s from the resource | Bernhard Posselt | 2014-06-26 | 2 | -6/+6 |
* | | Merge pull request #9598 from owncloud/fix-app-installation-master | Thomas Müller | 2014-07-14 | 1 | -9/+4 |
|\ \ | |||||
| * | | append file extension to the temporary file which contains the downloaded arc... | Thomas Müller | 2014-07-11 | 1 | -9/+4 |
* | | | Merge pull request #9546 from owncloud/user-public | icewind1991 | 2014-07-14 | 7 | -3/+236 |
|\ \ \ | |||||
| * | | | Expose the user manager in the public server container | Robin Appelman | 2014-07-14 | 1 | -0/+7 |
| * | | | Add public interfaces for User, UserManager and UserSession | Robin Appelman | 2014-07-14 | 6 | -3/+229 |
|/ / / | |||||
* | | | Merge pull request #9539 from enoch85/patch-1 | Björn Schießle | 2014-07-14 | 1 | -14/+11 |
|\ \ \ | |||||
| * | | | Fix for #9422 | Daniel Hansson | 2014-07-09 | 1 | -14/+11 |
* | | | | Merge pull request #9572 from owncloud/deleteunsharetooltip | Björn Schießle | 2014-07-14 | 5 | -5/+30 |
|\ \ \ \ | |||||
| * | | | | Added mountType attribute and adapted Delete action text | Vincent Petry | 2014-07-14 | 5 | -5/+30 |
* | | | | | Merge pull request #9605 from owncloud/sftp-missing-streamwrapper | Vincent Petry | 2014-07-14 | 1 | -0/+15 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add short description explaining how SFTP ext storage class works. | Andreas Fischer | 2014-07-12 | 1 | -0/+4 |
| * | | | | The file providing the sftp:// scheme needs to be included manually. | Andreas Fischer | 2014-07-12 | 1 | -0/+11 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #9571 from owncloud/fix_appstore_update_issue | Vincent Petry | 2014-07-14 | 2 | -9/+3 |
|\ \ \ \ | |||||
| * | | | | improve check for duplicate apps | Georg Ehrke | 2014-07-10 | 1 | -7/+2 |
| * | | | | add proper version comparision in OC_Installer::isUpdateAvailable | Georg Ehrke | 2014-07-10 | 1 | -2/+1 |
| | |/ / | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-14 | 20 | -68/+75 |
* | | | | Merge pull request #9563 from owncloud/version-delete-cache | Morris Jobke | 2014-07-13 | 1 | -4/+21 |
|\ \ \ \ | |||||
| * | | | | Remove deleted versions from the cache | Robin Appelman | 2014-07-10 | 1 | -4/+21 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-13 | 29 | -159/+243 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-12 | 41 | -262/+357 |
* | | | | | Merge pull request #9597 from owncloud/enc-removelegacytests | Thomas Müller | 2014-07-11 | 1 | -0/+4 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Disable legacy encryption tests | Vincent Petry | 2014-07-11 | 1 | -0/+4 |
|/ / / / | |||||
* | | | | Merge pull request #9569 from owncloud/fix-require-of-blowfish-master | Morris Jobke | 2014-07-10 | 2 | -2/+0 |
|\ \ \ \ | |||||
| * | | | | remove pointless require of Blowfish.php | Thomas Müller | 2014-07-10 | 2 | -2/+0 |
|/ / / / | |||||
* | | | | Merge pull request #9538 from owncloud/fileactions-cleanup | Vincent Petry | 2014-07-10 | 7 | -43/+137 |
|\ \ \ \ | |||||
| * | | | | Propagate file action changes to the file lists | Vincent Petry | 2014-07-09 | 7 | -43/+137 |
* | | | | | Merge pull request #9525 from owncloud/incrementuser2 | Vincent Petry | 2014-07-10 | 4 | -37/+109 |
|\ \ \ \ \ | |||||
| * | | | | | use .filterAttr() | Thomas Müller | 2014-07-09 | 1 | -4/+4 |
| * | | | | | use .filterAttr() | Thomas Müller | 2014-07-09 | 1 | -7/+8 |
| * | | | | | some more cleanup | Thomas Müller | 2014-07-09 | 1 | -38/+36 |
| * | | | | | magic strings - bad kungfu | Thomas Müller | 2014-07-09 | 1 | -0/+3 |
| * | | | | | remove the group in case the last user has removed from that group | Thomas Müller | 2014-07-09 | 1 | -0/+12 |
| * | | | | | fixing JS synatx errors | Thomas Müller | 2014-07-09 | 2 | -5/+5 |
| * | | | | | avoid global selector | Arthur Schiwon | 2014-07-09 | 1 | -1/+1 |
| * | | | | | increase/decrease everyone count on user creation/deletion | Arthur Schiwon | 2014-07-09 | 3 | -8/+42 |
| * | | | | | decrease user count in affected groups after user delete | Arthur Schiwon | 2014-07-09 | 1 | -0/+14 |
| * | | | | | increment group counters when a user is created | Arthur Schiwon | 2014-07-09 | 3 | -3/+13 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #9536 from owncloud/default-app-groups-master | Morris Jobke | 2014-07-10 | 1 | -97/+97 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | adding 'groups' entry to remote apps | Thomas Müller | 2014-07-09 | 1 | -1/+2 |
| * | | | | fixing typos | Thomas Müller | 2014-07-09 | 1 | -97/+96 |
* | | | | | Merge pull request #9516 from owncloud/kill-legacy-encryption-oc8 | Vincent Petry | 2014-07-10 | 9 | -881/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Kill legacy encryption migration | Thomas Müller | 2014-07-08 | 9 | -881/+3 |