summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | fix typoFrank Karlitschek2013-10-041-1/+1
| * | | | | | | add public staticFrank Karlitschek2013-10-041-1/+1
| * | | | | | | make it possible to prepopulate a new user gome with a skeletonFrank Karlitschek2013-10-031-0/+32
* | | | | | | | Merge branch 'master' into sharing_mail_notification_masterThomas Müller2013-10-022-1/+10
|\| | | | | | |
| * | | | | | | only perform files upgrade in case there are actually entries in the old fsca...Thomas Müller2013-10-021-1/+9
| |/ / / / / /
| * | | | | | Merge pull request #5071 from owncloud/fix-autoloader-masterThomas Müller2013-10-021-0/+1
| |\ \ \ \ \ \
| | * | | | | | Fix autoloader regressionVictor Dubiniuk2013-10-021-0/+1
| | |/ / / / /
* | | | | | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-02340-1098/+5904
|\| | | | | |
| * | | | | | Merge branch 'master' into fixing-4620-masterThomas Müller2013-10-01340-1200/+6325
| |\| | | | |
| | * | | | | Merge branch 'master' into lib-private-master-2Thomas Müller2013-10-013-7/+51
| | |\ \ \ \ \
| | | * | | | | use public api for session access from server containerThomas Müller2013-09-301-12/+18
| | | * | | | | Merge branch 'master' into channelsThomas Müller2013-09-30166-1774/+10827
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | put the current version and edition into a seperate file to simplify packagin...Frank Karlitschek2013-09-301-5/+38
| | | * | | | | 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-302-0/+23
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabledThomas Müller2013-09-302-0/+23
| | | |\ \ \ \ \
| | | | * | | | | 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-242-2/+13
| | | | * | | | | don't remember login if the encrypion app is enabled because the userBjoern Schiessle2013-09-242-6/+8
| | | | | |/ / / | | | | |/| | |
| | * | | | | | 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-30309-5/+5
| | |/ / / / /
| | * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-303-6/+20
| | * | | | | 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-3065-990/+5505
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-306-14/+77
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | initialize $middleWaresThomas Müller2013-09-281-1/+1
| | | * | | | | 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-278-42/+48
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge pull request #4892 from owncloud/vcategories_publicThomas Müller2013-09-257-822/+945
| | | |\ \ \ \ \ \
| | | | * | | | | | Add factory class for the server container.Thomas Tanghus2013-09-246-19/+140
| | | | * | | | | | Fix conflictThomas Tanghus2013-09-231-3/+4
| | | | |\ \ \ \ \ \
| | | | | * | | | | | 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
| | | | | * | | | | | Updated method names and added a few more tests.Thomas Tanghus2013-09-192-9/+9
| | | | | * | | | | | fixing namespaces and rename hasCategory to hasTagThomas Müller2013-09-181-9/+9
| | | | | * | | | | | Merge branch 'appframework-master' into vcategories_publicThomas Müller2013-09-1817-94/+311
| | | | | |\ \ \ \ \ \
| | | | | * | | | | | | OC_VCategories=>OC\Tags. Public interface + getter in server containerThomas Tanghus2013-09-185-833/+813
| | | | | * | | | | | | Merge branch 'appframework-master' into vcategories_publicThomas Tanghus2013-09-1793-483/+6833
| | | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | | More trimmingThomas Tanghus2013-09-041-3/+15
| | | | * | | | | | | | | 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
| | | | * | | | | | | | | Updated method names and added a few more tests.Thomas Tanghus2013-09-232-9/+9
| | | | * | | | | | | | | fixing namespaces and rename hasCategory to hasTagThomas Müller2013-09-231-9/+9
| | | | * | | | | | | | | OC_VCategories=>OC\Tags. Public interface + getter in server containerThomas Tanghus2013-09-235-835/+815
| | | | * | | | | | | | | More trimmingThomas Tanghus2013-09-231-3/+15