Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge branch 'master' into multi_app_dir | Brice Maron | 2012-06-07 | 1 | -1/+0 | |
| |\ \ \ | ||||||
| * | | | | Change app path logic in templates | Brice Maron | 2012-06-06 | 3 | -8/+5 | |
| * | | | | Unit path and webpath, correct some more | Brice Maron | 2012-06-06 | 1 | -1/+2 | |
* | | | | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-06-19 | 2 | -3/+3 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | CSS class headerAction -> header-action | Florian Hülsmann | 2012-06-18 | 2 | -3/+3 | |
| * | | | | added CSS class .headerAction | Florian Hülsmann | 2012-06-18 | 1 | -2/+2 | |
* | | | | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-06-18 | 1 | -2/+2 | |
|\| | | | | ||||||
| * | | | | Use TemplateLayout functions for finding js and css files in minimizer | Bart Visscher | 2012-06-18 | 1 | -2/+2 | |
* | | | | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-06-18 | 3 | -10/+9 | |
|\| | | | | ||||||
| * | | | | corrected header width and floating (can now dynamically add stuff to header)... | Florian Hülsmann | 2012-06-18 | 2 | -8/+7 | |
| * | | | | Cache the minimized output also on the server | Bart Visscher | 2012-06-18 | 1 | -2/+2 | |
* | | | | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-06-17 | 1 | -0/+1 | |
|\| | | | | ||||||
| * | | | | Add session_write_close to the minimizer | Bart Visscher | 2012-06-16 | 1 | -0/+1 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-06-15 | 4 | -3/+13 | |
|\| | | | ||||||
| * | | | Make requesttoken global. | Thomas Tanghus | 2012-06-14 | 1 | -1/+1 | |
| * | | | Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/ownclo... | Michael Gapczynski | 2012-06-13 | 2 | -2/+2 | |
| |\ \ \ | ||||||
| | * | | | Removed some unessecary sanitizations | Lukas Reschke | 2012-06-11 | 1 | -1/+1 | |
| | * | | | Make some apps compatible | Lukas Reschke | 2012-06-11 | 1 | -1/+1 | |
| * | | | | Added JSON methods for CSRF prevention. Make request token accessible from te... | Thomas Tanghus | 2012-06-13 | 1 | -0/+10 | |
| * | | | | urlencode link fort password reset (bug #970) | Bjoern Schiessle | 2012-06-13 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-06-10 | 1 | -3/+9 | |
|\| | | | ||||||
| * | | | fix potential xss in multiselect | Robin Appelman | 2012-06-09 | 1 | -3/+9 | |
* | | | | fix merge conflicts | Georg Ehrke | 2012-06-08 | 3 | -5/+4 | |
|\| | | | ||||||
| * | | | Better handling of core.css and core.js | Bart Visscher | 2012-06-07 | 2 | -4/+4 | |
| | |/ | |/| | ||||||
| * | | Remove old internal mail call for password reset, fixes bug oc-934 | Michael Gapczynski | 2012-06-07 | 1 | -1/+0 | |
| |/ | ||||||
* | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-06-06 | 20 | -26/+215 | |
|\| | ||||||
| * | update translations | Robin Appelman | 2012-06-06 | 16 | -25/+188 | |
| * | Fix remap dir for CSS minimizer | Bart Visscher | 2012-06-05 | 1 | -1/+1 | |
| * | Load apps before minimizing the core css and js | Bart Visscher | 2012-06-04 | 1 | -0/+2 | |
| * | Merge branch 'unstable' | Bart Visscher | 2012-06-04 | 3 | -0/+24 | |
| |\ | ||||||
| | * | Combine and minimize core and default app js files | Bart Visscher | 2012-05-16 | 3 | -3/+16 | |
| | * | Combine and minimize core and default app css files | Bart Visscher | 2012-05-16 | 3 | -0/+11 | |
* | | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-06-04 | 1 | -1/+1 | |
|\| | | ||||||
| * | | use our own serverHost call so that ownCloud works with reverse proxy servers | Frank Karlitschek | 2012-05-31 | 1 | -1/+1 | |
* | | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-05-26 | 2 | -2/+2 | |
|\| | | ||||||
| * | | update copyright | Frank Karlitschek | 2012-05-26 | 2 | -2/+2 | |
* | | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-05-25 | 4 | -1/+1 | |
|\| | | ||||||
| * | | oc-657: icons for M$ office file types | Thomas Mueller | 2012-05-21 | 3 | -0/+0 | |
| * | | add htmlentities() call into login form | Michiel de Jong | 2012-05-18 | 1 | -1/+1 | |
* | | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-05-17 | 29 | -9/+229 | |
|\| | | ||||||
| * | | Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/ownclo... | Michael Gapczynski | 2012-05-17 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-e... | Vitaly Kuznetsov | 2012-05-10 | 1 | -1/+1 | |
| | |/ | ||||||
| * | | only check our own input fields when determining to show the login button | Robin Appelman | 2012-05-17 | 1 | -2/+2 | |
| * | | update translations | Robin Appelman | 2012-05-17 | 6 | -1/+81 | |
| * | | move auth.css and remoteStorage-big.png to assets folders From where they can... | Michiel de Jong | 2012-05-14 | 2 | -0/+8 | |
| * | | Sanitize search queries, thanks to Lukas Reschke | Michael Gapczynski | 2012-05-13 | 1 | -1/+1 | |
| * | | update translations | Robin Appelman | 2012-05-13 | 18 | -4/+136 | |
* | | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-05-13 | 47 | -654/+1085 | |
|\| | | ||||||
| * | | update to jquery 1.7.2 | Robin Appelman | 2012-05-12 | 2 | -4/+4 | |
| * | | Remove duplicate line | Bart Visscher | 2012-05-11 | 1 | -1/+0 |