summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | | | | pretty print jsonJörn Friedrich Dreyer2013-02-161-1/+1
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | merge master into mountconfigRobin Appelman2013-02-1842-108/+320
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Create new mountconfig files in jsonRobin Appelman2013-02-161-31/+14
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Use a parser to read custom mount configuration instead of including the php ↵Robin Appelman2013-02-161-1/+2
| | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files
| * | | | | | | | | | | | | | | | files_versions no longer contains a personal settings page -> remove the callThomas Mueller2013-02-181-1/+0
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #1759 from owncloud/redirect_fix_1737Thomas Müller2013-02-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | fix redirect, use the new routing
| | * | | | | | | | | | | | | | fix redirect, use the new routingBjörn Schießle2013-02-181-1/+1
| | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | change $_REQUEST to $_POST; fix check if file was successfully deletedBjörn Schießle2013-02-191-5/+6
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | add missing paramenter to post requestBjörn Schießle2013-02-191-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | use instead ofBjörn Schießle2013-02-191-2/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | allow user to delete selected files from the trash bin permanentlyBjörn Schießle2013-02-193-17/+72
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | remove obsolete variablesBjörn Schießle2013-02-191-5/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | close file handler after readdir()Björn Schießle2013-02-181-1/+1
|/ / / / / / / / / / / / / /
* / / / / / / / / / / / / / Sanitize HTMLLukas Reschke2013-02-181-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-189-6/+26
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1709 from owncloud/style-cleanup-files_externalThomas Müller2013-02-172-6/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style cleanup files_external
| * | | | | | | | | | | | | Join split translated stringsBart Visscher2013-02-151-6/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Style cleanup files_externalBart Visscher2013-02-152-6/+19
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1708 from owncloud/style-cleanup-user_ldapBernhard Posselt2013-02-179-69/+206
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style cleanup user_ldap
| * | | | | | | | | | | | | Join split translated stringsBart Visscher2013-02-152-13/+6
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Join short comment linesBart Visscher2013-02-151-4/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Style cleanup user_ldapBart Visscher2013-02-149-72/+218
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' into fix-googledriveThomas Mueller2013-02-17108-136/+640
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #1699 from owncloud/multiselect-bar-fixThomas Müller2013-02-171-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix multiselect bar offset on shared page, close #1339 finally
| | * | | | | | | | | | | | | | fix multiselect bar offset on shared page, close #1339 finallyJan-Christoph Borchardt2013-02-141-0/+1
| | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge pull request #1730 from owncloud/ldap_fix_warningsThomas Müller2013-02-171-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 indexArthur Schiwon2013-02-161-1/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-178-21/+24
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #1729 from owncloud/fix_1727Frank Karlitschek2013-02-161-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixe...
| | * | | | | | | | | | | | | | | LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixes #1727Arthur Schiwon2013-02-161-2/+5
| | |/ / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / Add missing requesttokenLukas Reschke2013-02-161-0/+1
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a trivial fix for a regression caused by #1648
| * | / / / / / / / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-02-1611-3/+44
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1683 from owncloud/ie-fixesJan-Christoph Borchardt2013-02-151-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IE fixes
| | * | | | | | | | | | | | | always show checkbox when selected, also in IE8, fix #1621Jan-Christoph Borchardt2013-02-141-0/+5
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | check if glob() returns any results, fix for stable45 was already approved ↵Björn Schießle2013-02-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by pull request #1695
| * | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-1537-28/+73
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1662 from owncloud/style-cleanupBart Visscher2013-02-1416-44/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | Style cleanup
| | * | | | | | | | | | | | Fix NoSpaceAfterComma and SpaceBeforeCommaBart Visscher2013-02-1413-34/+34
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fix indentation styleBart Visscher2013-02-141-1/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fix SpaceBeforeOpenBrace errorsBart Visscher2013-02-147-9/+9
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | fixing javascript errors IE8 in personal settingsThomas Mueller2013-02-141-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1682 from owncloud/fix-ie8-masterBart Visscher2013-02-141-7/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ie8 master
| | * | | | | | | | | | | | fixing undefined originalEventThomas Mueller2013-02-141-7/+6
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | improved description of the trash bin appBjörn Schießle2013-02-141-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | call 'Trash bin' 'Deleted files'Björn Schießle2013-02-141-1/+1
| |/ / / / / / / / / / /
| * | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-1414-2/+100
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #1598 from owncloud/fixing-1424-masterThomas Müller2013-02-133-6/+20
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing 1424 master
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fixing-1424-masterThomas Mueller2013-02-1344-32/+321
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: settings/js/users.js
| | * | | | | | | | | | | | https://github.com/owncloud/core/pull/1598#discussion_r2976684Thomas Mueller2013-02-121-1/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | introduce new virtual method hasUserListings() to determine if a user ↵Thomas Mueller2013-02-113-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backend can list it's users.