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

979 commits

Author SHA1 Message Date
Georg Ehrke
4c91ca2f86 Merge branch 'master' into calendar 2012-01-08 16:42:32 +01:00
Robin Appelman
9c6248443a dont overwrite the database with the gallery database 2012-01-08 14:35:23 +01:00
Cloud Dumper
4d1ed7e05f Improve music playlist rendering. 
This change:
* bolds currently playing song in playlist;
* forces song names in playlist to one line, ellipsize after (...);
* adds jQuery tipsies to get the whole song name, along with the
  artist name, and the album the song is coming from.

No need to split this changeset into three different ones for the sake
of atomicity.

Two first elements were on the priorities / bug list available there:
   http://gitorious.org/owncloud/pages/Home
 2012-01-08 13:45:44 +01:00
Bartek Przybylski
c2392bbace db overwriting, gallery creating fix 2012-01-08 11:25:08 +01:00
Bartek Przybylski
21c4515465 rename fix, licence header added 2012-01-08 11:01:25 +01:00
Bartek Przybylski
23f52aa6fd Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-08 01:34:50 +01:00
Bartek Przybylski
2de3b4bd17 rename and delete hooks 2012-01-08 01:32:11 +01:00
Cloud Dumper
5b57cd310e Also use track_number to retrieve song track. 
This adds support for id3v2 tags such as TRACK/TOTAL.
 2012-01-08 00:30:57 +01:00
Cloud Dumper
6b95d7427a Sort results from music collection getters. 
Albums and artists are now ordered by name, song by track number and name.
 2012-01-08 00:30:57 +01:00
Bartek Przybylski
e51957b4de gallery version bump to force db update 2012-01-08 00:22:28 +01:00
Bartek Przybylski
9ed3c31fc9 automatic adding of photo to album, feedback for user while scanning, general cleanup 2012-01-08 00:14:34 +01:00
Georg Ehrke
c3cda81577 update calendar pot file 2012-01-07 18:30:32 +01:00
Georg Ehrke
67a8ae084a fix search function 2012-01-07 14:31:47 +01:00
Frank Karlitschek
33847dd101 enable gallery and admin_export by default at least for the alpha and beta. 2012-01-07 13:33:53 +01:00
Georg Ehrke
f18e866a1e improve search function 2012-01-06 14:36:24 +01:00
Georg Ehrke
db490fbc8f Merge branch 'master' into calendar 2012-01-05 21:02:58 +01:00
Georg Ehrke
cb445deb5f fix login check in ajax files 2012-01-05 21:02:11 +01:00
Georg Ehrke
486694c2ec fix js for repeating events 2012-01-05 20:54:44 +01:00
Georg Ehrke
a01a3d412c fix autodetection for the week of the month 2012-01-05 17:53:13 +01:00
Georg Ehrke
edc9a150aa fix editeventdialog for monthly repeating events with a specific weekday and weeknumber combination 2012-01-05 17:49:09 +01:00
Georg Ehrke
d3a0c7354c fix repeat rule for every weekday 2012-01-05 17:09:01 +01:00
Georg Ehrke
a88cc91ad9 fix end for repeating events 2012-01-05 17:05:30 +01:00
Frank Karlitschek
e0a058c732 remove error output if symlink already exists. this can happen if a user removed config.php to trigger the setup wizzard 2012-01-03 17:23:50 +01:00
Georg Ehrke
fe59015126 Merge branch 'master' into calendar 2012-01-03 13:51:55 +01:00
Georg Ehrke
30857b24ea Merge branch 'master' into calendar 2012-01-02 11:41:18 +01:00
Georg Ehrke
5ccd26959f remove unused js 2012-01-02 11:39:23 +01:00
Georg Ehrke
e6739d230e add function to detect always the timezone 2012-01-02 11:35:50 +01:00
Thomas Tanghus
fb4c3bd9ce Merge git://gitorious.org/owncloud/owncloud into oc_image 2012-01-02 01:09:22 +01:00
Tom Needham
65c37abef9 added ace source 2012-01-01 23:29:23 +00:00
Robin Appelman
536bc3d3c5 add jplayer source 2012-01-01 23:48:38 +01:00
Tom Needham
67854a94bf Removed old code 2012-01-01 21:27:38 +00:00
Tom Needham
5d9b7bf1dd Added ace license file 2012-01-01 20:05:30 +00:00
Tom Needham
ad9a81bf41 Added support for more file types 2012-01-01 20:04:46 +00:00
Tom Needham
4eb7487e61 Updated ace-editor software 2012-01-01 19:45:30 +00:00
Thomas Tanghus
853d1730c7 Merge git://gitorious.org/owncloud/owncloud into oc_image 2012-01-01 20:07:01 +01:00
Michael Gapczynski
64a24191a3 Fix return for empty Shared folder in opendir() 2012-01-01 14:04:16 -05:00
Tom Needham
e04951f8fd Fixed keyboard shortcuts 2011-12-31 12:28:25 +00:00
Tom Needham
215cb1e6e0 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-31 12:21:40 +00:00
Thomas Tanghus
1b146b85d2 Removed redundant DB queries. 2011-12-31 01:34:22 +01:00
Thomas Tanghus
97471b5c2a Thumbnails was overwriting default style so hover and active didn't work. Moved them to the 'a' element instead. 2011-12-30 23:39:31 +01:00
Thomas Tanghus
830a34a10a Merge git://gitorious.org/owncloud/owncloud into tanghus_contacts 2011-12-30 21:09:42 +01:00
Thomas Tanghus
4793d25c57 Added license and waiver of conditions for jquery.inview. 
CSS fix on contact list.
Query contacts from multiple address books.
 2011-12-30 21:07:16 +01:00
Bartek Przybylski
31663cfff5 contacts entry duplication fix 2011-12-30 17:47:14 +01:00
Bartek Przybylski
96dc279e8e Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-12-30 17:06:48 +01:00
Bartek Przybylski
2ea20862fc gallery fixes 2011-12-30 17:06:29 +01:00
Georg Ehrke
3bb11db943 Merge branch 'master' into calendar 2011-12-29 19:16:33 +01:00
Tom Needham
8afb2e98fa Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-28 16:16:35 +00:00
Thomas Tanghus
a70fbcea28 More missing js. 2011-12-28 10:31:45 +01:00
Thomas Tanghus
5a99310cdf Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails 
Fixed some conflicts.
Conflicts:
	apps/contacts/css/styles.css
	apps/contacts/templates/index.php
 2011-12-28 10:14:59 +01:00
Bart Visscher
16e4e6dcc3 Contacts: small merge cleanups 2011-12-27 22:44:52 +01:00
Bart Visscher
3e2e5196d2 Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud 
Conflicts:
	apps/calendar/export.php
	apps/contacts/index.php
 2011-12-27 22:18:01 +01:00
Bart Visscher
5fd595c0bf Calendar: add loading indicator 2011-12-27 21:50:31 +01:00
Robin Appelman
5bff1c8ad1 some coding style fixes for the pdf viewer 2011-12-27 14:19:07 +01:00
Robin Appelman
f009ede753 some styling changes for the pdf viewer 2011-12-27 14:09:22 +01:00
Robin Appelman
1efb4a0c61 remove debug messages in console 2011-12-27 13:41:22 +01:00
Bartek Przybylski
f7674d06d3 pdf viewer from Google Code-In program 2011-12-27 12:36:51 +01:00
Georg Ehrke
ffa835c56f fix the default setting for yearly repeating events 2011-12-26 19:59:15 +01:00
Thomas Tanghus
16c8f62658 Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails 2011-12-26 13:27:53 +01:00
Georg Ehrke
9eef57faed make repeating events editable 2011-12-25 23:19:49 +01:00
Georg Ehrke
8ee53708ae use pre-decrement instead of post-decrement 2011-12-25 15:07:53 +01:00
Georg Ehrke
5e6fa608eb use OC_JSON::checkLoggedIn() in all ajax files 2011-12-22 16:31:01 +01:00
Georg Ehrke
469e983a02 fix merge conflicts 2011-12-21 22:16:46 +01:00
Bartek Przybylski
1383cb51e7 removing and renaming albums 2011-12-21 21:55:52 +01:00
Bartek Przybylski
6a1a7fcd26 merged with stash 2011-12-21 18:40:43 +01:00
Bartek Przybylski
25fa9bf8ec merged with stash 2011-12-21 18:37:17 +01:00
Bartek Przybylski
3c42867109 merged 2011-12-21 18:35:29 +01:00
Bart Visscher
d5e9c7d572 Gallery: fix calculation of folder thumbnail selection 2011-12-18 23:10:43 +01:00
Bart Visscher
fbad1da9e2 Contacts: check if PREF parameter is set before useing it 2011-12-18 23:10:43 +01:00
Bart Visscher
dff9585f64 Contacts: add missing property_options template var 2011-12-18 23:10:43 +01:00
Bart Visscher
ff346ad135 Calendar: small for loop fix 2011-12-18 23:10:43 +01:00
Bart Visscher
4eb36b0ecf Calendar: refactor common ajax functions to OC_Calendar_App 2011-12-18 23:10:42 +01:00
Michael Gapczynski
9e50cecf27 Fix shared status for files inside a shared folder 2011-12-17 21:13:54 -05:00
Thomas Tanghus
092c41f375 Added missing files and tried to revert the wrong commit of app/contacts/js/interfaces.js 2011-12-17 20:38:52 +01:00
Thomas Tanghus
a7b048dc05 Added thumbnails to contact list. The contacts have a default thumbnail when the page is 
first loaded. Once the page is loaded the thumbnails will be lazy-loaded to the contacts
viewable.
 2011-12-17 20:05:54 +01:00
Georg Ehrke
f6ed7a19be Merge branch 'master' into calendar 2011-12-16 21:21:34 +01:00
Thomas Tanghus
f3e8776dc6 Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup 2011-12-16 17:43:06 +01:00
Thomas Tanghus
feeb0c742a Misc. changes after review by bartv. 2011-12-16 17:42:07 +01:00
Robin Appelman
65214bed0c make the sharing app return the corrrect result for is_writable on the shared folder 2011-12-16 17:31:31 +01:00
Thomas Tanghus
59ad0a6c9c Update README 2011-12-13 10:39:31 +01:00
Thomas Tanghus
d55e689261 Added readme.tanghus 2011-12-11 21:17:10 +01:00
Tom Needham
3f44a28e28 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-11 18:16:14 +00:00
Thomas Tanghus
39430c837f Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup 2011-12-11 16:29:53 +01:00
Thomas Tanghus
c7b7758816 Updating of contact list when activating/adding/deleting address books now works. 2011-12-11 16:26:00 +01:00
Georg Ehrke
56f12cbfb1 delete unused files 2011-12-10 17:54:42 +01:00
Georg Ehrke
33caa64cce check for php version is greater than 5.3.0 - we make extensive use of Date Time Libs 2011-12-10 15:11:41 +01:00
Georg Ehrke
b7c754cb32 Merge branch 'master' into calendar 2011-12-10 15:03:33 +01:00
Bart Visscher
1746cba249 Some small changes 2011-12-09 22:36:39 +01:00
Bart Visscher
a3cb04013e Update OC_VObject 2011-12-09 21:56:03 +01:00
Bart Visscher
2e951c0ce5 Gallary: Fix alignment of album thumbnails 2011-12-09 21:44:13 +01:00
Thomas Tanghus
5cb10548b3 Resolved conflict 2011-12-09 15:28:51 +01:00
Thomas Tanghus
7aa8eb3427 Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup 
Conflicts:
	apps/contacts/ajax/deletebook.php
	apps/contacts/index.php
 2011-12-09 15:25:26 +01:00
Thomas Tanghus
b3661adf02 Various fixes to multiple address books handling 2011-12-09 15:10:51 +01:00
Georg Ehrke
ac8177d83e Merge branch 'master' into calendar 2011-12-09 14:45:41 +01:00
Georg Ehrke
bd68cee8cf add resettimezone file for testing timezone detection 2011-12-09 14:36:43 +01:00
Georg Ehrke
add48b2657 optimize timezone detection 2011-12-09 14:35:59 +01:00
Bart Visscher
eeaf539a44 Gallery: splitout model code 2011-12-08 20:05:12 +01:00
Georg Ehrke
2103c331a0 Merge branch 'master' into calendar 2011-12-08 14:03:14 +01:00
Michiel de Jong
d4546cdf37 bump version number to force db rebuild 2011-12-08 17:19:38 +07:00
Bart Visscher
a389d94e2b Imageviewer: fix fancybox.png image url in fancybox css 2011-12-07 20:41:00 +01:00
Bart Visscher
546b7279a3 Contacts: Add "Preferred" before phone label for preferred numbers 2011-12-07 20:40:59 +01:00