Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | fix typo | Frank Karlitschek | 2013-10-04 | 1 | -1/+1 | |
| * | | | | | | | add public static | Frank Karlitschek | 2013-10-04 | 1 | -1/+1 | |
| * | | | | | | | make it possible to prepopulate a new user gome with a skeleton | Frank Karlitschek | 2013-10-03 | 1 | -0/+32 | |
* | | | | | | | | Merge branch 'master' into sharing_mail_notification_master | Thomas Müller | 2013-10-02 | 2 | -1/+10 | |
|\| | | | | | | | ||||||
| * | | | | | | | only perform files upgrade in case there are actually entries in the old fsca... | Thomas Müller | 2013-10-02 | 1 | -1/+9 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #5071 from owncloud/fix-autoloader-master | Thomas Müller | 2013-10-02 | 1 | -0/+1 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Fix autoloader regression | Victor Dubiniuk | 2013-10-02 | 1 | -0/+1 | |
| | |/ / / / / | ||||||
* | | | | | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-10-02 | 340 | -1098/+5904 | |
|\| | | | | | | ||||||
| * | | | | | | Merge branch 'master' into fixing-4620-master | Thomas Müller | 2013-10-01 | 340 | -1200/+6325 | |
| |\| | | | | | ||||||
| | * | | | | | Merge branch 'master' into lib-private-master-2 | Thomas Müller | 2013-10-01 | 3 | -7/+51 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | 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 | 166 | -1774/+10827 | |
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | ||||||
| | | * | | | | | put the current version and edition into a seperate file to simplify packagin... | Frank Karlitschek | 2013-09-30 | 1 | -5/+38 | |
| | | * | | | | | 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 | 2 | -0/+23 | |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | ||||||
| | | * | | | | | Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled | Thomas Müller | 2013-09-30 | 2 | -0/+23 | |
| | | |\ \ \ \ \ | ||||||
| | | | * | | | | | 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 | 2 | -2/+13 | |
| | | | * | | | | | don't remember login if the encrypion app is enabled because the user | Bjoern Schiessle | 2013-09-24 | 2 | -6/+8 | |
| | | | | |/ / / | | | | |/| | | | ||||||
| | * | | | | | | 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 | 309 | -5/+5 | |
| | |/ / / / / | ||||||
| | * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-30 | 3 | -6/+20 | |
| | * | | | | | 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 | 65 | -990/+5505 | |
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | ||||||
| | | * | | | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-30 | 6 | -14/+77 | |
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | ||||||
| | | * | | | | | initialize $middleWares | Thomas Müller | 2013-09-28 | 1 | -1/+1 | |
| | | * | | | | | 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 | 8 | -42/+48 | |
| | | |\ \ \ \ \ | ||||||
| | | * \ \ \ \ \ | Merge pull request #4892 from owncloud/vcategories_public | Thomas Müller | 2013-09-25 | 7 | -822/+945 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | Add factory class for the server container. | Thomas Tanghus | 2013-09-24 | 6 | -19/+140 | |
| | | | * | | | | | | Fix conflict | Thomas Tanghus | 2013-09-23 | 1 | -3/+4 | |
| | | | |\ \ \ \ \ \ | ||||||
| | | | | * | | | | | | 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 | |
| | | | | * | | | | | | Updated method names and added a few more tests. | Thomas Tanghus | 2013-09-19 | 2 | -9/+9 | |
| | | | | * | | | | | | 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 | 17 | -94/+311 | |
| | | | | |\ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | OC_VCategories=>OC\Tags. Public interface + getter in server container | Thomas Tanghus | 2013-09-18 | 5 | -833/+813 | |
| | | | | * | | | | | | | Merge branch 'appframework-master' into vcategories_public | Thomas Tanghus | 2013-09-17 | 93 | -483/+6833 | |
| | | | | |\ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | More trimming | Thomas Tanghus | 2013-09-04 | 1 | -3/+15 | |
| | | | * | | | | | | | | | 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 | |
| | | | * | | | | | | | | | Updated method names and added a few more tests. | Thomas Tanghus | 2013-09-23 | 2 | -9/+9 | |
| | | | * | | | | | | | | | fixing namespaces and rename hasCategory to hasTag | Thomas Müller | 2013-09-23 | 1 | -9/+9 | |
| | | | * | | | | | | | | | OC_VCategories=>OC\Tags. Public interface + getter in server container | Thomas Tanghus | 2013-09-23 | 5 | -835/+815 | |
| | | | * | | | | | | | | | More trimming | Thomas Tanghus | 2013-09-23 | 1 | -3/+15 |