Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | LDAP: specify appid when selecting from appconfig | Arthur Schiwon | 2013-03-19 | 1 | -1/+2 |
* | Merge pull request #2440 from owncloud/js_version_parameter | Bernhard Posselt | 2013-03-19 | 1 | -4/+5 |
|\ | |||||
| * | Add hashed version parameter to js and css. Ref #1520 and many more ;) | Thomas Tanghus | 2013-03-19 | 1 | -4/+5 |
|/ | |||||
* | Merge pull request #2433 from owncloud/db_primary_keys | Bernhard Posselt | 2013-03-19 | 2 | -1/+55 |
|\ | |||||
| * | Add indexes and primary keys. | Thomas Tanghus | 2013-03-19 | 2 | -1/+55 |
| * | Revert "Add indexes and primary keys." | Thomas Tanghus | 2013-03-19 | 2 | -55/+1 |
| * | Add indexes and primary keys. | Thomas Tanghus | 2013-03-19 | 2 | -1/+55 |
* | | Merge pull request #2434 from owncloud/userlist_no_dupes | Bernhard Posselt | 2013-03-19 | 1 | -15/+65 |
|\ \ | |/ |/| | |||||
| * | User list: Avoid dupes and better sorting. Fix #2420 | Thomas Tanghus | 2013-03-19 | 1 | -15/+65 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-19 | 27 | -311/+458 |
* | Merge pull request #2363 from owncloud/uploadsize | Bernhard Posselt | 2013-03-18 | 4 | -5/+22 |
|\ | |||||
| * | Don't show storage space warning when the free space can't be determined | Robin Appelman | 2013-03-15 | 1 | -2/+10 |
| * | Don't block uploads if the max upload size is unknown | Robin Appelman | 2013-03-15 | 2 | -2/+4 |
| * | Improve handeling of unlimited max upload size | Robin Appelman | 2013-03-15 | 3 | -2/+9 |
* | | Merge pull request #2408 from dcneiner/infield-upgrade | Jan-Christoph Borchardt | 2013-03-18 | 2 | -36/+51 |
|\ \ | |||||
| * | | Upgraded infield labels plugin to the latest version. Updated invocation to o... | Doug Neiner | 2013-03-17 | 2 | -36/+51 |
* | | | Merge pull request #2417 from owncloud/trash_more_error_logs | Thomas Tanghus | 2013-03-18 | 2 | -0/+3 |
|\ \ \ | |||||
| * | | | add some error logs to the trash bin app | Björn Schießle | 2013-03-18 | 2 | -0/+3 |
|/ / / | |||||
* | | | Merge pull request #2411 from owncloud/fix_magicquotes | Frank Karlitschek | 2013-03-18 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | remove deprecated call | Frank Karlitschek | 2013-03-17 | 1 | -2/+2 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-18 | 30 | -77/+2502 |
* | | Merge pull request #2204 from owncloud/chache_updater_rename | Frank Karlitschek | 2013-03-17 | 2 | -12/+36 |
|\ \ | |||||
| * | | Cache: better rename hook for cache updater | Robin Appelman | 2013-03-08 | 2 | -12/+36 |
* | | | Merge pull request #2387 from owncloud/cron-session-close | Thomas Müller | 2013-03-16 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Close sessions when doing background jobs | Robin Appelman | 2013-03-17 | 1 | -0/+2 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-17 | 11 | -11/+11 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-16 | 89 | -1453/+1524 |
* | | | Merge pull request #2380 from henningoschwald/76bb5221c7a1b71f0d617c55e844c51... | Bernhard Posselt | 2013-03-16 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Restores keyboard accessibility for expandable settings area. | Henning Oschwald | 2013-03-16 | 1 | -1/+1 |
* | | | | Merge pull request #2383 from owncloud/error-handling-upgrade | Bernhard Posselt | 2013-03-16 | 1 | -16/+24 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Add error handling to the file cache upgrade | Michael Gapczynski | 2013-03-16 | 1 | -16/+24 |
* | | | | Merge pull request #2322 from PHLAK/master | Jan-Christoph Borchardt | 2013-03-16 | 3 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Added 3rdparty folder as a git submodule | Chris Kankiewicz | 2013-03-14 | 3 | -1/+3 |
* | | | | | Merge pull request #2360 from sherbrecher/master | Lukas Reschke | 2013-03-15 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'upstream/master' | sherbrecher | 2013-03-15 | 3353 | -381397/+213437 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #2350 from aschoenebeck/ignore_blacklisted_files | Bernhard Posselt | 2013-03-15 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Filter display of blacklisted files | Andreas Schönebeck | 2013-03-15 | 1 | -0/+1 |
* | | | | | | Merge pull request #2320 from ceri/master | Frank Karlitschek | 2013-03-15 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Correct emails when folders are shared. | Ceri Davies | 2013-03-14 | 1 | -2/+2 |
* | | | | | | | remove backticks around table names | Björn Schießle | 2013-03-15 | 1 | -3/+3 |
* | | | | | | | add backtick for db queries to prevent postgresql errors | Björn Schießle | 2013-03-15 | 1 | -3/+3 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #2336 from eMerzh/fix_trashpg | Björn Schießle | 2013-03-15 | 2 | -12/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add backtick for trash app to prevent pg errors | Brice Maron | 2013-03-15 | 2 | -12/+12 |
* | | | | | | | Merge pull request #2317 from owncloud/create_version_on_upload | Frank Karlitschek | 2013-03-15 | 1 | -3/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix var name | Björn Schießle | 2013-03-14 | 1 | -2/+2 |
| * | | | | | | | fix var name | Björn Schießle | 2013-03-14 | 1 | -1/+1 |
| * | | | | | | | create new version if the same file is uploaded again over the web interface | Björn Schießle | 2013-03-14 | 1 | -3/+10 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-15 | 51 | -484/+620 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #2318 from owncloud/unkown-freespace | Bernhard Posselt | 2013-03-14 | 1 | -1/+5 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Return unknown freespace if the free_space call failed | Robin Appelman | 2013-03-14 | 1 | -1/+5 |
|/ / / / / |