Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1379 from owncloud/improved_appsmanagement | Lukas Reschke | 2013-01-31 | 3 | -20/+125 |
|\ | |||||
| * | just return "true" for now | Frank Karlitschek | 2013-01-31 | 1 | -0/+1 |
| * | style fixes | Thomas Mueller | 2013-01-31 | 1 | -21/+21 |
| * | style fixes | Thomas Mueller | 2013-01-31 | 1 | -10/+11 |
| * | remove spaces | Frank Karlitschek | 2013-01-31 | 1 | -1/+1 |
| * | merge master | Frank Karlitschek | 2013-01-30 | 84 | -993/+1462 |
| |\ | |||||
| * | | mark recommended apps. server part not yet fully implemented | Frank Karlitschek | 2013-01-30 | 2 | -0/+9 |
| * | | apps updater is now working | root | 2013-01-30 | 2 | -22/+10 |
| * | | we are getting closer. updating is not working yet. | Frank Karlitschek | 2013-01-21 | 3 | -7/+110 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-31 | 1 | -0/+1 |
* | | | remove some left over comments | Björn Schießle | 2013-01-31 | 1 | -9/+2 |
* | | | add missing brackets | Björn Schießle | 2013-01-31 | 1 | -2/+3 |
* | | | search for display name and uid (with no display name) since it is possible t... | Björn Schießle | 2013-01-31 | 1 | -5/+15 |
* | | | Bumb version number for displayname db upgrade | Robin Appelman | 2013-01-30 | 1 | -1/+1 |
* | | | merge master into filesystem | Robin Appelman | 2013-01-30 | 16 | -8/+284 |
|\ \ \ | |||||
| * | | | Update lib/base.php | irgsmirx | 2013-01-30 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Merge pull request #1308 from TheSFReader/master | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -5/+2 |
| |\ \ | |||||
| | * \ | Merge remote-tracking branch 'refs/remotes/upstream/master' | TheSFReader | 2013-01-26 | 6 | -40/+142 |
| | |\ \ | |||||
| | * \ \ | Merge remote-tracking branch 'refs/remotes/upstream/master' | TheSFReader | 2013-01-25 | 36 | -39/+176 |
| | |\ \ \ | |||||
| | * | | | | Simplify the code and remove a first unnecessary (and non conform) '&' chara... | TheSFReader | 2013-01-25 | 1 | -5/+2 |
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-30 | 3 | -0/+3 |
| * | | | | | Merge pull request #1360 from owncloud/display_name | Lukas Reschke | 2013-01-29 | 10 | -2/+277 |
| |\ \ \ \ \ | |||||
| | * | | | | | only change display name if the display name from the current user was change... | Björn Schießle | 2013-01-29 | 1 | -1/+3 |
| | * | | | | | version dump to trigger db update | Björn Schießle | 2013-01-29 | 1 | -1/+1 |
| | * | | | | | remove dubug value | Björn Schießle | 2013-01-29 | 1 | -1/+1 |
| | * | | | | | Typo | Arthur Schiwon | 2013-01-29 | 1 | -58/+58 |
| | * | | | | | Adjust user interface to additions around displayName Handling | Arthur Schiwon | 2013-01-29 | 1 | -0/+15 |
| | * | | | | | search display name instead of uid; fix key/value order for array access | Björn Schießle | 2013-01-28 | 1 | -1/+1 |
| | * | | | | | implement DisplayNamesInGroup for database back-end | Björn Schießle | 2013-01-28 | 5 | -7/+37 |
| | * | | | | | implement display names for the database back-end | Björn Schießle | 2013-01-28 | 1 | -0/+34 |
| | * | | | | | update the display name for the database back-end | Björn Schießle | 2013-01-28 | 1 | -0/+18 |
| | * | | | | | interface and API to change display names | Björn Schießle | 2013-01-28 | 2 | -2/+19 |
| | * | | | | | prepare user table to show and edit display names | Björn Schießle | 2013-01-28 | 1 | -1/+1 |
| | * | | | | | change order, key -> uid and value -> display name, this way it is also possi... | Björn Schießle | 2013-01-28 | 1 | -2/+2 |
| | * | | | | | use display name to show share_width and owner information | Björn Schießle | 2013-01-25 | 1 | -0/+9 |
| | * | | | | | allow to get the display name from an abitrary user | Björn Schießle | 2013-01-25 | 2 | -4/+6 |
| | * | | | | | get all display names from users in a given group | Björn Schießle | 2013-01-25 | 5 | -6/+53 |
| | * | | | | | get all display names | Björn Schießle | 2013-01-25 | 3 | -0/+43 |
| | * | | | | | add display name to title instead if login-ID | Björn Schießle | 2013-01-24 | 1 | -1/+1 |
| | * | | | | | new branch which introduces display names | Björn Schießle | 2013-01-24 | 3 | -2/+60 |
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-29 | 1 | -0/+1 |
* | | | | | | | Cache: don't insert duplicated during upgrade | Robin Appelman | 2013-01-30 | 1 | -5/+18 |
* | | | | | | | Make zip downloads use actual folder names, fix spelling mistakes | Michael Gapczynski | 2013-01-28 | 1 | -6/+9 |
* | | | | | | | merge master into filesystem | Robin Appelman | 2013-01-28 | 4 | -9/+8 |
|\| | | | | | | |||||
| * | | | | | | Fix phpdoc | Robin Appelman | 2013-01-28 | 1 | -2/+2 |
| * | | | | | | Merge pull request #1313 from owncloud/updater-CSP | Lukas Reschke | 2013-01-28 | 1 | -2/+4 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into updater-CSP | Thomas Mueller | 2013-01-28 | 8 | -10/+36 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Move update inline JS | Lukas Reschke | 2013-01-25 | 1 | -0/+1 |
| | * | | | | | | | Move checkMaintenance and checkUpgrade | Lukas Reschke | 2013-01-25 | 1 | -2/+3 |
| * | | | | | | | | Merge pull request #1318 from j-ed/master | Thomas Müller | 2013-01-28 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | |