Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4015 from owncloud/fixing-4005-master | Jörn Friedrich Dreyer | 2013-07-11 | 3 | -6/+14 |
|\ | |||||
| * | - eventsource.php: in case of potential CSRF attack we send an error message ... | Thomas Müller | 2013-07-11 | 3 | -6/+14 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-11 | 558 | -1386/+1760 |
|/ | |||||
* | Merge pull request #3978 from owncloud/forwarding-emitter | icewind1991 | 2013-07-10 | 3 | -1/+125 |
|\ | |||||
| * | forward previously registerd hooks | Robin Appelman | 2013-07-08 | 3 | -1/+21 |
| * | add forwarding emitter for agregating multiple emitters | Robin Appelman | 2013-07-08 | 2 | -0/+104 |
* | | Merge pull request #3985 from owncloud/cookie-past2 | Morris Jobke | 2013-07-10 | 1 | -3/+3 |
|\ \ | |||||
| * | | Set path in cookie. | Thomas Tanghus | 2013-07-09 | 1 | -3/+3 |
| * | | apply @LukasReschke's cookie changes, hopefully finally fix #854 | Jan-Christoph Borchardt | 2013-07-09 | 1 | -3/+3 |
* | | | Merge pull request #3990 from owncloud/size-mb | Jan-Christoph Borchardt | 2013-07-10 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | add MB indicator to size heading, fix #3987 | Jan-Christoph Borchardt | 2013-07-10 | 1 | -1/+1 |
* | | | | Merge pull request #4002 from owncloud/use_OC_in_settings_js | Morris Jobke | 2013-07-10 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Use OC instead of oc to show alert at an error. | kondou | 2013-07-10 | 1 | -1/+1 |
* | | | | | Merge pull request #4003 from owncloud/use_close_png_instead_of_delete_png_fo... | Morris Jobke | 2013-07-10 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Close.png instead of delete.png for close dialogs | kondou | 2013-07-10 | 2 | -2/+2 |
| |/ / / / | |||||
* | | | | | LDAP: even better check for emptiness, fixes #3815 | Arthur Schiwon | 2013-07-10 | 1 | -8/+19 |
* | | | | | Merge pull request #3994 from owncloud/fix_oracle_setup | Jörn Friedrich Dreyer | 2013-07-10 | 1 | -4/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | General fixes | Victor Dubiniuk | 2013-07-10 | 1 | -4/+4 |
| |/ / / | |||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-10 | 540 | -2546/+2571 |
|/ / / | |||||
* | | | Merge pull request #3787 from mvn23/patch-1 | mvn23 | 2013-07-09 | 1 | -0/+16 |
|\ \ \ | |||||
| * | | | Reviewed code for X-Sendfile2 | mvn23 | 2013-06-20 | 1 | -12/+12 |
| * | | | Revert most changes for testing | mvn23 | 2013-06-20 | 1 | -11/+13 |
| * | | | Update files.php | mvn23 | 2013-06-19 | 1 | -2/+4 |
| * | | | Implement X-Sendfile2 for resume support in LigHTTPd | mvn23 | 2013-06-19 | 1 | -1/+13 |
* | | | | Merge pull request #3943 from owncloud/encode_uri_component | VicDeo | 2013-07-09 | 8 | -16/+48 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Add unit test | Victor Dubiniuk | 2013-07-09 | 1 | -0/+6 |
| * | | | Encode current trashbin directory | Victor Dubiniuk | 2013-07-09 | 1 | -3/+6 |
| * | | | Migrate to encodePath | Victor Dubiniuk | 2013-07-09 | 4 | -12/+6 |
| * | | | Implement encodePath | Victor Dubiniuk | 2013-07-09 | 2 | -1/+30 |
|/ / / | |||||
* | | | Merge pull request #3980 from owncloud/try-permissions-hook-again | Jörn Friedrich Dreyer | 2013-07-09 | 1 | -9/+11 |
|\ \ \ | |||||
| * | | | Only emit permissions hook for files and and include path | Michael Gapczynski | 2013-07-08 | 1 | -9/+11 |
* | | | | Merge pull request #3920 from owncloud/Fixing_search_ie8 | Jörn Friedrich Dreyer | 2013-07-09 | 2 | -2/+10 |
|\ \ \ \ | |||||
| * | | | | Fallback to border instead of box-shadow | Victor Dubiniuk | 2013-07-02 | 1 | -0/+4 |
| * | | | | Fix lazy styles loading in IE8 | Victor Dubiniuk | 2013-07-02 | 1 | -2/+6 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-09 | 604 | -2671/+2886 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #3977 from owncloud/enable_oracle_in_autotests | Thomas Müller | 2013-07-08 | 2 | -3/+2 |
|\ \ \ \ | |||||
| * | | | | requires fixes in 3rdparty mdb2 | Jörn Friedrich Dreyer | 2013-07-08 | 1 | -0/+0 |
| * | | | | enable oracle testing by default | Jörn Friedrich Dreyer | 2013-07-08 | 1 | -3/+2 |
* | | | | | Merge pull request #3963 from owncloud/update-logic-split | icewind1991 | 2013-07-08 | 3 | -147/+161 |
|\ \ \ \ \ | |||||
| * | | | | | fix typo | Robin Appelman | 2013-07-08 | 1 | -2/+2 |
| * | | | | | Updater: pass update url as argument to update check | Robin Appelman | 2013-07-06 | 2 | -6/+6 |
| * | | | | | split upgrade logic from ajax file | Robin Appelman | 2013-07-06 | 3 | -146/+160 |
* | | | | | | Merge pull request #3979 from owncloud/permissions-hook | Jörn Friedrich Dreyer | 2013-07-08 | 1 | -0/+9 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Add update permissions hook to sharing | Michael Gapczynski | 2013-07-08 | 1 | -0/+9 |
|/ / / / / | |||||
* | | | | | Merge pull request #3954 from owncloud/update_insertifnotexist_and_test | Thomas Müller | 2013-07-08 | 2 | -20/+17 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | update comment | Jörn Friedrich Dreyer | 2013-07-05 | 1 | -1/+1 |
| * | | | | fix insertIfNotExist return value, update doc and corresponding test | Jörn Friedrich Dreyer | 2013-07-05 | 2 | -19/+16 |
* | | | | | Merge pull request #3757 from owncloud/icon-cleanup | Jan-Christoph Borchardt | 2013-07-08 | 18 | -29/+27 |
|\ \ \ \ \ | |||||
| * | | | | | change delete from entry forbidden sign to proper icon | Jan-Christoph Borchardt | 2013-07-05 | 2 | -3/+10 |
| * | | | | | Optimize pictures with optipng and scour | kondou | 2013-06-21 | 5 | -217/+9 |