Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | apply @LukasReschke's cookie changes, hopefully finally fix #854 | Jan-Christoph Borchardt | 2013-07-09 | 1 | -3/+3 |
* | 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 |
| * | | | | use history icon in Deleted Files template as well | Jan-Christoph Borchardt | 2013-06-17 | 2 | -2/+2 |
| * | | | | standardize on 32px loading spinner, decrease size in CSS where needed | Jan-Christoph Borchardt | 2013-06-17 | 3 | -0/+7 |
| * | | | | use proper style for add icon | Jan-Christoph Borchardt | 2013-06-17 | 2 | -8/+60 |
| * | | | | remove unused loading spinners, just have one | Jan-Christoph Borchardt | 2013-06-17 | 3 | -2/+2 |
| * | | | | remove unused big images | Jan-Christoph Borchardt | 2013-06-17 | 2 | -0/+0 |
| * | | | | use mail icon consistent with Mail app icon | Jan-Christoph Borchardt | 2013-06-17 | 2 | -6/+94 |
| * | | | | transparent background for lock icon | Jan-Christoph Borchardt | 2013-06-17 | 1 | -0/+0 |
| * | | | | use consistent icon for 'restore'/versions/history, also SVG | Jan-Christoph Borchardt | 2013-06-17 | 2 | -1/+1 |
| * | | | | differentiate delete from close icon | Jan-Christoph Borchardt | 2013-06-17 | 5 | -11/+63 |
* | | | | | Merge pull request #3946 from owncloud/fixing-3942-master | Thomas Müller | 2013-07-08 | 4 | -44/+40 |
|\ \ \ \ \ | |||||
| * | | | | | fixing check if public share is a folder or not | Thomas Müller | 2013-07-06 | 1 | -1/+1 |
| * | | | | | removing unused getSharedItem() | Thomas Müller | 2013-07-06 | 1 | -11/+0 |
| * | | | | | Merge branch 'master' into fixing-3942-master | Thomas Müller | 2013-07-06 | 16 | -173/+287 |
| |\ \ \ \ \ | |||||
| * | | | | | | on reshares we now recursively move to the root of all reshares - therefore s... | Thomas Müller | 2013-07-05 | 3 | -31/+39 |
| * | | | | | | fixing Notice: Undefined index: isPublic | Thomas Müller | 2013-07-05 | 1 | -0/+1 |
| * | | | | | | handle anonymous upload to reshared folder | Thomas Müller | 2013-07-05 | 1 | -0/+5 |
* | | | | | | | Merge https://github.com/owncloud/core/pull/3827 | Björn Schießle | 2013-07-08 | 4 | -17/+27 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-08 | 550 | -1138/+1184 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-07 | 544 | -1227/+1335 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-06 | 693 | -4714/+7173 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #3951 from owncloud/fixing-3936-master | Thomas Müller | 2013-07-05 | 2 | -5/+23 |
|\ \ \ \ \ | |||||
| * | | | | | proper fix for getting the shared item if no user is logged in | Thomas Müller | 2013-07-05 | 2 | -5/+17 |
| * | | | | | php 5.3 compliant now | Thomas Müller | 2013-07-05 | 1 | -1/+2 |
| * | | | | | get the real physical folder name for anonymous upload | Thomas Müller | 2013-07-05 | 1 | -2/+7 |
* | | | | | | Merge pull request #3955 from owncloud/cache-scanner-test | Thomas Müller | 2013-07-05 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Scanner test: ensure mtime in the cache is the same as on the storage to prev... | Robin Appelman | 2013-07-05 | 1 | -0/+1 |
* | | | | | | | Merge pull request #3958 from owncloud/fixing-3933-master | Thomas Müller | 2013-07-05 | 2 | -76/+82 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | adding tipsy to the upload button showing the max upload and restoring client... | Thomas Müller | 2013-07-05 | 2 | -76/+82 |