summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* return the correct result when doing an smb renameRobin Appelman2013-10-012-2/+9
* fix smb streamwrapper on non existing filesRobin Appelman2013-10-011-1/+6
* Merge pull request #5039 from owncloud/lib-private-master-2Morris Jobke2013-10-01313-10/+10
|\
| * Merge branch 'master' into lib-private-master-2Thomas Müller2013-10-014-7/+68
| |\ | |/ |/|
* | Merge pull request #5026 from owncloud/channelsThomas Müller2013-10-014-7/+68
|\ \
| * | add explanationFrank Karlitschek2013-10-011-1/+1
| * | use a 4 digit numberFrank Karlitschek2013-10-011-1/+1
| * | use public api for session access from server containerThomas Müller2013-09-301-12/+18
| * | Merge branch 'master' into channelsThomas Müller2013-09-301376-21637/+74043
| |\ \ | |/ / |/| |
| * | put the current version and edition into a seperate file to simplify packagin...Frank Karlitschek2013-09-302-5/+55
| * | use ===Frank Karlitschek2013-09-301-1/+6
| * | prepare the updater for the new update channelsFrank Karlitschek2013-09-301-1/+1
| | * Merge branch 'master' into lib-private-master-2Thomas Müller2013-09-304-1/+26
| | |\ | |_|/ |/| |
* | | Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabledThomas Müller2013-09-304-1/+26
|\ \ \
| * | | set rememberlogin to false for the encryption appBjoern Schiessle2013-09-261-0/+1
| * | | check every enabled app if the remember login feature needs to be disabledBjoern Schiessle2013-09-261-3/+13
| * | | introduce OC_Util::rememberLoginAllowed()Bjoern Schiessle2013-09-243-3/+14
| * | | don't remember login if the encrypion app is enabled because the userBjoern Schiessle2013-09-243-7/+10
| | | * reorganize file in libThomas Müller2013-09-303-0/+0
| | | * move the private namespace OC into lib/private - OCP will stay in lib/publicThomas Müller2013-09-30310-10/+10
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-3058-430/+583
* | | Merge pull request #5012 from owncloud/check_keyfiles_existsMorris Jobke2013-09-301-8/+12
|\ \ \
| * | | check not only if the keyfile folder exists but also if it contains keyfilesBjoern Schiessle2013-09-271-8/+12
* | | | Merge pull request #4459 from owncloud/appframework-masterThomas Müller2013-09-3091-1140/+7913
|\ \ \ \
| * \ \ \ Merge branch 'master' into appframework-masterThomas Müller2013-09-3010-15/+225
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into appframework-masterThomas Müller2013-09-2924-123/+156
| |\ \ \ \ \
| * | | | | | initialize $middleWaresThomas Müller2013-09-281-1/+1
| * | | | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-284-2/+21
| |\ \ \ \ \ \
| * | | | | | | delay middleware registrationsThomas Müller2013-09-271-4/+9
| * | | | | | | fixing error in initialization of TagManagerThomas Müller2013-09-271-1/+1
| * | | | | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-2749-251/+388
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #4892 from owncloud/vcategories_publicThomas Müller2013-09-259-950/+1111
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add factory class for the server container.Thomas Tanghus2013-09-247-69/+182
| | * | | | | | | | Fix conflictThomas Tanghus2013-09-231-3/+4
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Moar tests.Thomas Tanghus2013-09-231-3/+7
| | | * | | | | | | | Use fetchOne() instead of numRows() when doing a COUNT(*).Thomas Tanghus2013-09-231-1/+1
| | | * | | | | | | | Forgot to return false if add() didn't add anything.Thomas Tanghus2013-09-231-0/+1
| | | * | | | | | | | Added more error checking in add()Thomas Tanghus2013-09-231-5/+13
| | | * | | | | | | | Add another test.Thomas Tanghus2013-09-191-1/+1
| | | * | | | | | | | Updated method names and added a few more tests.Thomas Tanghus2013-09-193-20/+57
| | | * | | | | | | | fixing namespaces and rename hasCategory to hasTagThomas Müller2013-09-181-9/+9
| | | * | | | | | | | Merge branch 'appframework-master' into vcategories_publicThomas Müller2013-09-1821-114/+396
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | OC_VCategories=>OC\Tags. Public interface + getter in server containerThomas Tanghus2013-09-187-961/+946
| | | * | | | | | | | | Merge branch 'appframework-master' into vcategories_publicThomas Tanghus2013-09-17848-10804/+39337
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | More trimmingThomas Tanghus2013-09-041-3/+15
| | * | | | | | | | | | | Moar tests.Thomas Tanghus2013-09-231-3/+7
| | * | | | | | | | | | | Use fetchOne() instead of numRows() when doing a COUNT(*).Thomas Tanghus2013-09-231-1/+1
| | * | | | | | | | | | | Forgot to return false if add() didn't add anything.Thomas Tanghus2013-09-231-0/+1
| | * | | | | | | | | | | Added more error checking in add()Thomas Tanghus2013-09-231-5/+13
| | * | | | | | | | | | | Add another test.Thomas Tanghus2013-09-231-1/+1