| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into mimeicons-svg | Robin Appelman | 2014-02-21 | 20 | -60/+272 |
| |\ | |||||
| | * | Merge pull request #7350 from owncloud/config-gitignore | Thomas Müller | 2014-02-21 | 1 | -0/+1 |
| | |\ | | | | | | | ignore optional additional config files | ||||
| | | * | ignore optional additional config files | Morris Jobke | 2014-02-21 | 1 | -0/+1 |
| | | | | |||||
| | * | | Merge pull request #7337 from owncloud/test_for_6935 | Björn Schießle | 2014-02-21 | 1 | -0/+34 |
| | |\ \ | | | | | | | | | add unit test for \OC\URLGenerator::getAbsoluteURL | ||||
| | | * | | add unit test for \OC\URLGenerator::getAbsoluteURL to verify #6935 | Bjoern Schiessle | 2014-02-20 | 1 | -0/+34 |
| | | | | | |||||
| | * | | | Merge pull request #7309 from owncloud/mobile-header | Morris Jobke | 2014-02-21 | 8 | -15/+59 |
| | |\ \ \ | | | | | | | | | | | Header optimizations for mobile | ||||
| | | * \ \ | Merge branch 'master' into mobile-header | Robin Appelman | 2014-02-21 | 47 | -267/+779 |
| | | |\ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge pull request #7347 from owncloud/patch-headers-already-sent | Morris Jobke | 2014-02-21 | 2 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | Fix "headers are already sent" introduced with #6519 | ||||
| | | * \ \ \ | Merge branch 'master' into patch-headers-already-sent | Robin Appelman | 2014-02-21 | 1 | -15/+0 |
| | | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | | Merge pull request #7348 from owncloud/remove-problematic-test | icewind1991 | 2014-02-21 | 1 | -15/+0 |
| | |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Remove unit tests which causes the filesystem tests to fail | ||||
| | | * | | | | Remove unit tests which causes the filesystem tests to fail | Robin Appelman | 2014-02-21 | 1 | -15/+0 |
| | |/ / / / | |||||
| | | * | | | Remove `session_id_regenerate` from here | Lukas Reschke | 2014-02-21 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | Jenkins somewhat complains that there are already sent headers. | ||||
| | | * | | | Move session_regenerate_id to `login()` | Lukas Reschke | 2014-02-21 | 1 | -0/+1 |
| | |/ / / | |||||
| | * | | | Merge pull request #7312 from owncloud/ldap_fix_add_test | Thomas Müller | 2014-02-21 | 2 | -3/+169 |
| | |\ \ \ | | | | | | | | | | | LDAP: fix and extend tests | ||||
| | | * | | | LDAP: fix and extend tests | Arthur Schiwon | 2014-02-20 | 2 | -3/+169 |
| | | | | | | |||||
| | * | | | | Merge pull request #7291 from owncloud/adminess-raghu | Lukas Reschke | 2014-02-20 | 5 | -26/+3 |
| | |\ \ \ \ | | | | | | | | | | | | | Move isadmin to template and rename it to oc_isadmin | ||||
| | | * | | | | Fix typo | Lukas Reschke | 2014-02-20 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Variable value is expected and not an echoed output | Lukas Reschke | 2014-02-20 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Move oc_isadmin to the config JS script | Lukas Reschke | 2014-02-20 | 3 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | Move isadmin to template and rename it to oc_isadmin | Lukas Reschke | 2014-02-19 | 6 | -27/+4 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #7332 from owncloud/IE10-viewport | Morris Jobke | 2014-02-20 | 1 | -0/+5 |
| | |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | fix IE10 viewport sizeing | ||||
| | | * | | | | fix IE10 viewport sizeing | Robin Appelman | 2014-02-20 | 1 | -0/+5 |
| | |/ / / / | |||||
| | | | | * | remove additional transition rule, reduce width of collapsed search bar | Jan-Christoph Borchardt | 2014-02-20 | 1 | -5/+1 |
| | | | | | | |||||
| | | | | * | restrict zooming in to not mangle layout accidentally | Jan-Christoph Borchardt | 2014-02-20 | 1 | -1/+1 |
| | | | | | | |||||
| | | | | * | do not show display name on mobile when profile picture is present | Jan-Christoph Borchardt | 2014-02-20 | 4 | -2/+25 |
| | | | | | | |||||
| | | | | * | move avatar into clickable area of user menu | Jan-Christoph Borchardt | 2014-02-20 | 3 | -8/+10 |
| | | | | | | |||||
| | | | | * | reduce width of searchbox on mobile, fix overlap, fix #7282 | Jan-Christoph Borchardt | 2014-02-20 | 3 | -4/+27 |
| | | | | | | |||||
| * | | | | | Make unit tests expect the svg icons | Robin Appelman | 2014-02-20 | 1 | -2/+6 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into mimeicons-svg | Robin Appelman | 2014-02-20 | 231 | -3412/+2134 |
| |\| | | | | |||||
| | * | | | | Merge pull request #6962 from owncloud/quota-space-root | Thomas Müller | 2014-02-20 | 4 | -6/+31 |
| | |\ \ \ \ | | | | | | | | | | | | | Allow passing a root folder to get the used space from in the quota wrapper | ||||
| | | * \ \ \ | Merge branch 'master' into quota-space-root | Robin Appelman | 2014-02-10 | 20 | -35/+68 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'master' into quota-space-root | Robin Appelman | 2014-02-07 | 98 | -733/+2170 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Don't create new thumbnails on the write hook | Robin Appelman | 2014-02-04 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Add unit test for quote wrapper size root | Robin Appelman | 2014-02-04 | 1 | -3/+22 |
| | | | | | | | | | |||||
| | | * | | | | | | Actually rename the variable | Robin Appelman | 2014-01-27 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | | * | | | | | | Fix phpdoc | Robin Appelman | 2014-01-27 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Allow passing a root folder to get the used space from in the quota wrapper | Robin Appelman | 2014-01-27 | 2 | -2/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #7056 from owncloud/users-scrollperformance | Jan-Christoph Borchardt | 2014-02-20 | 3 | -25/+76 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Improve users list scrolling performance | ||||
| | | * | | | | | | | Added loading spinner to users list on scroll | Vincent Petry | 2014-02-18 | 1 | -0/+4 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Improve users list scrolling performance | Vincent Petry | 2014-02-17 | 3 | -25/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed JS error when avatar mode is disabled - added spinner at the bottom of the table - scroll detection now happens earlier - single/multiselect init is deferred so that the new rows are first appended into the list (more responsive) and initialized afterwards - disabled users sorting after add (assuming they are always sorted on the server side) | ||||
| | * | | | | | | | | Merge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fix | Jan-Christoph Borchardt | 2014-02-20 | 1 | -5/+0 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | remove fix for IE9 nav bar width | ||||
| | | * | | | | | | | | remove fix for IE9 nav bar width | Konstantin.Popov | 2014-01-17 | 1 | -5/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge pull request #7290 from owncloud/issue/5463 | icewind1991 | 2014-02-20 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Correctly redirect to settings page when not selecting cert file for upload | ||||
| | | * | | | | | | | | | Correctly redirect to settings page when not selecting cert file for upload | Joas Schilling | 2014-02-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #5463 | ||||
| | * | | | | | | | | | | Merge pull request #7205 from owncloud/fix_7153 | blizzz | 2014-02-20 | 1 | -0/+6 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | LDAP: prevent other configuration from being deleted when deleting the f... | ||||
| | | * | | | | | | | | | | LDAP: prevent other configuration from being deleted when deleting the first ↵ | Arthur Schiwon | 2014-02-14 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one which has an empty prefix for historical reasons | ||||
| | * | | | | | | | | | | | Merge pull request #7319 from owncloud/remote-unneeded-if | Morris Jobke | 2014-02-20 | 1 | -5/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove no longer needed if statement | ||||
| | | * | | | | | | | | | | | Remove no longer needed if statement | Robin Appelman | 2014-02-20 | 1 | -5/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge pull request #6999 from kofemann/mount-config | Lukas Reschke | 2014-02-20 | 3 | -9/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mount: make location of mount.json configurable | ||||
| | | * | | | | | | | | | | | | mount: make location of mount.json configurable | Tigran Mkrtchyan | 2014-01-29 | 3 | -9/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not share users data with config files Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |