Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | IE8 login/install screen cleartype fixes and input box borders | Jörn Friedrich Dreyer | 2013-07-26 | 1 | -0/+21 |
| | |||||
* | force dbs to stay in one line | Jörn Friedrich Dreyer | 2013-07-24 | 1 | -1/+1 |
| | |||||
* | merge master | Jan-Christoph Borchardt | 2013-07-24 | 176 | -2743/+13436 |
|\ | |||||
| * | Merge pull request #4175 from owncloud/remember-checked | Jan-Christoph Borchardt | 2013-07-24 | 1 | -2/+2 |
| |\ | | | | | | | check remember log in by default, ref #3918 | ||||
| | * | Merge branch 'master' into remember-checked | Jan-Christoph Borchardt | 2013-07-24 | 3 | -18/+4 |
| | |\ | |||||
| | * | | check remember log in by default, ref #3918 | Jan-Christoph Borchardt | 2013-07-24 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #4177 from owncloud/move_defaults_to_template_constructor | Björn Schießle | 2013-07-24 | 12 | -46/+35 |
| |\ \ \ | | | | | | | | | | | Move defaults to template constructor | ||||
| | * | | | use OC_Defaults directly from the template | Björn Schießle | 2013-07-24 | 2 | -4/+4 |
| | | | | | |||||
| | * | | | Merge branch 'master' into move_defaults_to_template_constructor | Björn Schießle | 2013-07-24 | 1 | -2/+2 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | initialize OC_Defaults in template constructorX | Björn Schießle | 2013-07-24 | 10 | -42/+31 |
| | | | | | |||||
| * | | | | Merge pull request #3995 from owncloud/groups | icewind1991 | 2013-07-24 | 9 | -176/+1202 |
| |\ \ \ \ | | |_|/ / | |/| | | | Refactoring of group management code | ||||
| | * | | | Merge branch 'master' into groups | Thomas Müller | 2013-07-24 | 9 | -390/+571 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into groups | Robin Appelman | 2013-07-23 | 1561 | -16146/+93330 |
| | |\ \ \ \ | |||||
| | * | | | | | group: only pass backends that hold that specific group to the group constructor | Robin Appelman | 2013-07-18 | 4 | -11/+13 |
| | | | | | | | |||||
| | * | | | | | reneme id to gid | Robin Appelman | 2013-07-10 | 1 | -15/+15 |
| | | | | | | | |||||
| | * | | | | | more consistent naming | Robin Appelman | 2013-07-10 | 3 | -8/+8 |
| | | | | | | | |||||
| | * | | | | | consistent naming | Robin Appelman | 2013-07-10 | 1 | -6/+6 |
| | | | | | | | |||||
| | * | | | | | search parameter is not optional | Robin Appelman | 2013-07-10 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | add test case for getting group after deleting it | Robin Appelman | 2013-07-10 | 1 | -0/+16 |
| | | | | | | | |||||
| | * | | | | | more consitency in hook names | Robin Appelman | 2013-07-10 | 2 | -9/+9 |
| | | | | | | | |||||
| | * | | | | | cant use private members from closure in php <5.4 | Robin Appelman | 2013-07-10 | 1 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | use new group api as backend for the old api | Robin Appelman | 2013-07-10 | 2 | -173/+160 |
| | | | | | | | |||||
| | * | | | | | update group management | Robin Appelman | 2013-07-10 | 7 | -3/+1024 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #4176 from owncloud/fixing-broken-master | Thomas Müller | 2013-07-24 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | fix php syntax | ||||
| | * | | | | | fix php syntax | Thomas Müller | 2013-07-24 | 1 | -2/+2 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #4171 from owncloud/fix-config | Morris Jobke | 2013-07-24 | 2 | -16/+2 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Fix config | ||||
| | * | | | | ignore config read failures | Bart Visscher | 2013-07-23 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | Revert "fix failing master branch - Test_Config::testWriteData" | Bart Visscher | 2013-07-23 | 2 | -16/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8f93490ac45fbd74bd0e9697a685fd43bb34239b. | ||||
| * | | | | | Merge pull request #4030 from owncloud/more-themable-strings | Jan-Christoph Borchardt | 2013-07-24 | 11 | -34/+54 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | More themable strings | ||||
| | * \ \ \ \ | Merge branch 'master' into more-themable-strings | Thomas Müller | 2013-07-24 | 1510 | -15372/+93481 |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | Conflicts: lib/template.php | ||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-24 | 103 | -1498/+3059 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge pull request #4090 from owncloud/cleanup-some-template-functions | Thomas Müller | 2013-07-23 | 9 | -390/+571 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Cleanup some template functions | ||||
| | * | | | | Change to use !== and === | Bart Visscher | 2013-07-21 | 2 | -6/+6 |
| | | | | | | |||||
| | * | | | | fixing typos, PHPDoc and missing namespace \ | Thomas Müller | 2013-07-21 | 4 | -10/+11 |
| | | | | | | |||||
| | * | | | | Move basic template functions to their own class | Bart Visscher | 2013-07-21 | 3 | -165/+205 |
| | | | | | | |||||
| | * | | | | Move template functions to there own file | Bart Visscher | 2013-07-21 | 2 | -112/+121 |
| | | | | | | |||||
| | * | | | | Split locating JS and CSS files to their own class | Bart Visscher | 2013-07-21 | 5 | -104/+235 |
| | | | | | | |||||
| * | | | | | Merge pull request #3392 from owncloud/googledrive | Bart Visscher | 2013-07-23 | 39 | -599/+8529 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Switch to using Google Drive SDK, closes #2047 | ||||
| | * | | | | | Remove root option from Google Drive storage, because it is only used for ↵ | Michael Gapczynski | 2013-07-23 | 2 | -10/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | testing and we have our own empty Google account for testing | ||||
| | * | | | | | Fix 'most' Google Drive tests | Michael Gapczynski | 2013-07-13 | 2 | -82/+148 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into googledrive | Thomas Müller | 2013-07-12 | 1433 | -32503/+55405 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | substr storage id to prevent problems with storing the change id in appconfig | Michael Gapczynski | 2013-06-04 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Implement hasUpdated() to watch for changes on Google Drive side | Michael Gapczynski | 2013-05-30 | 1 | -0/+59 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into googledrive | Michael Gapczynski | 2013-05-30 | 820 | -36215/+7062 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into googledrive | Michael Gapczynski | 2013-05-27 | 1260 | -19374/+38600 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Return null if file size is negative for WebDAV, fix #2013 | Michael Gapczynski | 2013-05-27 | 1 | -2/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fix require_once for 3rdparty in google ajax frontend | Michael Gapczynski | 2013-05-18 | 1 | -2/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Include 3rdparty Google Drive SDK 0.6.2 | Michael Gapczynski | 2013-05-17 | 33 | -2/+7936 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fix constant in last commit | Michael Gapczynski | 2013-05-17 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Prepare for #2013 fix | Michael Gapczynski | 2013-05-17 | 1 | -1/+7 |
| | | | | | | | | | |