Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge master into oc_preview | Georg Ehrke | 2013-08-29 | 3 | -22/+14 |
|\ | |||||
| * | backport of #4357 to master | Thomas Müller | 2013-08-27 | 1 | -3/+7 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-27 | 1 | -0/+7 |
| * | kill zh_CN.GB2312 | Thomas Müller | 2013-08-27 | 1 | -19/+0 |
* | | Merge master into oc_preview | Georg Ehrke | 2013-08-26 | 1 | -0/+6 |
|\| | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-25 | 1 | -0/+6 |
* | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-08-23 | 3 | -4/+11 |
|\| | |||||
| * | Merge pull request #4262 from owncloud/fix_jslint_kondou | Christopher | 2013-08-20 | 1 | -3/+3 |
| |\ | |||||
| | * | Merge branch 'master' into fix_jslint_kondou | kondou | 2013-08-18 | 71 | -74/+342 |
| | |\ | |||||
| | * | | Fix a syntax error & have if-conds in an own line | kondou | 2013-08-01 | 1 | -1/+1 |
| | * | | Fix some JSLint warnings | kondou | 2013-07-31 | 1 | -4/+4 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-19 | 1 | -0/+7 |
| * | | | Merge pull request #4467 from owncloud/storage-wrapper-quota | icewind1991 | 2013-08-19 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * \ \ | merge master in storage-wrapper-quota | Robin Appelman | 2013-08-18 | 74 | -74/+375 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | use renamed constants | Robin Appelman | 2013-07-25 | 1 | -1/+1 |
* | | | | | move isMimeSupported out of template files | Georg Ehrke | 2013-08-21 | 1 | -0/+1 |
* | | | | | outsource sharing and deleted files previews to apps | Georg Ehrke | 2013-08-19 | 2 | -0/+90 |
* | | | | | Merge master into oc_preview | Georg Ehrke | 2013-08-19 | 9 | -14/+19 |
|\| | | | | |||||
| * | | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondou | Kondou | 2013-08-18 | 6 | -6/+6 |
| |\ \ \ \ | |||||
| | * | | | | Add _many_ newlines at the end of files | kondou | 2013-08-18 | 6 | -6/+6 |
| | | |/ / | | |/| | | |||||
| * | | | | Use boolean casting for bitwise and result. | Andreas Fischer | 2013-08-17 | 1 | -1/+1 |
| * | | | | Compare result are already true/false | Bart Visscher | 2013-08-17 | 1 | -3/+3 |
| |/ / / | |||||
| * | | | remove ru_RU - fixes #3135 | Thomas Müller | 2013-08-17 | 1 | -5/+0 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-16 | 1 | -0/+7 |
| * | | | Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_fir... | Thomas Müller | 2013-08-15 | 1 | -2/+5 |
| |\ \ \ | |||||
| | * | | | fix #2711 using a custom event, also use css selectors over filterAttr | Jörn Friedrich Dreyer | 2013-08-08 | 1 | -2/+5 |
* | | | | | Merge master into oc_preview | Georg Ehrke | 2013-08-14 | 70 | -71/+255 |
|\| | | | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-13 | 2 | -0/+12 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-09 | 70 | -70/+235 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-07 | 2 | -1/+8 |
| |/ / / | |||||
* | | | | fix js error | Georg Ehrke | 2013-08-07 | 1 | -1/+1 |
* | | | | implement previews of single shared files | Georg Ehrke | 2013-08-07 | 2 | -1/+5 |
* | | | | fix merge conflicts | Georg Ehrke | 2013-08-05 | 16 | -0/+109 |
|\| | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-03 | 1 | -0/+6 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-02 | 2 | -0/+12 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-01 | 10 | -0/+61 |
| | |/ | |/| | |||||
| * | | Merge pull request #4225 from owncloud/better-404 | Thomas Müller | 2013-07-30 | 3 | -0/+30 |
| |\ \ | |||||
| | * | | Use default cursor for list items | Victor Dubiniuk | 2013-07-30 | 1 | -1/+1 |
| | * | | Rewording | Victor Dubiniuk | 2013-07-29 | 1 | -1/+1 |
| | * | | Move styles from core to app | Victor Dubiniuk | 2013-07-29 | 2 | -0/+13 |
| | * | | Allow apps to have own 404 content, closes #3225 | Victor Dubiniuk | 2013-07-29 | 2 | -0/+17 |
* | | | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-07-30 | 1 | -0/+1 |
|\| | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-30 | 1 | -0/+1 |
| |/ / | |||||
* | | | style fixes | Georg Ehrke | 2013-07-30 | 1 | -1/+1 |
* | | | Merge branch 'master' into oc_preview | Thomas Müller | 2013-07-30 | 14 | -6/+19 |
|\| | | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-28 | 1 | -0/+1 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-27 | 1 | -0/+1 |
| |/ | |||||
| * | initialize OC_Defaults in template constructorX | Björn Schießle | 2013-07-24 | 1 | -5/+3 |
| * | Merge branch 'master' into more-themable-strings | Thomas Müller | 2013-07-24 | 9 | -1/+12 |
| |\ | |||||
| | * | Merge branch 'master' into disable-anon-upload-master | Thomas Müller | 2013-07-22 | 6 | -1/+6 |
| | |\ |