Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge master into ocs_api, fix conflicts. | Tom Needham | 2012-12-14 | 248 | -1940/+3296 |
|\ | |||||
| * | Give also hint about possible conflicts in the user_webdavauth description | Arthur Schiwon | 2012-12-14 | 1 | -1/+3 |
| * | Also show a more prominent warning when php_ldap is not installed | Arthur Schiwon | 2012-12-14 | 1 | -0/+3 |
| * | Show conflict warning when user_ldap and user_webdavauth are enabled | Arthur Schiwon | 2012-12-14 | 1 | -0/+4 |
| * | Show conflict warning when user_ldap and user_webdavauth are enabled | Arthur Schiwon | 2012-12-14 | 3 | -1/+11 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-14 | 5 | -0/+8 |
| * | fix mimetype icons for new files | Robin Appelman | 2012-12-13 | 1 | -1/+1 |
| * | Merge pull request #855 from owncloud/ungreenify | blizzz | 2012-12-13 | 1 | -12/+2 |
| |\ | |||||
| | * | ungreenify new & upload buttons | Jan-Christoph Borchardt | 2012-12-13 | 1 | -12/+2 |
| * | | Merge pull request #584 from wardragon/ldap_access_userExists_fix | blizzz | 2012-12-12 | 1 | -3/+3 |
| |\ \ | |||||
| | * | | Exclude LDAP backend from global user searches | Lorenzo M. Catucci | 2012-12-07 | 1 | -3/+3 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-13 | 23 | -0/+93 |
| | |/ | |/| | |||||
| * | | Merge pull request #810 from owncloud/send-share-link-by-email | Thomas Müller | 2012-12-12 | 1 | -3/+1 |
| |\ \ | |||||
| | * | | moving sharing email code to core | Thomas Mueller | 2012-12-10 | 2 | -64/+1 |
| | * | | restoring feature to send sharing link via email | Thomas Mueller | 2012-12-10 | 2 | -1/+62 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-12 | 2 | -0/+2 |
| * | | | Merge pull request #813 from owncloud/check_external_dependencies | Thomas Müller | 2012-12-11 | 4 | -59/+104 |
| |\ \ \ | |||||
| | * | | | ctor of OC_L10N requires the app name | Thomas Mueller | 2012-12-11 | 1 | -1/+1 |
| | * | | | don't call shell_exec if safe_mode is on. | Frank Karlitschek | 2012-12-11 | 1 | -2/+6 |
| | * | | | disable not available external filesystems. Restructure the configuration a b... | Frank Karlitschek | 2012-12-10 | 1 | -59/+66 |
| | * | | | add some output why some of the external filesystems might not work | Frank Karlitschek | 2012-12-10 | 4 | -1/+35 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-11 | 1 | -0/+2 |
| |/ / / | |||||
| * / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-10 | 6 | -76/+76 |
| |/ / | |||||
| * | | Merge pull request #282 from butonic/fix_new_and_upload_button_html_css | Thomas Müller | 2012-12-09 | 4 | -63/+75 |
| |\ \ | |||||
| | * | | cleanup CSS whitespace and remove extra input[type='checkbok'] | Jörn Friedrich Dreyer | 2012-12-07 | 1 | -12/+13 |
| | * | | fix svg -> png replacement for android, cleanup and remove obsolete css | Jörn Friedrich Dreyer | 2012-12-07 | 3 | -39/+38 |
| | * | | fix new li icons jumping when replacing p with input | Jörn Friedrich Dreyer | 2012-12-07 | 1 | -2/+4 |
| | * | | add IE9 CSS checkbox fixes | Jörn Friedrich Dreyer | 2012-12-07 | 3 | -14/+19 |
| | * | | upload button HTML, CSS & JS cleanup | Jörn Friedrich Dreyer | 2012-12-07 | 4 | -27/+19 |
| | * | | rmeove vendor prefix for box-shadow | Jörn Friedrich Dreyer | 2012-12-07 | 1 | -2/+0 |
| | * | | fix_new_and_upload_button_html_css | Jörn Friedrich Dreyer | 2012-12-07 | 2 | -12/+27 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-09 | 3 | -0/+8 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-08 | 1 | -11/+11 |
| |/ / | |||||
| * | | Merge pull request #640 from esthepiking/master | Thomas Müller | 2012-12-06 | 3 | -0/+167 |
| |\ \ | |||||
| | * | | Code clean up | Erik Sargent | 2012-12-05 | 1 | -203/+147 |
| | * | | Remove rename | Erik Sargent | 2012-12-04 | 1 | -4/+4 |
| | * | | event.ctrlKey | Erik Sargent | 2012-11-30 | 1 | -1/+2 |
| | * | | event.ctrlKey | Erik Sargent | 2012-11-30 | 1 | -3/+7 |
| | * | | ctrl issue fix | Erik Sargent | 2012-11-30 | 1 | -1/+1 |
| | * | | Cleanup | Erik Sargent | 2012-11-29 | 1 | -26/+51 |
| | * | | documentation | Erik Sargent | 2012-11-29 | 1 | -10/+6 |
| | * | | cleanup | Erik Sargent | 2012-11-29 | 1 | -89/+123 |
| | * | | Rename | Erik Sargent | 2012-11-28 | 1 | -6/+44 |
| | * | | Enter | Erik Sargent | 2012-11-28 | 1 | -1/+11 |
| | * | | Arrow key navigation | Erik Sargent | 2012-11-28 | 1 | -10/+55 |
| | * | | Keys array | Erik Sargent | 2012-11-28 | 1 | -9/+16 |
| | * | | keycode naming | Erik Sargent | 2012-11-28 | 1 | -8/+17 |
| | * | | no message | Erik Sargent | 2012-11-28 | 3 | -3/+3 |
| | * | | initial setup | Erik Sargent | 2012-11-28 | 1 | -0/+52 |
| | * | | initial setup | Erik Sargent | 2012-11-28 | 1 | -0/+1 |