Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8264 from owncloud/app-enable-by-group | icewind1991 | 2014-06-03 | 1 | -3/+4 |
|\ | |||||
| * | remove +3 in multiselect.js | Thomas Müller | 2014-06-03 | 1 | -3/+3 |
| * | Trigger change event on multiselect change | Robin Appelman | 2014-06-03 | 1 | -0/+1 |
* | | Merge pull request #8577 from owncloud/apps-sidebar-narrower | Morris Jobke | 2014-06-03 | 1 | -2/+2 |
|\ \ | |||||
| * | | reduce width of app sidebar a bit | Jan-Christoph Borchardt | 2014-06-03 | 1 | -2/+2 |
* | | | Merge pull request #8843 from owncloud/design-detail-sharedropdown | Morris Jobke | 2014-06-03 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | fix positioning issue of share dropdown in intermediate widths | Jan-Christoph Borchardt | 2014-06-03 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #8827 from owncloud/add-sqlite-info | Thomas Müller | 2014-06-03 | 3 | -3/+10 |
|\ \ \ | |||||
| * | | | add info about sqlite on setup apge | Morris Jobke | 2014-06-02 | 3 | -3/+10 |
* | | | | Merge pull request #7151 from owncloud/user-jquery | Thomas Müller | 2014-06-03 | 2 | -1/+2 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | cleanup | Arthur Schiwon | 2014-06-02 | 1 | -1/+0 |
| * | | | refactor delete handling and apply it to users and groups | Arthur Schiwon | 2014-06-02 | 1 | -0/+1 |
| * | | | add Last Login column | Arthur Schiwon | 2014-06-02 | 1 | -0/+1 |
| * | | | Splits Controls overlap in files and users. | raghunayyar | 2014-06-02 | 1 | -1/+4 |
| * | | | resolve conflicts while picking c0fb623 | raghunayyar | 2014-06-02 | 1 | -4/+1 |
* | | | | Merge pull request #7485 from owncloud/scrutinizer_fix_1_kondou | Morris Jobke | 2014-06-03 | 16 | -79/+166 |
|\ \ \ \ | |||||
| * | | | | Fix a typo | kondou | 2014-06-02 | 1 | -1/+1 |
| * | | | | Add some more spaces for operators | kondou | 2014-06-02 | 1 | -4/+4 |
| * | | | | Some readability improvements | kondou | 2014-06-02 | 2 | -3/+3 |
| * | | | | Scrutinizer cleanup | kondou | 2014-06-02 | 16 | -79/+166 |
| | |/ / | |/| | | |||||
* | | | | move Help section from controls bar to sidebar | Jan-Christoph Borchardt | 2014-06-02 | 1 | -9/+0 |
* | | | | Merge pull request #8820 from owncloud/design-details | Frank Karlitschek | 2014-06-02 | 5 | -9/+21 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | fix unit tests after introduction of animations - adds delays for click trigger | Morris Jobke | 2014-06-02 | 1 | -0/+7 |
| * | | | move Deleted Files to bottom of sidebar | Jan-Christoph Borchardt | 2014-06-02 | 1 | -0/+1 |
| * | | | add OC.menuSpeed to control the animation speed of menu toggle | Morris Jobke | 2014-06-02 | 1 | -7/+8 |
| * | | | Adds Animation to Toggling Navigation on < 768px widths | raghunayyar | 2014-06-02 | 1 | -4/+4 |
| * | | | shift files app breadcrumbs to account for missing app list | Jan-Christoph Borchardt | 2014-06-02 | 1 | -1/+4 |
| * | | | fix height of select boxes for OS X | Jan-Christoph Borchardt | 2014-06-02 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #8812 from josh4trunks/avatar_rotate | Vincent Petry | 2014-06-02 | 1 | -7/+12 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Automatically Rotate Avatar based on exif data | josh4trunks | 2014-06-01 | 1 | -7/+12 |
* | | | Merge pull request #8613 from owncloud/filesize-alignment | Morris Jobke | 2014-06-02 | 2 | -1/+22 |
|\ \ \ | |_|/ |/| | | |||||
| * | | display "<1 kB" for really small files | Morris Jobke | 2014-06-02 | 2 | -1/+22 |
| |/ | |||||
* | | Merge pull request #8718 from owncloud/share_icons_for_shared_by | Vincent Petry | 2014-06-02 | 1 | -13/+31 |
|\ \ | |||||
| * | | add share icons for folders shared by the current user | Bjoern Schiessle | 2014-05-30 | 1 | -13/+31 |
* | | | Merge pull request #8443 from owncloud/csrf-on-login-and-logout | Vincent Petry | 2014-06-02 | 1 | -0/+3 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into csrf-on-login-and-logout | Thomas Müller | 2014-05-19 | 104 | -280/+1271 |
| |\ \ \ | |||||
| * | | | | Add CSRF check on login and logout | Lukas Reschke | 2014-05-04 | 1 | -0/+3 |
* | | | | | Merge pull request #8187 from owncloud/escape-more-character | Morris Jobke | 2014-06-02 | 2 | -1/+12 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Fix typo | Lukas Reschke | 2014-05-31 | 1 | -1/+1 |
| * | | | | Add unit tests for escapeHTML | Lukas Reschke | 2014-05-28 | 1 | -0/+11 |
| * | | | | Also encode > and ' | Lukas Reschke | 2014-04-13 | 1 | -1/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-02 | 1 | -0/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-01 | 1 | -0/+8 |
* | | | | | Merge pull request #8798 from owncloud/fix-corejs | Vincent Petry | 2014-05-31 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Fix undefined JS on login/setup page | Vincent Petry | 2014-05-30 | 1 | -3/+3 |
| | |_|_|/ | |/| | | | |||||
* / | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-31 | 14 | -4/+120 |
|/ / / / | |||||
* | | | | Fix fileList fallback in OC.Share for outside files app | Vincent Petry | 2014-05-30 | 1 | -3/+10 |
* | | | | Sharing overview fixes and unit tests | Vincent Petry | 2014-05-30 | 1 | -21/+24 |
* | | | | Fix IE8 issue when icon is not defined | Vincent Petry | 2014-05-30 | 1 | -1/+1 |
* | | | | Fixed file actions for sharing views | Vincent Petry | 2014-05-30 | 1 | -6/+18 |