| Commit message (Expand) | Author | Age | Files | Lines |
* | return the correct result when doing an smb rename | Robin Appelman | 2013-10-01 | 2 | -2/+9 |
* | fix smb streamwrapper on non existing files | Robin Appelman | 2013-10-01 | 1 | -1/+6 |
* | Merge pull request #5039 from owncloud/lib-private-master-2 | Morris Jobke | 2013-10-01 | 313 | -10/+10 |
|\ |
|
| * | Merge branch 'master' into lib-private-master-2 | Thomas Müller | 2013-10-01 | 4 | -7/+68 |
| |\
| |/
|/| |
|
* | | Merge pull request #5026 from owncloud/channels | Thomas Müller | 2013-10-01 | 4 | -7/+68 |
|\ \ |
|
| * | | add explanation | Frank Karlitschek | 2013-10-01 | 1 | -1/+1 |
| * | | use a 4 digit number | Frank Karlitschek | 2013-10-01 | 1 | -1/+1 |
| * | | use public api for session access from server container | Thomas Müller | 2013-09-30 | 1 | -12/+18 |
| * | | Merge branch 'master' into channels | Thomas Müller | 2013-09-30 | 1376 | -21637/+74043 |
| |\ \
| |/ /
|/| | |
|
| * | | put the current version and edition into a seperate file to simplify packagin... | Frank Karlitschek | 2013-09-30 | 2 | -5/+55 |
| * | | use === | Frank Karlitschek | 2013-09-30 | 1 | -1/+6 |
| * | | prepare the updater for the new update channels | Frank Karlitschek | 2013-09-30 | 1 | -1/+1 |
| | * | Merge branch 'master' into lib-private-master-2 | Thomas Müller | 2013-09-30 | 4 | -1/+26 |
| | |\
| |_|/
|/| | |
|
* | | | Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled | Thomas Müller | 2013-09-30 | 4 | -1/+26 |
|\ \ \ |
|
| * | | | set rememberlogin to false for the encryption app | Bjoern Schiessle | 2013-09-26 | 1 | -0/+1 |
| * | | | check every enabled app if the remember login feature needs to be disabled | Bjoern Schiessle | 2013-09-26 | 1 | -3/+13 |
| * | | | introduce OC_Util::rememberLoginAllowed() | Bjoern Schiessle | 2013-09-24 | 3 | -3/+14 |
| * | | | don't remember login if the encrypion app is enabled because the user | Bjoern Schiessle | 2013-09-24 | 3 | -7/+10 |
| | | * | reorganize file in lib | Thomas Müller | 2013-09-30 | 3 | -0/+0 |
| | | * | move the private namespace OC into lib/private - OCP will stay in lib/public | Thomas Müller | 2013-09-30 | 310 | -10/+10 |
| |_|/
|/| | |
|
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-30 | 58 | -430/+583 |
* | | | Merge pull request #5012 from owncloud/check_keyfiles_exists | Morris Jobke | 2013-09-30 | 1 | -8/+12 |
|\ \ \ |
|
| * | | | check not only if the keyfile folder exists but also if it contains keyfiles | Bjoern Schiessle | 2013-09-27 | 1 | -8/+12 |
* | | | | Merge pull request #4459 from owncloud/appframework-master | Thomas Müller | 2013-09-30 | 91 | -1140/+7913 |
|\ \ \ \ |
|
| * \ \ \ | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-30 | 10 | -15/+225 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-29 | 24 | -123/+156 |
| |\ \ \ \ \ |
|
| * | | | | | | initialize $middleWares | Thomas Müller | 2013-09-28 | 1 | -1/+1 |
| * | | | | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-28 | 4 | -2/+21 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | delay middleware registrations | Thomas Müller | 2013-09-27 | 1 | -4/+9 |
| * | | | | | | | fixing error in initialization of TagManager | Thomas Müller | 2013-09-27 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-27 | 49 | -251/+388 |
| |\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ | Merge pull request #4892 from owncloud/vcategories_public | Thomas Müller | 2013-09-25 | 9 | -950/+1111 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | Add factory class for the server container. | Thomas Tanghus | 2013-09-24 | 7 | -69/+182 |
| | * | | | | | | | | Fix conflict | Thomas Tanghus | 2013-09-23 | 1 | -3/+4 |
| | |\ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | Moar tests. | Thomas Tanghus | 2013-09-23 | 1 | -3/+7 |
| | | * | | | | | | | | Use fetchOne() instead of numRows() when doing a COUNT(*). | Thomas Tanghus | 2013-09-23 | 1 | -1/+1 |
| | | * | | | | | | | | Forgot to return false if add() didn't add anything. | Thomas Tanghus | 2013-09-23 | 1 | -0/+1 |
| | | * | | | | | | | | Added more error checking in add() | Thomas Tanghus | 2013-09-23 | 1 | -5/+13 |
| | | * | | | | | | | | Add another test. | Thomas Tanghus | 2013-09-19 | 1 | -1/+1 |
| | | * | | | | | | | | Updated method names and added a few more tests. | Thomas Tanghus | 2013-09-19 | 3 | -20/+57 |
| | | * | | | | | | | | fixing namespaces and rename hasCategory to hasTag | Thomas Müller | 2013-09-18 | 1 | -9/+9 |
| | | * | | | | | | | | Merge branch 'appframework-master' into vcategories_public | Thomas Müller | 2013-09-18 | 21 | -114/+396 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | OC_VCategories=>OC\Tags. Public interface + getter in server container | Thomas Tanghus | 2013-09-18 | 7 | -961/+946 |
| | | * | | | | | | | | | Merge branch 'appframework-master' into vcategories_public | Thomas Tanghus | 2013-09-17 | 848 | -10804/+39337 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | More trimming | Thomas Tanghus | 2013-09-04 | 1 | -3/+15 |
| | * | | | | | | | | | | | Moar tests. | Thomas Tanghus | 2013-09-23 | 1 | -3/+7 |
| | * | | | | | | | | | | | Use fetchOne() instead of numRows() when doing a COUNT(*). | Thomas Tanghus | 2013-09-23 | 1 | -1/+1 |
| | * | | | | | | | | | | | Forgot to return false if add() didn't add anything. | Thomas Tanghus | 2013-09-23 | 1 | -0/+1 |
| | * | | | | | | | | | | | Added more error checking in add() | Thomas Tanghus | 2013-09-23 | 1 | -5/+13 |
| | * | | | | | | | | | | | Add another test. | Thomas Tanghus | 2013-09-23 | 1 | -1/+1 |