wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4001 commits 157 branches 562 tags 714 MiB
Commit graph

1953 commits

Author SHA1 Message Date
Frank Karlitschek
2fe646dcec ported the oc_app calls 2012-05-02 00:50:26 +02:00
Frank Karlitschek
93b63cf375 ported the rest of the OC_Helper calls 2012-05-02 00:20:45 +02:00
Frank Karlitschek
e48f511606 port linkto and serverHost 2012-05-01 23:19:39 +02:00
Frank Karlitschek
31e32e3c10 ported checkLoggedIn and checkAdmin 2012-05-01 22:59:38 +02:00
Frank Karlitschek
e2fb094693 some more porting 2012-05-01 21:07:08 +02:00
Frank Karlitschek
ab58471904 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-01 20:07:36 +02:00
Frank Karlitschek
1a2bbd2ee4 ported addSyript and other small stuff 2012-05-01 20:03:41 +02:00
Michael Gapczynski
20f3875f1b Change default from address to sharing-noreply@server for emailing private links 2012-05-01 13:06:17 -04:00
Frank Karlitschek
254b8b9506 porting of OC_User to public API complete. 
What better thing to do during a long train ride than refactoring ;-)
 2012-05-01 19:04:20 +02:00
Frank Karlitschek
70cea18cce ported getUser 2012-05-01 18:50:31 +02:00
Frank Karlitschek
5bf69237b2 ported isLoggedIn 2012-05-01 18:46:15 +02:00
Frank Karlitschek
d0554bef06 finish porting of the LOG calls or the apps to the public api 2012-05-01 17:38:27 +02:00
Frank Karlitschek
3f9ac6405a port some of the log call to the new public api 
more to come
 2012-05-01 14:29:34 +02:00
Arthur Schiwon
51b6aab436 LDAP: remove Notices on settings 2012-05-01 12:25:17 +02:00
Arthur Schiwon
54854b2e3d LDAP: decent behaviour and log message when there is no connection to the LDAP server 2012-05-01 12:17:33 +02:00
Bartek Przybylski
11314c81d9 add/remove handlers 2012-05-01 10:07:48 +02:00
Frank Karlitschek
e8ec999090 port to use the new public api 2012-05-01 09:49:22 +02:00
Frank Karlitschek
e409e7cd4c forgot a file 2012-05-01 09:38:10 +02:00
Thomas Müller
5193ddd7d7 fixing syntax error 2012-04-30 21:55:25 +02:00
Georg Ehrke
8a3d41c043 fix a PHP Notice 2012-04-30 21:46:33 +02:00
Georg Ehrke
6c908a4cd0 fix path in calendars geo.js 2012-04-30 21:18:54 +02:00
Frank Karlitschek
f425b80deb one todo less 2012-04-30 19:21:29 +02:00
Frank Karlitschek
b20b30b6fe Implement a basic versioning configuration. Only a on/off switch for now. 
I changed my mind about the more complex configuration options. We go with good default for now and don´t expose all the technical options to the users.
They can still override in the config file if it´s really really needed and they know what they are doing
 2012-04-30 19:18:00 +02:00
Thomas Mueller
07f2e316e4 removing executable bit from various files 2012-04-30 12:05:57 +02:00
Thomas Tanghus
9c520c70a8 Various file path fixes. 2012-04-30 01:48:01 +02:00
Thomas Tanghus
a8b6fdd396 Contacts: Small css tweaks. 2012-04-30 01:01:24 +02:00
Thomas Tanghus
0bccd9c18c Contacts: Forgot to add the import template. 2012-04-29 23:26:14 +02:00
Thomas Tanghus
f6fefe9a36 Contacts: Ensure TYPE parameters on email aren't deleted on edit. They are still not shown in the UI. 
Remove an obsolute file and did some cleanup.
 2012-04-29 22:12:27 +02:00
Thomas Tanghus
023479b1e2 Contacts: removed unused method and ajax file. 2012-04-29 22:12:27 +02:00
Thomas Tanghus
163344243b jquery.combobox: Added 'showButton' option 2012-04-29 22:12:27 +02:00
Frank Karlitschek
b862c49ae6 enable by default. at least during oC4 testing 2012-04-29 21:18:28 +02:00
Frank Karlitschek
0d0129221b add a info.xml to files 2012-04-29 21:17:22 +02:00
Robin Appelman
84bd83b1dc fix file deletion 2012-04-29 16:09:41 +02:00
NIEK Antoine
c6f034a5d2 Support "songs" ampache API action for proper rhythmbox support 2012-04-29 00:47:57 +02:00
Jan-Christoph Borchardt
afeb9d9cbf moving the file actions properly 2012-04-28 23:11:48 +02:00
Georg Ehrke
bef701c448 add version file to files app 2012-04-28 13:35:05 +02:00
Georg Ehrke
7eb7492360 some fixes for sharing 2012-04-27 23:14:53 +02:00
Bartek Przybylski
72c0d6968e fix duplicated entries on upload 2012-04-27 22:48:27 +02:00
Bart Visscher
6e7f5ec4ce Tasks: Add input to edit the task location 2012-04-27 20:26:12 +02:00
Bart Visscher
c627657fc6 Tasks: Fix the display of the list of tasks 2012-04-27 17:48:08 +02:00
Sam Tuke
a1b309a42a Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-27 13:23:58 +01:00
Georg Ehrke
0aaf6d16a5 Merge branch 'master' into movable_apps_2 2012-04-27 14:22:12 +02:00
Sam Tuke
80c850d018 added revert attempt outcome messages, removed contextual ajax revert button for now as it's not functional, improved readaibility of scripts 2012-04-27 13:19:16 +01:00
Thomas Tanghus
768041b6cb Contacts: Added convinience method for notifications. 2012-04-27 10:35:31 +02:00
Thomas Tanghus
18c11ec81b jquery.combobox: Added 'editable' option and cleaned up a bit. 2012-04-27 10:35:31 +02:00
Thomas Tanghus
1384fdfe01 Contacts: Updated first run page. 2012-04-27 10:35:31 +02:00
Georg Ehrke
f7fb4a54c9 ampache should work now 2012-04-26 22:00:37 +02:00
Georg Ehrke
5fda0e4b3b make *DAV work with movable apps 2012-04-26 21:56:29 +02:00
Georg Ehrke
6930af4c0f Merge branch 'master' into movable_apps_2 2012-04-26 21:27:22 +02:00
Georg Ehrke
78b2da583d move files to the correct place 2012-04-26 21:24:41 +02:00
Sam Tuke
d96e962fc1 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-26 18:45:59 +01:00
Sam Tuke
18a024e251 started implementing ajax file rollback 2012-04-26 18:45:17 +01:00
Georg Ehrke
2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Georg Ehrke
40f95ffdf3 fix security check for the path of the requested file 2012-04-26 17:55:00 +02:00
Sam Tuke
c693ee2adb added available version names to files dropdown menu via new ajax script 2012-04-26 16:48:43 +01:00
Georg Ehrke
0249a72cab fix downloading of files in files app 2012-04-26 17:35:12 +02:00
Michael Gapczynski
754844f5c9 Add ability to send private links from sharing via email 2012-04-26 10:33:24 -04:00
Sam Tuke
6312067ab5 improved styling, called css file in history.php 2012-04-26 14:32:29 +01:00
Georg Ehrke
ebd82ee772 fixes for media app 2012-04-26 15:23:17 +02:00
Georg Ehrke
2c92a79b5d fixes for contacts app 2012-04-26 15:20:01 +02:00
Sam Tuke
b19fae392b linked more button to history page 2012-04-26 13:54:38 +01:00
Georg Ehrke
3f64eb25ab some fixes fore movable apps 2012-04-26 14:52:55 +02:00
Sam Tuke
02c1127de3 changed function name to avoid clash with sharing dropdown 2012-04-26 13:41:22 +01:00
Thomas Tanghus
4bb1a2c2d6 Contacts: Some js cleanup. 2012-04-26 10:38:39 +02:00
Thomas Tanghus
5dbf362623 Contacts: Added import with with file picker. 2012-04-26 03:21:52 +02:00
Michael Gapczynski
c20abfef38 Fix a counting mistake 2012-04-25 19:30:58 -04:00
Michael Gapczynski
32de47d1d9 Update sharing when users are removed, added to groups, and removed from groups 2012-04-25 18:18:58 -04:00
Georg Ehrke
b75f680b8e gallery app seems to work now :) 2012-04-25 21:20:30 +02:00
Georg Ehrke
1a913ac282 bookmarks app seems to work now :) 2012-04-25 21:20:06 +02:00
Michael Gapczynski
6895c54a3f Fix javascript checkbox toggle for resharing 2012-04-25 14:37:14 -04:00
Arthur Schiwon
cbba469990 LDAP rewrite, use unique LDAP user and group identifiers on LDAP side as well as fancy (unqiue as far as users a know from LDAP) names on the ownCloud side. It's done via mapping of owncloud names and LDAP identifiers. 
some performance enhancements: faster searching for users and groups in their specific subtrees. Reading instead of searching were possible.

thanks for the feedback of Kevin van Kuik
 2012-04-25 20:35:30 +02:00
Arthur Schiwon
0933b5e7ab use uniquemember instead of deprecated memberuid to identify LDAP group members. Attention: not every method is adjusted yet, so it breaks some things. 2012-04-25 20:35:30 +02:00
Arthur Schiwon
a82d709f87 don't forget new JS file 2012-04-25 20:35:30 +02:00
Arthur Schiwon
e1cd690a7c LDPA: group settings into basic and advanced to look less crowded. Still needs some love. Looks different to the other admin settings, though. 2012-04-25 20:35:29 +02:00
Sam Tuke
c00762b49b added dropdown js menu for file versions, improved readability of history.php 2012-04-25 17:37:45 +01:00
Michael Gapczynski
7d9587bab3 Forgot to remove error log messages... 2012-04-25 11:54:16 -04:00
Michael Gapczynski
b369adbd94 Allow admin to disable resharing of files 2012-04-25 11:51:30 -04:00
Sam Tuke
a3dff248a1 fixed path to history script 2012-04-25 14:27:55 +01:00
Sam Tuke
8ae1430090 added script and loaded it for adding history button 2012-04-25 13:56:43 +01:00
Sam Tuke
81f549baee made code a little more readable 2012-04-25 13:51:08 +01:00
Thomas Tanghus
4795295fb1 Contacts: Fixed some file paths. 2012-04-25 10:44:27 +02:00
Georg Ehrke
d76552a009 Merge branch 'sabredav_1.6' 2012-04-25 10:39:31 +02:00
Georg Ehrke
03f81fdd88 fix js fail in media player 2012-04-25 10:27:17 +02:00
Georg Ehrke
323b19a4a0 some fixes in contacts javascript files 2012-04-25 10:17:54 +02:00
Georg Ehrke
60c0827ba3 Merge branch 'master' into movable_apps 2012-04-25 09:23:01 +02:00
Georg Ehrke
9ee2bb9719 fix js fail in media player 2012-04-25 09:22:19 +02:00
Robin Appelman
5b70e2fb25 some performance improvements to the openstack swift backend 2012-04-25 00:12:12 +02:00
Robin Appelman
5c3ea14819 fix mimetypes of encrypted files 2012-04-25 00:12:12 +02:00
Georg Ehrke
f17eea506a fix merge conflicts 2012-04-24 21:59:56 +02:00
Georg Ehrke
684007bbae fix pathes in contacts 2012-04-24 21:33:34 +02:00
Frank Karlitschek
a3d0a74d03 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-24 15:38:36 +02:00
Frank Karlitschek
69a2173fdb non working app. moved to the apps-playground repository 2012-04-24 14:00:44 +02:00
Thomas Tanghus
b824425186 Added loading indicator. 2012-04-24 11:38:11 +02:00
Thomas Tanghus
988f98fc6f Contacts: Check that UIDs really are unique on import. Better solution would be to suggest to merge contacts, but that will have to wait to OC5 ;-) 2012-04-24 11:35:56 +02:00
Thomas Tanghus
22f4acadc0 Contacts: In app import (for Chrome and Firefox only) 2012-04-24 01:44:07 +02:00
Thomas Tanghus
b8da5c5262 Contacts: Tried to format NOTE field a bit. Needs to be improved more though. 2012-04-24 01:44:07 +02:00
Thomas Tanghus
dfc94cbe84 Contacts: In app import. Cleanup still needed. 2012-04-24 01:44:07 +02:00
Thomas Tanghus
0cd9570277 Applied patches by Nicolas progweb at free.fr - https://mail.kde.org/pipermail/owncloud/2012-April/002900.html 2012-04-24 01:44:07 +02:00
Frank Karlitschek
4ea927a798 wrote a new versioning app over the weekend. Basic functionality to far but it works (TM) and has all the needed features (TM) for ownCloud 4. Userinterface integration and small improvements still missing. 2012-04-23 23:54:49 +02:00
Bart Visscher
b704ff1bc7 Tasks: Simple add task action 2012-04-23 22:13:35 +02:00
Georg Ehrke
fd47fbe176 fix contacts app a bit 2012-04-23 20:42:52 +02:00
Georg Ehrke
9092692b8e make calendar work with movable apps 2012-04-23 20:32:55 +02:00
Georg Ehrke
10eea3f464 fix pathes of shared calendars 2012-04-23 20:13:55 +02:00
Georg Ehrke
d1110c62ef fix file path in apps/media/ajax/api.php 2012-04-23 20:01:48 +02:00
Georg Ehrke
42a570788b Merge branch 'master' into movable_apps 2012-04-23 19:56:07 +02:00
Bart Visscher
728e6a6bf9 Tasks: Simple categories input 2012-04-23 18:28:44 +02:00
Georg Ehrke
3b9d283245 fix path in apps/files/templats/index.php 2012-04-23 16:25:07 +02:00
Georg Ehrke
c0df15367f fix style.css of the files app 2012-04-23 16:18:15 +02:00
Georg Ehrke
08fe6bdb27 fix path in /apps/files/js/timezone.php 2012-04-23 16:17:35 +02:00
Jan-Christoph Borchardt
3ba9a9e6a8 adding proper copyright and license notice to the style files 2012-04-23 14:19:03 +02:00
Arthur Schiwon
912c87eeda LDAP: optimize LDAP requests for users and groups. Settings are still to do, though. 2012-04-23 13:04:58 +02:00
Georg Ehrke
1b084cc120 Merge branch 'master' into movable_apps 2012-04-23 13:03:50 +02:00
Arthur Schiwon
6ee7dc5f59 only retrieve requested attributes 2012-04-23 12:32:17 +02:00
Arthur Schiwon
fffbf26159 don't forget to declare class properties 2012-04-23 11:22:11 +02:00
Thomas Tanghus
82ba2151d1 Wrong app check. 2012-04-23 10:52:13 +02:00
Thomas Tanghus
8f2e9caf96 Contacts: Tipsyfied photo toolbar. 2012-04-23 10:52:13 +02:00
Robin Appelman
d17eba19c1 fix image viewer 2012-04-22 21:27:20 +02:00
Robin Appelman
c5b31b001a add the option to disable file encryption while still being able to decrypt existing files 2012-04-22 21:27:20 +02:00
Thomas Tanghus
e8f062dc93 Contacts: 
- Added overlay toolbar to contact photo with 'Delete current', 'Edit current', 'Load from OC_Filesystem' and 'Upload' options.
- Made action icons translucent instead of hiding them.
 2012-04-22 20:47:24 +02:00
Thomas Tanghus
8a6cb23170 Contacts: Clear cache for contact photo and thumbnail when it has been changed. 2012-04-22 20:47:24 +02:00
Georg Ehrke
e888f4d9bc Merge branch 'master' into sabredav_1.6 2012-04-22 13:20:50 +02:00
Georg Ehrke
4c2cf35050 fix merge conflicts 2012-04-22 13:19:12 +02:00
Georg Ehrke
1bba445642 hide alarm and attendees tab 2012-04-22 13:15:24 +02:00
Thomas Tanghus
f08cfcecec Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet. 2012-04-22 03:59:28 +02:00
Thomas Tanghus
24aff287cf Link to icon was absolute. 2012-04-22 03:39:59 +02:00
Thomas Tanghus
f85aaf1f58 Contacts: Added bg color and shadow to controls. I suck at CSS... 2012-04-22 02:32:51 +02:00
Thomas Tanghus
80ddf37bb7 Missing double quote. 2012-04-22 02:09:13 +02:00
Thomas Tanghus
651de1e588 Contacts: Fix error on photo crop. 2012-04-22 01:50:46 +02:00
Thomas Tanghus
9e3242d05e Contacts: Changed layout as discussed with JanC. Still WiP. 2012-04-22 00:44:53 +02:00
Thomas Tanghus
56e064bd09 Don't trigger unnecessary change events. 2012-04-22 00:44:53 +02:00
Thomas Tanghus
16fc4dfd1a Contacts: Fixed contact photo drag'n'drop upload - again... 2012-04-22 00:44:53 +02:00
Thomas Tanghus
a34631f84e Contacts: Add check for empty FN field. 2012-04-22 00:44:53 +02:00
Frank Karlitschek
69f3b5e2d2 make the button a bit more consistent to the other ownCloud interface 2012-04-21 23:34:24 +02:00
Frank Karlitschek
260c48c29a cleanup the admin page layout mess a bit. Still a lot to improve in the future :-) 2012-04-21 23:23:02 +02:00
Georg Ehrke
0918fc7d91 fix merge conflicts 2012-04-21 23:21:50 +02:00
Frank Karlitschek
80950f2e1c make field completely visible 2012-04-21 23:10:35 +02:00
Frank Karlitschek
ff3b199cc8 use less space 2012-04-21 23:08:52 +02:00
Frank Karlitschek
1a49497899 structure the information a bit more so that is easier readable 2012-04-21 22:55:18 +02:00
Georg Ehrke
74e5402711 fix a php notice 2012-04-21 22:27:19 +02:00
Georg Ehrke
e29ae46609 fix merge conflicts 2012-04-21 22:12:31 +02:00
Bart Visscher
acea156a3d Tasks: Save description field 2012-04-20 23:37:42 +02:00
Bart Visscher
3d68732657 Tasks: Due date without time support added 2012-04-20 22:56:59 +02:00
Georg Ehrke
711aa229b8 Merge branch 'master' into movable_apps 2012-04-20 22:41:39 +02:00
Georg Ehrke
c3d78cf77a remove require once lib base in files scan.php 2012-04-20 22:34:13 +02:00
Bart Visscher
1384be4bff Tasks: Task summary is always text, at it as suchs 2012-04-20 18:19:10 +02:00
Bart Visscher
70ba428222 Tasks: Make gettasks more robust against malformed VTODO data 2012-04-20 18:18:07 +02:00
Bart Visscher
c75bbb59a9 Tasks: Add due property handling 2012-04-20 18:16:39 +02:00
Georg Ehrke
3aeea0c196 Merge branch 'merge-requests/105' 2012-04-19 20:31:24 +02:00
Georg Ehrke
3706bbec1b Merge commit 'refs/merge-requests/105' of git://gitorious.org/owncloud/owncloud into merge-requests/105 2012-04-19 20:30:58 +02:00
Robin Appelman
5cefd34660 emulate touch with custom mtime for swift backend 2012-04-19 00:25:47 +02:00