Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-05 | 135 | -1069/+950 |
|\ | |||||
| * | Merge pull request #242 from fmms/checkstyle05 | Thomas Müller | 2012-11-05 | 41 | -638/+632 |
| |\ | |||||
| | * | Style: The last two spaces | Felix Moeller | 2012-11-04 | 2 | -2/+2 |
| | * | Style: Remove all the dangling white spaces | Felix Moeller | 2012-11-04 | 21 | -58/+58 |
| | * | Style: Different line endings in one file are bad for sure | Felix Moeller | 2012-11-04 | 1 | -42/+42 |
| | * | Checkstyle: Fix the last two InvalidEOLChar | Felix Moeller | 2012-11-04 | 2 | -500/+500 |
| | * | Checkstyle: Fix last six NewlineBeforeOpenBrace | Felix Moeller | 2012-11-04 | 5 | -12/+6 |
| | * | Checkstyle: fix the last NoSpaceAfterEquals | Felix Moeller | 2012-11-04 | 1 | -1/+1 |
| | * | Checkstyle: Fix the last 25 NoSpaceAfterComma | Felix Moeller | 2012-11-04 | 14 | -25/+25 |
| | * | Checkstyle: Fix the last two SpaceBeforeOpenBrace | Felix Moeller | 2012-11-04 | 2 | -2/+2 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-05 | 9 | -31/+31 |
| * | | add a link to the contribution guidelines to make it easier for new people | Frank Karlitschek | 2012-11-04 | 1 | -1/+2 |
| * | | Merge pull request #200 from owncloud/ldap | Lukas Reschke | 2012-11-04 | 1 | -6/+6 |
| |\ \ | | |/ | |/| | |||||
| | * | merge from master | Arthur Schiwon | 2012-11-04 | 271 | -3597/+3632 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #238 from fmms/checkstyle04 | Thomas Müller | 2012-11-04 | 95 | -297/+297 |
| |\ \ | |||||
| | * | | Checkstyle fixes: NoSpaceAfterComma | Felix Moeller | 2012-11-04 | 84 | -251/+251 |
| | * | | Checkstyle fixes for SpaceBeforeOpenBrace | Felix Moeller | 2012-11-04 | 23 | -46/+46 |
| * | | | Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession | Lukas Reschke | 2012-11-04 | 10 | -129/+14 |
| |\ \ \ | |||||
| | * | | | Change the requesttoken back to OC.EventSource.requesttoken | Lukas Reschke | 2012-10-31 | 1 | -1/+1 |
| | * | | | Create only one CSRF token per session | Lukas Reschke | 2012-10-31 | 9 | -128/+13 |
| * | | | | Remove uneeded debug output | Lukas Reschke | 2012-11-04 | 1 | -1/+0 |
| | |/ / | |/| | | |||||
| | | * | code style | Arthur Schiwon | 2012-11-02 | 1 | -1/+1 |
| | | * | LDAP: clear the cache not only when TTL changes, but with every settings upda... | Arthur Schiwon | 2012-11-01 | 1 | -6/+6 |
* | | | | Swap expected and actual. | Thomas Tanghus | 2012-11-04 | 1 | -1/+1 |
* | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-04 | 239 | -3281/+3444 |
|\| | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-04 | 29 | -96/+135 |
| * | | | check for filename blacklist in OC_Filesystem::isValidPath | Robin Appelman | 2012-11-03 | 2 | -5/+11 |
| * | | | some tests for the file blacklist | Robin Appelman | 2012-11-03 | 1 | -8/+42 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-03 | 104 | -306/+422 |
| * | | | Merge pull request #220 from fmms/checkstyle02 | Lukas Reschke | 2012-11-02 | 83 | -430/+430 |
| |\ \ \ | |||||
| | * | | | Checkstyle: many fixes | Felix Moeller | 2012-11-02 | 83 | -430/+430 |
| * | | | | fix inlude path for template test | Robin Appelman | 2012-11-02 | 1 | -1/+1 |
| * | | | | fix OC_Filesystem::isValidPath when using \ instead of / in paths | Robin Appelman | 2012-11-02 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Fix a typo | Lukas Reschke | 2012-11-02 | 1 | -1/+1 |
| * | | | Add CSRF token | Lukas Reschke | 2012-11-02 | 2 | -1/+2 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-02 | 124 | -2534/+2488 |
| * | | | Merge pull request #203 from owncloud/wording-url-link | Lukas Reschke | 2012-11-01 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Files: change wording 'From url' to 'From link' | Jan-Christoph Borchardt | 2012-11-01 | 1 | -1/+1 |
| |/ / / | |||||
| * | / | fix archive tar include path | Robin Appelman | 2012-11-01 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | adapted comments to the code changes | Björn Schießle | 2012-11-01 | 2 | -2/+2 |
| * | | load logging apps for webdav connections | Björn Schießle | 2012-11-01 | 2 | -2/+3 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-01 | 19 | -77/+92 |
* | | | VCategories: Make $categories non-static again. | Thomas Tanghus | 2012-11-04 | 1 | -27/+27 |
* | | | VCategories: Swap expected and actual in unit tests. | Thomas Tanghus | 2012-11-04 | 1 | -4/+4 |
* | | | VCategories: Use correct variable. | Thomas Tanghus | 2012-11-04 | 1 | -1/+1 |
* | | | Update vcategories ajax scripts. | Thomas Tanghus | 2012-11-01 | 3 | -9/+2 |
* | | | Add routes for vcategory favorites. | Thomas Tanghus | 2012-11-01 | 1 | -0/+6 |
* | | | Switch expectation and result in unit tests. | Thomas Tanghus | 2012-10-31 | 1 | -9/+12 |
* | | | Added some more error checking on db queries. | Thomas Tanghus | 2012-10-31 | 1 | -5/+37 |
* | | | Added unit tests for OC_VCategories. | Thomas Tanghus | 2012-10-31 | 1 | -0/+114 |