Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | | | | | | | | | | | | pretty print json | Jörn Friedrich Dreyer | 2013-02-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | merge master into mountconfig | Robin Appelman | 2013-02-18 | 42 | -108/+320 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Create new mountconfig files in json | Robin Appelman | 2013-02-16 | 1 | -31/+14 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Use a parser to read custom mount configuration instead of including the php ↵ | Robin Appelman | 2013-02-16 | 1 | -1/+2 | |
| | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files | |||||
| * | | | | | | | | | | | | | | | | files_versions no longer contains a personal settings page -> remove the call | Thomas Mueller | 2013-02-18 | 1 | -1/+0 | |
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #1759 from owncloud/redirect_fix_1737 | Thomas Müller | 2013-02-18 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | fix redirect, use the new routing | |||||
| | * | | | | | | | | | | | | | | fix redirect, use the new routing | Björn Schießle | 2013-02-18 | 1 | -1/+1 | |
| | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | change $_REQUEST to $_POST; fix check if file was successfully deleted | Björn Schießle | 2013-02-19 | 1 | -5/+6 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | add missing paramenter to post request | Björn Schießle | 2013-02-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | use instead of | Björn Schießle | 2013-02-19 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | allow user to delete selected files from the trash bin permanently | Björn Schießle | 2013-02-19 | 3 | -17/+72 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | remove obsolete variables | Björn Schießle | 2013-02-19 | 1 | -5/+1 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | close file handler after readdir() | Björn Schießle | 2013-02-18 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / | ||||||
* / / / / / / / / / / / / / | Sanitize HTML | Lukas Reschke | 2013-02-18 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-18 | 9 | -6/+26 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #1709 from owncloud/style-cleanup-files_external | Thomas Müller | 2013-02-17 | 2 | -6/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style cleanup files_external | |||||
| * | | | | | | | | | | | | | Join split translated strings | Bart Visscher | 2013-02-15 | 1 | -6/+2 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Style cleanup files_external | Bart Visscher | 2013-02-15 | 2 | -6/+19 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #1708 from owncloud/style-cleanup-user_ldap | Bernhard Posselt | 2013-02-17 | 9 | -69/+206 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style cleanup user_ldap | |||||
| * | | | | | | | | | | | | | Join split translated strings | Bart Visscher | 2013-02-15 | 2 | -13/+6 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Join short comment lines | Bart Visscher | 2013-02-15 | 1 | -4/+2 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Style cleanup user_ldap | Bart Visscher | 2013-02-14 | 9 | -72/+218 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'master' into fix-googledrive | Thomas Mueller | 2013-02-17 | 108 | -136/+640 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #1699 from owncloud/multiselect-bar-fix | Thomas Müller | 2013-02-17 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix multiselect bar offset on shared page, close #1339 finally | |||||
| | * | | | | | | | | | | | | | | fix multiselect bar offset on shared page, close #1339 finally | Jan-Christoph Borchardt | 2013-02-14 | 1 | -0/+1 | |
| | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge pull request #1730 from owncloud/ldap_fix_warnings | Thomas Müller | 2013-02-17 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP: check array with isset first to avoid warnings about undefined ind... | |||||
| | * | | | | | | | | | | | | | | LDAP: check array with isset first to avoid warnings about undefined index | Arthur Schiwon | 2013-02-16 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-17 | 8 | -21/+24 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #1729 from owncloud/fix_1727 | Frank Karlitschek | 2013-02-16 | 1 | -2/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixe... | |||||
| | * | | | | | | | | | | | | | | | LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixes #1727 | Arthur Schiwon | 2013-02-16 | 1 | -2/+5 | |
| | |/ / / / / / / / / / / / / / | ||||||
| * / / / / / / / / / / / / / / | Add missing requesttoken | Lukas Reschke | 2013-02-16 | 1 | -0/+1 | |
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a trivial fix for a regression caused by #1648 | |||||
| * | / / / / / / / / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-16 | 11 | -3/+44 | |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #1683 from owncloud/ie-fixes | Jan-Christoph Borchardt | 2013-02-15 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IE fixes | |||||
| | * | | | | | | | | | | | | | always show checkbox when selected, also in IE8, fix #1621 | Jan-Christoph Borchardt | 2013-02-14 | 1 | -0/+5 | |
| | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | check if glob() returns any results, fix for stable45 was already approved ↵ | Björn Schießle | 2013-02-15 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by pull request #1695 | |||||
| * | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-15 | 37 | -28/+73 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #1662 from owncloud/style-cleanup | Bart Visscher | 2013-02-14 | 16 | -44/+44 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | Style cleanup | |||||
| | * | | | | | | | | | | | | Fix NoSpaceAfterComma and SpaceBeforeComma | Bart Visscher | 2013-02-14 | 13 | -34/+34 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Fix indentation style | Bart Visscher | 2013-02-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Fix SpaceBeforeOpenBrace errors | Bart Visscher | 2013-02-14 | 7 | -9/+9 | |
| | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | fixing javascript errors IE8 in personal settings | Thomas Mueller | 2013-02-14 | 1 | -2/+2 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #1682 from owncloud/fix-ie8-master | Bart Visscher | 2013-02-14 | 1 | -7/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ie8 master | |||||
| | * | | | | | | | | | | | | fixing undefined originalEvent | Thomas Mueller | 2013-02-14 | 1 | -7/+6 | |
| | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | improved description of the trash bin app | Björn Schießle | 2013-02-14 | 1 | -2/+2 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | call 'Trash bin' 'Deleted files' | Björn Schießle | 2013-02-14 | 1 | -1/+1 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-14 | 14 | -2/+100 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #1598 from owncloud/fixing-1424-master | Thomas Müller | 2013-02-13 | 3 | -6/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing 1424 master | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fixing-1424-master | Thomas Mueller | 2013-02-13 | 44 | -32/+321 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: settings/js/users.js | |||||
| | * | | | | | | | | | | | | https://github.com/owncloud/core/pull/1598#discussion_r2976684 | Thomas Mueller | 2013-02-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | introduce new virtual method hasUserListings() to determine if a user ↵ | Thomas Mueller | 2013-02-11 | 3 | -0/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backend can list it's users. |